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"' : '', )); diff --git a/include/category_default.inc.php b/include/category_default.inc.php index 8422fcf13..db8091c3e 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -104,6 +104,14 @@ foreach ($pictures as $row) 'CLASS' => 'thumbElmt', ) ); + if ($user['show_nb_hits'] + and isset($page['category']) + and $conf['show_nb_hits']) + { + $template->assign_block_vars( + 'thumbnails.line.thumbnail.nb_hits', + array('HITS'=> l10n_dec('%d hit', '%d hits', $row['hit']))); + } if ($conf['show_thumbnail_caption']) { diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 26e0a6a33..32ad4036a 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -161,6 +161,10 @@ $conf['tn_height'] = 128; // bottom of each page ? $conf['show_version'] = true; +// show_nb_hits : Show hits count under thumbnails +// false = never... true = depending on profile... +$conf['show_nb_hits'] = false; + // links : list of external links to add in the menu. An example is the best // than a long explanation : // diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 74c1c81f1..bf514ed31 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -160,6 +160,7 @@ function build_user( $user_id, $use_cache ) $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']; $user['enabled_high'] = $conf['newuser_default_enabled_high']; } else @@ -775,6 +776,7 @@ function create_user_infos($user_id) 'recent_period' => $conf['recent_period'], 'expand' => boolean_to_string($conf['auto_expand']), 'show_nb_comments' => boolean_to_string($conf['show_nb_comments']), + 'show_nb_hits' => boolean_to_string($conf['show_nb_hits']), 'maxwidth' => $conf['default_maxwidth'], 'maxheight' => $conf['default_maxheight'], 'registration_date' => $dbnow, diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index 6f382efdc..5de07a9d7 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -299,6 +299,8 @@ $lang['%d comment to validate'] = '%d comment to validate'; $lang['%d comments to validate'] = '%d comments to validate'; $lang['%d new comment'] = '%d new comment'; $lang['%d new comments'] = '%d new comments'; +$lang['%d hit'] = '%d hit'; +$lang['%d hits'] = '%d hits'; $lang['%d new element'] = '%d new element'; $lang['%d new elements'] = '%d new elements'; $lang['%d new user'] = '%d new user'; @@ -570,6 +572,7 @@ $lang['searched words : %s'] = 'searched words : %s'; $lang['send_mail'] = 'Contact'; $lang['set as category representative'] = 'set as category representative'; $lang['show_nb_comments'] = 'Show number of comments'; +$lang['show_nb_hits'] = 'Show hits count'; $lang['slideshow'] = 'slideshow'; $lang['slideshow_stop'] = 'stop the slideshow'; $lang['special_categories'] = 'Specials'; diff --git a/language/en_UK.iso-8859-1/help/configuration.html b/language/en_UK.iso-8859-1/help/configuration.html index f26d7f3b9..8e6068c6e 100644 --- a/language/en_UK.iso-8859-1/help/configuration.html +++ b/language/en_UK.iso-8859-1/help/configuration.html @@ -93,6 +93,12 @@ users.