Changeset 5328 for trunk

Timestamp:

Mar 25, 2010, 12:24:01 AM (14 years ago)

Author:

patdenice

Message:

Feature 1533: admincan activate/deactivate user customization.

Location:

trunk

Files:

• admin/configuration.php (modified) (1 diff)
• admin/themes/default/template/configuration.tpl (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• install/db/89-database.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/common.lang.php (modified) (1 diff)
• profile.php (modified) (3 diffs)
• themes/default/template/profile_content.tpl (modified) (2 diffs)

trunk/admin/configuration.php

@@ -52 +52 @@
     'rate_anonymous',
     'email_admin_on_new_user',
+    'allow_user_customization',
    );
 

trunk/admin/themes/default/template/configuration.tpl

@@ -65 +65 @@
         <span class="property">{'Allow user registration'|@translate}</span>
         <input type="checkbox" name="allow_user_registration" {if ($main.allow_user_registration)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'Allow user customization'|@translate}</span>
+        <input type="checkbox" name="allow_user_customization" {if ($main.allow_user_customization)}checked="checked"{/if}>
       </label>
     </li>

trunk/install/config.sql

@@ -18 +18 @@
 INSERT INTO piwigo_config (param,value,comment) VALUES ('history_guest','true','keep a history of guest visits on your website');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_customization','true','allow users to customize their gallery?');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail');

trunk/language/en_UK/admin.lang.php

@@ -750 +750 @@
 $lang['Activate field "%s"'] = 'Activate field "%s"';
 $lang['Photo Properties'] = 'Photo Properties';
+$lang['Allow user customization'] = 'Allow user customization'; 
 ?>

trunk/language/fr_FR/common.lang.php

@@ -388 +388 @@
 $lang['validate this comment'] = 'valider ce commentaire';
 $lang['(!) This comment requires validation'] = '(!) Ce commentaire requiert une validation';
+$lang['Allow user customization'] = "Permettre la personnalisation de l'affichage"; 
 ?>

trunk/profile.php

@@ -105 +105 @@
   }
 
-  $int_pattern = '/^\d+$/';
-  if (empty($_POST['nb_image_line'])
-      or (!preg_match($int_pattern, $_POST['nb_image_line'])))
-  {
-    $errors[] = l10n('The number of images per row must be a not null scalar');
-  }
-
-  if (empty($_POST['nb_line_page'])
-      or (!preg_match($int_pattern, $_POST['nb_line_page'])))
-  {
-    $errors[] = l10n('The number of rows per page must be a not null scalar');
-  }
-
-  if ($_POST['maxwidth'] != ''
-      and (!preg_match($int_pattern, $_POST['maxwidth'])
-           or $_POST['maxwidth'] < 50))
-  {
-    $errors[] = l10n('Maximum width must be a number superior to 50');
-  }
-  if ($_POST['maxheight']
-       and (!preg_match($int_pattern, $_POST['maxheight'])
-             or $_POST['maxheight'] < 50))
-  {
-    $errors[] = l10n('Maximum height must be a number superior to 50');
-  }
-  // periods must be integer values, they represents number of days
-  if (!preg_match($int_pattern, $_POST['recent_period'])
-      or $_POST['recent_period'] <= 0)
-  {
-    $errors[] = l10n('Recent period must be a positive integer value') ;
+  if ($conf['allow_user_customization'] or defined('IN_ADMIN'))
+  {
+    $int_pattern = '/^\d+$/';
+    if (empty($_POST['nb_image_line'])
+        or (!preg_match($int_pattern, $_POST['nb_image_line'])))
+    {
+      $errors[] = l10n('The number of images per row must be a not null scalar');
+    }
+
+    if (empty($_POST['nb_line_page'])
+        or (!preg_match($int_pattern, $_POST['nb_line_page'])))
+    {
+      $errors[] = l10n('The number of rows per page must be a not null scalar');
+    }
+
+    if ($_POST['maxwidth'] != ''
+        and (!preg_match($int_pattern, $_POST['maxwidth'])
+             or $_POST['maxwidth'] < 50))
+    {
+      $errors[] = l10n('Maximum width must be a number superior to 50');
+    }
+    if ($_POST['maxheight']
+         and (!preg_match($int_pattern, $_POST['maxheight'])
+               or $_POST['maxheight'] < 50))
+    {
+      $errors[] = l10n('Maximum height must be a number superior to 50');
+    }
+    // periods must be integer values, they represents number of days
+    if (!preg_match($int_pattern, $_POST['recent_period'])
+        or $_POST['recent_period'] <= 0)
+    {
+      $errors[] = l10n('Recent period must be a positive integer value') ;
+    }
   }
 
@@ -200 +203 @@
     }
 
-    // update user "additional" informations (specific to Piwigo)
-    $fields = array(
-      'nb_image_line', 'nb_line_page', 'language', 'maxwidth', 'maxheight',
-      'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'theme'
-      );
-
-    $data = array();
-    $data['user_id'] = $userdata['id'];
-
-    foreach ($fields as $field)
-    {
-      if (isset($_POST[$field]))
+    if ($conf['allow_user_customization'] or defined('IN_ADMIN'))
+    {
+      // update user "additional" informations (specific to Piwigo)
+      $fields = array(
+        'nb_image_line', 'nb_line_page', 'language', 'maxwidth', 'maxheight',
+        'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'theme'
+        );
+
+      $data = array();
+      $data['user_id'] = $userdata['id'];
+
+      foreach ($fields as $field)
       {
-        $data[$field] = $_POST[$field];
+        if (isset($_POST[$field]))
+        {
+          $data[$field] = $_POST[$field];
+        }
       }
-    }
-    mass_updates(USER_INFOS_TABLE,
-                 array('primary' => array('user_id'), 'update' => $fields),
-                 array($data));
-
+      mass_updates(USER_INFOS_TABLE,
+                   array('primary' => array('user_id'), 'update' => $fields),
+                   array($data));
+    }
     trigger_action( 'save_profile_from_post', $userdata['id'] );
 
@@ -246 +251 @@
       'USERNAME'=>stripslashes($userdata['username']),
       'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
+      'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'],
       'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
       'NB_ROW_PAGE'=>$userdata['nb_line_page'],

trunk/themes/default/template/profile_content.tpl

@@ -40 +40 @@
   </fieldset>
 
+{if $ALLOW_USER_CUSTOMIZATION}
   <fieldset>
     <legend>{'Preferences'|@translate}</legend>
@@ -100 +101 @@
     </ul>
   </fieldset>
+{/if}
 
   <p class="bottomButtons">