Changeset 2054 for branches

Timestamp:

Jul 7, 2007, 11:22:11 AM (17 years ago)

Author:

rub

Message:

Resolved issue 0000717: guest must be guest

Location:

branches/branch-1_7

Files:

• include/common.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)

branches/branch-1_7/include/common.inc.php

@@ -188 +188 @@
 }
 
+if (isset($user['internal_status']['guest_must_be_guest'])
+    and
+    $user['internal_status']['guest_must_be_guest'] === true)
+{
+  $header_msgs[] = l10n('guest_must_be_guest');
+}
+
 if ($conf['gallery_locked'])
 {

branches/branch-1_7/include/functions_user.inc.php

@@ -151 +151 @@
   $user['is_the_default'] = ($user['id'] == $conf['default_user_id']);
 
+  if ($user['is_the_guest'] and $user['status'] <> 'guest')
+  {
+    $user['status'] = 'guest';
+    $user['internal_status']['guest_must_be_guest'] = true;
+  }
+
   // calculation of the number of picture to display per page
   $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];

branches/branch-1_7/language/en_UK.iso-8859-1/common.lang.php

@@ -633 +633 @@
 $lang['Waiting page: %s'] = 'Waiting page: %s';
 $lang['Picture uploaded by %s'] = 'Picture uploaded by %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
+$lang['guest_must_be_guest'] = 'Bad status for user "guest", using default status. Please notify the webmaster.';
 ?>

branches/branch-1_7/language/fr_FR.iso-8859-1/common.lang.php

@@ -633 +633 @@
 $lang['Waiting page: %s'] = 'Page en attente: %s';
 $lang['Picture uploaded by %s'] = 'Image téléchargée par %s';
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
+$lang['guest_must_be_guest'] = 'Statut de l\'utilisateur "guest" non conforme, utilisation du statut par défaut. Veuillez prévenir le webmestre.';
 ?>