Changeset 1565 for trunk

Timestamp:

Oct 19, 2006, 2:41:07 AM (18 years ago)

Author:

rvelices

Message:

feature 564: logs in the history table each user login
feature 562: possibility to log page visits for any combination of
administrators/users/guests

Location:

trunk

Files:

• admin/configuration.php (modified) (5 diffs)
• identification.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (8 diffs)
• install/config.sql (modified) (1 diff)
• install/db/30-database.php (added)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/en_UK.iso-8859-1/help/configuration.html (modified) (2 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/help/configuration.html (modified) (2 diffs)
• register.php (modified) (1 diff)
• template/yoga/admin/configuration.tpl (modified) (2 diffs)

trunk/admin/configuration.php

@@ -47 +47 @@
   $page['section'] = $_GET['section'];
 }
-//------------------------------------------------------ $conf reinitialization
-$result = pwg_query('SELECT param,value FROM '.CONFIG_TABLE);
-while ($row = mysql_fetch_array($result))
-{
-  $conf[$row['param']] = $row['value'];
-  // if the parameter is present in $_POST array (if a form is submited), we
-  // override it with the submited value
-  if (isset($_POST[$row['param']]))
-  {
-    $conf[$row['param']] = $_POST[$row['param']];
-    if ( 'page_banner'==$row['param'] )
-    { // should we do it for all ?
-      $conf[$row['param']] = stripslashes( $conf[$row['param']] );
-    }
-  }
-}
 //------------------------------ verification and registration of modifications
 if (isset($_POST['submit']))
@@ -75 +59 @@
         array_push($page['errors'], $lang['conf_gallery_url_error']);
       }
+      $_POST['log'] = empty($_POST['log'])?'false':'true';
+      $_POST['history_admin'] = empty($_POST['history_admin'])?'false':'true';
+      $_POST['history_guest'] = empty($_POST['history_guest'])?'false':'true';
+      $_POST['login_history'] = empty($_POST['login_history'])?'false':'true';
       break;
     }
@@ -120 +108 @@
   if (count($page['errors']) == 0)
   {
-//    echo '<pre>'; print_r($_POST); echo '</pre>';
+    //echo '<pre>'; print_r($_POST); echo '</pre>';
     $result = pwg_query('SELECT * FROM '.CONFIG_TABLE);
     while ($row = mysql_fetch_array($result))
@@ -148 +136 @@
 }
 
+//------------------------------------------------------ $conf reinitialization
+$result = pwg_query('SELECT param,value FROM '.CONFIG_TABLE);
+while ($row = mysql_fetch_array($result))
+{
+  $conf[$row['param']] = $row['value'];
+}
+
 //----------------------------------------------------- template initialization
 $template->set_filenames( array('config'=>'admin/configuration.tpl') );
@@ -172 +167 @@
     $html_check='checked="checked"';
 
-    $history_yes = ($conf['log']=='true')?'checked="checked"':'';
-    $history_no  = ($conf['log']=='false')?'checked="checked"':'';
     $lock_yes = ($conf['gallery_locked']=='true')?'checked="checked"':'';
     $lock_no = ($conf['gallery_locked']=='false')?'checked="checked"':'';
+    $history_users = ($conf['log']=='true')?$html_check:'';
+    $history_admin = ($conf['history_admin']=='true')?$html_check:'';
+    $history_guest = ($conf['history_guest']=='true')?$html_check:'';
+    $login_history = ($conf['login_history']=='true')?$html_check:'';
 
     $template->assign_block_vars(
       'general',
       array(
-        'HISTORY_YES'=>$history_yes,
-        'HISTORY_NO'=>$history_no,
+        'HISTORY_USERS'=>$history_users,
+        'HISTORY_ADMIN'=>$history_admin,
+        'HISTORY_GUEST'=>$history_guest,
+        'LOGIN_HISTORY'=>$login_history,
         'GALLERY_LOCKED_YES'=>$lock_yes,
         'GALLERY_LOCKED_NO'=>$lock_no,

trunk/identification.php

@@ -65 +65 @@
     }
     log_user($row['id'], $remember_me);
+    pwg_log_login( $username );
     redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
   }

trunk/include/config_default.inc.php

@@ -431 +431 @@
 $conf['nb_logs_page'] = 300;
 
-// history_admin : history admin visits  ?
-$conf['history_admin'] = false;
-
 // +-----------------------------------------------------------------------+
 // |                                 urls                                  |

trunk/include/functions.inc.php

@@ -385 +385 @@
   global $conf, $user;
 
-  if ($conf['log'])
-  {
-   if (($conf['history_admin']) or ((! $conf['history_admin']) 
-       and (!is_admin())))
-    {
+  if ( is_admin() )
+  {
+    $doit=$conf['history_admin'];
+  }
+  elseif ( $user['is_the_guest'] )
+  {
+    $doit=$conf['history_guest'];
+  }
+  else
+  {
+    $doit = $conf['log'];
+  }
+
+  if ($doit)
+  {
     $login = ($user['id'] == $conf['guest_id'])
       ? 'guest' : addslashes($user['username']);
-
-    $query = '
+    insert_into_history($login, $file, $category, $picture);
+  }
+}
+
+function pwg_log_login( $username )
+{
+  global $conf;
+  if ( $conf['login_history'] )
+  {
+    insert_into_history($username, 'login', '', '');
+  }
+}
+
+// inserts a row in the history table
+function insert_into_history( $login, $file, $category, $picture)
+{
+  $query = '
 INSERT INTO '.HISTORY_TABLE.'
   (date,login,IP,file,category,picture)
@@ -404 +429 @@
   \''.addslashes($picture).'\')
 ;';
-    pwg_query($query);
-  }
-  }
+  pwg_query($query);
 }
 
@@ -462 +485 @@
 }
 
-function pwg_stripslashes($value) 
+function pwg_stripslashes($value)
 {
   if (get_magic_quotes_gpc())
@@ -471 +494 @@
 }
 
-function pwg_addslashes($value) 
+function pwg_addslashes($value)
 {
   if (!get_magic_quotes_gpc())
@@ -480 +503 @@
 }
 
-function pwg_quotemeta($value) 
+function pwg_quotemeta($value)
 {
   if (get_magic_quotes_gpc()) {
@@ -700 +723 @@
 {
   global $conf;
-  
+
   $error = '<pre>';
   $error.= $header;
@@ -945 +968 @@
 {
   global $conf;
-  
+
   $query = '
 SELECT param,value
@@ -960 +983 @@
   {
     $conf[ $row['param'] ] = isset($row['value']) ? $row['value'] : '';
-    
+
     // If the field is true or false, the variable is transformed into a
     // boolean value.

trunk/install/config.sql

@@ -20 +20 @@
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('rate_anonymous','true','Rating pictures feature is also enabled for visitors');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('page_banner','<h1>PhpWebGallery demonstration site</h1><p>My photos web site</p>','html displayed on the top each page of your gallery');
-
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('history_admin','false','keep a history of administrator visits on your website');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('history_guest','true','keep a history of guest visits on your website');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('login_history','true','keep a history of user logins on your website');
 -- Notification by mail
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail');

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -100 +100 @@
 $lang['Linked categories'] = 'Linked categories';
 $lang['Lock gallery'] = 'Lock gallery';
+$lang['Login history'] = 'User login history';
 $lang['Maintenance'] = 'Maintenance';
 $lang['Manage permissions for a category'] = 'Manage permissions for a category';

trunk/language/en_UK.iso-8859-1/help/configuration.html

@@ -22 +22 @@
   <li><strong>Gallery URL</strong>: used for the RSS feed.</li>
 
-  <li><strong>History</strong>: visits on pages <span
-  class="pwgScreen">category.php</span> and <span
-  class="pwgScreen">picture.php</span> will be registered in
-  <code>history</code> table. Visits will be shown in <span
-  class="pwgScreen">Administration, General, History</span>.</li>
-
   <li><strong>Lock gallery</strong>: Lock the entire gallery for
   maintenance. Only administrator users will be able to reach the
@@ -36 +30 @@
   <li><strong>Rating by guests</strong>: Even non registered users can
 rate images.</li>
+
+  <li><strong>History Users</strong>: visits by registrered users on pages <span
+  class="pwgScreen">category.php</span> and <span
+  class="pwgScreen">picture.php</span> will be saved in the
+  <code>history</code> table. Visits will be shown in <span
+  class="pwgScreen">Administration, General, History</span>.</li>
+
+  <li><strong>History Administrator</strong>: page visits by administrators
+  will be saved.</li>
+
+  <li><strong>History Guests</strong>: page visits by guests will be saved.</li>
+
+  <li><strong>User login history</strong>: when a user logs in, it will be
+  logged in the <code>history</code> table.</li>
 
 </ul>

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -100 +100 @@
 $lang['Linked categories'] = 'Catégories associées';
 $lang['Lock gallery'] = 'Verrouiller la galerie';
+$lang['Login history'] = 'Historique des connexions';
 $lang['Maintenance'] = 'Maintenance';
 $lang['Manage permissions for a category'] = 'Gérer les permissions pour une catégorie';

trunk/language/fr_FR.iso-8859-1/help/configuration.html

@@ -22 +22 @@
   <li><strong>URL de la galerie</strong>: utilisé pour le flux RSS.</li>
 
-  <li><strong>Historique</strong>: visites des pages <span
-class="pwgScreen">category.php</span> et <span
-class="pwgScreen">picture.php</span> sont enregistrées dans la table
-<code>history</code>. Les visites sont affichées dans l'écran <span
-class="pwgScreen">Administration, Général, Historique</span>.</li>
-
   <li><strong>Verrouiller la galerie</strong>: Verrouiller l'ensemble de la
 galerie pour maintenance. Seul les administrateurs pourront accéder à la
@@ -36 +30 @@
   <li><strong>Notation par les visiteurs</strong>: Même les utilisateurs
 non enregistrés peuvent noter les images.</li>
+
+  <li><strong>Historique Utilisateurs</strong>: les visites des pages <span
+class="pwgScreen">index.php</span> et <span
+class="pwgScreen">picture.php</span> par les utilisateurs enregistrés sont
+enregistrées dans la table <code>history</code>. Les visites sont affichées
+dans l'écran <span class="pwgScreen">Administration, Général, Historique</span>.</li>
+
+  <li><strong>Historique Administrateur</strong>: les visites des pages
+  par les administrateurs sont enregistrées.</li>
+
+  <li><strong>Historique Invités</strong>: les visites des pages
+  par les invités sont enregistrées.</li>
+
+  <li><strong>Historique des connexions</strong>: chaque connexion
+  utilisateur, est enregistrée dans la table <code>history</code>.</li>
 
 </ul>

trunk/register.php

@@ -49 +49 @@
   {
     $user_id = get_userid($_POST['login']);
-    log_user( $user_id, false);
     redirect(make_index_url());
   }

trunk/template/yoga/admin/configuration.tpl

@@ -36 +36 @@
 
     <li>
-      <span class="property">{lang:History}</span>
-      <label><input type="radio" class="radio" name="log" value="true" {general.HISTORY_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="log" value="false" {general.HISTORY_NO} />{lang:No}</label>
-    </li>
-
-    <li>
       <span class="property">{lang:Lock gallery}</span>
       <label><input type="radio" class="radio" name="gallery_locked" value="true" {general.GALLERY_LOCKED_YES} />{lang:Yes}</label>
       <label><input type="radio" class="radio" name="gallery_locked" value="false" {general.GALLERY_LOCKED_NO} />{lang:No}</label>
     </li>
-    
+
     <li>
       <span class="property">{lang:Rating}</span>
@@ -57 +51 @@
       <label><input type="radio" class="radio" name="rate_anonymous" value="true" {general.RATE_ANONYMOUS_YES} />{lang:Yes}</label>
       <label><input type="radio" class="radio" name="rate_anonymous" value="false" {general.RATE_ANONYMOUS_NO} />{lang:No}</label>
+    </li>
+
+    <li>
+      <fieldset>
+        <legend>{lang:History}</legend>
+        <ul>
+          <li>
+            <label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {general.HISTORY_USERS} /></label>
+          </li>
+
+          <li>
+            <label><span class="property">{lang:user_status_admin}</span><input type="checkbox" name="history_admin" {general.HISTORY_ADMIN} /></label>
+          </li>
+
+          <li>
+            <label><span class="property">{lang:Guests}</span><input type="checkbox" name="history_guest" {general.HISTORY_GUEST} /></label>
+          </li>
+
+          <li>
+            <label><span class="property">{lang:Login history}</span><input type="checkbox" name="login_history" {general.LOGIN_HISTORY} /></label>
+          </li>
+        </ul>
+      </fieldset>
     </li>
   </ul>