Issue 0000614: Display hits under thumbnails like comments counter

git-svn-id: http://piwigo.org/svn/trunk@1763 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 15 insertions, 3 deletions

diff --git a/admin/configuration.php b/admin/configuration.php
index 1d295e7cd..12235cce6 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -232,6 +232,8 @@ switch ($page['section'])
   {
     $show_yes = ($conf['show_nb_comments']==true)?'checked="checked"':'';
     $show_no = ($conf['show_nb_comments']==false)?'checked="checked"':'';
+    $hits_yes = ($conf['show_nb_hits']==true)?'checked="checked"':'';
+    $hits_no = ($conf['show_nb_hits']==false)?'checked="checked"':'';
     $expand_yes = ($conf['auto_expand']==true)?'checked="checked"':'';
     $expand_no  = ($conf['auto_expand']==false)?'checked="checked"':'';
 
@@ -247,7 +249,9 @@ switch ($page['section'])
         'EXPAND_YES'=>$expand_yes,
         'EXPAND_NO'=>$expand_no,
         'SHOW_COMMENTS_YES'=>$show_yes,
-        'SHOW_COMMENTS_NO'=>$show_no
+        'SHOW_COMMENTS_NO'=>$show_no,
+        'SHOW_HITS_YES'=>$hits_yes,
+        'SHOW_HITS_NO'=>$hits_no,
         ));
 
     $blockname = 'default.language_option';
diff --git a/admin/include/functions.php b/admin/include/functions.php
index a28e42582..a7fd10e36 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1157,6 +1157,8 @@ SELECT user_id
       $insert['expand'] = boolean_to_string($conf['auto_expand']);
       $insert['show_nb_comments'] =
         boolean_to_string($conf['show_nb_comments']);
+      $insert['show_nb_hits'] =
+        boolean_to_string($conf['show_nb_hits']);
       $insert['maxwidth'] = $conf['default_maxwidth'];
       $insert['maxheight'] = $conf['default_maxheight'];
       $insert['registration_date'] = $dbnow;
diff --git a/admin/user_list.php b/admin/user_list.php
index 84efc057f..3f663509b 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -342,9 +342,10 @@ DELETE FROM '.USER_GROUP_TABLE.'
   $formfields =
     array('nb_image_line', 'nb_line_page', 'template', 'language',
           'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
-          'maxheight', 'status', 'enabled_high');
+          'show_nb_hits', 'maxheight', 'status', 'enabled_high');
 
-  $true_false_fields = array('expand', 'show_nb_comments', 'enabled_high');
+  $true_false_fields = array('expand', 'show_nb_comments', 
+                       'show_nb_hits', 'enabled_high');
   if ($conf['allow_adviser'])
   {
     array_push($formfields, 'adviser');
@@ -556,6 +557,7 @@ foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
 //   $user['recent_period'] = $conf['recent_period'];
 //   $user['expand'] = $conf['auto_expand'];
 //   $user['show_nb_comments'] = $conf['show_nb_comments'];
+//   $user['show_nb_hits'] = $conf['show_nb_hits'];
 // ---
 
 if (isset($_POST['pref_submit']))
@@ -576,6 +578,10 @@ if (isset($_POST['pref_submit']))
         'true' == $_POST['show_nb_comments'] ? 'checked="checked"' : '',
       'SHOW_NB_COMMENTS_NO' =>
         'false' == $_POST['show_nb_comments'] ? 'checked="checked"' : '',
+      'SHOW_NB_HITS_YES' =>
+        'true' == $_POST['show_nb_hits'] ? 'checked="checked"' : '',
+      'SHOW_NB_HITS_NO' =>
+        'false' == $_POST['show_nb_hits'] ? 'checked="checked"' : '',
       'ENABLED_HIGH_YES' => 'true' == $_POST['enabled_high'] ? 'checked="checked"' : '',
       'ENABLED_HIGH_NO' => 'false' == $_POST['enabled_high'] ? 'checked="checked"' : '',
       ));