From c5f7f78539140d5afdb396b4c139af255ffbbecf Mon Sep 17 00:00:00 2001
From: erik <erik@linux-ug23.site>
Date: Thu, 18 Mar 2010 22:25:38 +0100
Subject: [PATCH 2/3] Setting for default user guestbook status
 User profil edit honors setting
 Users guestbook list honors setting

---
 guestbook.module |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/guestbook.module b/guestbook.module
index befe0d3..59e3480 100644
--- a/guestbook.module
+++ b/guestbook.module
@@ -110,7 +110,7 @@ function guestbook_user($op, &$edit, &$user, $category = '') {
           $form['guestbook']['guestbook_status'] = array(
             '#type' => 'radios',
             '#title' => t('Status'),
-            '#default_value' => isset($edit['guestbook_status']) ? $edit['guestbook_status'] : 0,
+            '#default_value' => isset($edit['guestbook_status']) ? $edit['guestbook_status'] : variable_get('guestbook_user_default_status', 1),
             '#options' => array(t('Enabled'), t('Disabled')),
           );
           $form['guestbook']['guestbook_send_email'] = array(
@@ -224,6 +224,14 @@ function guestbook_admin_settings() {
     '#default_value' => variable_get('guestbook_user_link_to', 'profile'),
   );
 
+  $form['user_guestbooks']['guestbook_user_default_status'] = array(
+    '#type' => 'radios',
+    '#title' => t('User guestbook default status'),
+    '#description' => t('When creating new users, should user guestbook be enabled by default?'),
+    '#default_value' => variable_get('guestbook_user_default_status', 1),
+    '#options' => array(1 => t('Enabled'), 0 => t('Disabled')),
+  );
+
   // Display options.
   $form['display_options'] = array(
     '#type' => 'fieldset',
@@ -403,11 +411,16 @@ function guestbook_list() {
     else if ($guestbook['uid'] > 0 && user_access('access user guestbooks')) {
       // User guestbooks.
       $data = unserialize($guestbook['data']);
+      #DVM($guestbook);
+      DVM($guestbook['uid'] . ", " . $data['guestbook_status'] . " = " . (empty($data['guestbook_status'])?"t":"f"));
       if (empty($data['guestbook_status'])) {
-        $guestbooks[$guestbook['uid']] = $guestbook;
+          if (($data['guestbook_status'] === null && variable_get('guestbook_user_default_status', 1)) ||
+                  ($data['guestbook_status'] === "0"))
+            $guestbooks[$guestbook['uid']] = $guestbook;
       }
     }
   }
+  #DVM($guestbooks);
   return theme('guestbook_list', $guestbooks, $header, $limit);
 }
 
-- 
1.6.4.2