Index: guestbook.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/guestbook/guestbook.module,v
retrieving revision 1.17
diff -u -p -r1.17 guestbook.module
--- guestbook.module	9 Sep 2008 18:17:23 -0000	1.17
+++ guestbook.module	9 Sep 2008 18:48:35 -0000
@@ -89,7 +89,7 @@ function guestbook_user($op, &$edit, &$u
   if ($guestbook_mode & GUESTBOOK_USER_GUESTBOOKS) {
     switch ($op) {
       case 'view':
-        if (user_access('access user guestbooks') && empty($user->guestbook_status)) {
+        if (user_access('access user guestbooks') && user_access('has personal guestbook', $user) && empty($user->guestbook_status)) {
           $title = t("Read @username's guestbook.", array('@username' => $user->name));
           $link  = l(t('View recent guestbook entries'), "user/$user->uid/guestbook", array('attributes' => array('title' => $title)));
           $user->content['summary']['guestbook'] = array(
@@ -102,7 +102,7 @@ function guestbook_user($op, &$edit, &$u
         break;
 
       case 'form':
-        if ($category == 'account') {
+        if ($category == 'account' && user_access('has personal guestbook', $user)) {
           $form['guestbook'] = array(
             '#type' => 'fieldset',
             '#title' => t('User guestbook'),
@@ -140,6 +140,7 @@ function guestbook_perm() {
   return array(
     'access site guestbook',
     'access user guestbooks',
+    'has personal guestbook',
     'post in site guestbook',
     'post in user guestbooks',
     'moderate all guestbooks',
@@ -206,7 +207,7 @@ function guestbook_admin_settings() {
   $form['user_guestbooks'] = array(
     '#type' => 'fieldset',
     '#title' => t('User guestbooks'),
-    '#description' => t('Users can individually disable their guestbook or add an intro text on the user account page.'),
+    '#description' => t('Users can individually disable their guestbook or add an intro text on the user account page. Make sure you enable the <a href="!permissions">user permission</a> for certain roles to have a personal guestbook.', array('!permissions' => url('admin/user/permissions'))),
   );
 
   $form['user_guestbooks']['guestbook_user_link_to'] = array(
Index: panels/guestbook_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/guestbook/panels/guestbook_user.inc,v
retrieving revision 1.2
diff -u -p -r1.2 guestbook_user.inc
--- panels/guestbook_user.inc	9 Sep 2008 18:17:23 -0000	1.2
+++ panels/guestbook_user.inc	9 Sep 2008 18:49:53 -0000
@@ -35,7 +35,7 @@ function guestbook_admin_content_types_g
  * Render the guestbook of a user.
  */
 function guestbook_content_guestbook_user($conf, $panel_args, $context) {
-  if (!$context->data || !user_access('access user guestbooks')) {
+  if (!$context->data || !user_access('access user guestbooks') || !user_access('has personal guestbook', $context->data)) {
     return;
   }