aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2004-12-27 14:30:49 +0000
committerplegall <plg@piwigo.org>2004-12-27 14:30:49 +0000
commit7ba15740434b476e8aef0253919f19ba37e07dc7 (patch)
tree4bba6d6d3e5490189fdc79dee1a51ba6c2e4cb31 /include
parent4c8d18de5b904eddaa900deca20c7d6f7ac928d1 (diff)
- admin/update : filesystem synchronization process completely
rewritten. How to speed up sync ? by avoiding recursivity ! - admin/update : option to display verbose information details - admin/update : option to simulate only. No database insert, delete or update will be made - bug fixed : in admin/cat_list, if you delete a virtual category, you may create a gap in the rank list. This gap will generate errors when trying to move a category on this gap. Fixed by calling ordering and update_global_rank at category deletion. - admin/cat_list, only one query to insert a new virtual category (no need of a second query to update uppercats and global_rank) - for a given category, even if empty, the representing element must not be the one of a forbidden category for the current user - generation time optionnaly displayed on the bottom of each page becomes more price : number of SQL queries and SQL time added. git-svn-id: http://piwigo.org/svn/trunk@659 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/category_subcats.inc.php9
-rw-r--r--include/functions.inc.php15
-rw-r--r--include/page_tail.php17
3 files changed, 24 insertions, 17 deletions
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 7e6d080d8..4ee5929ea 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -69,7 +69,14 @@ while ($row = mysql_fetch_array($result))
SELECT path, tn_ext
FROM '.CATEGORIES_TABLE.' AS c INNER JOIN '.IMAGES_TABLE.' AS i
ON i.id = c.representative_picture_id
- WHERE uppercats REGEXP \'(^|,)'.$row['id'].'(,|$)\'
+ WHERE uppercats REGEXP \'(^|,)'.$row['id'].'(,|$)\'';
+ // we must not show pictures of a forbidden category
+ if ($user['forbidden_categories'] != '')
+ {
+ $query.= '
+ AND c.id NOT IN ('.$user['forbidden_categories'].')';
+ }
+ $query.= '
ORDER BY RAND()
LIMIT 0,1
;';
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 915a1b6b6..adbbce358 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -461,24 +461,23 @@ function pwg_write_debug()
function pwg_query($query)
{
- global $conf;
+ global $conf,$count_queries,$queries_time;
$start = get_moment();
$result = mysql_query($query);
-
+
+ $time = get_moment() - $start;
+ $count_queries++;
+ $queries_time+= $time;
+
if ($conf['show_queries'])
{
- global $count_queries,$queries_time;
-
- $time = get_moment() - $start;
- $count_queries++;
-
$output = '';
$output.= '<pre>['.$count_queries.'] '."\n".$query;
- $queries_time+= $time;
$output.= "\n".'(this query time : '.number_format( $time, 3, '.', ' ').' s)</b>';
$output.= "\n".'(total SQL time : '.number_format( $queries_time, 3, '.', ' ').' s)';
$output.= '</pre>';
+
echo $output;
}
diff --git a/include/page_tail.php b/include/page_tail.php
index 1092daefc..8ea329f4d 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -26,26 +26,27 @@
// +-----------------------------------------------------------------------+
$template->set_filenames(array('tail'=>'footer.tpl'));
-//------------------------------------------------------------- generation time
-
-$time = get_elapsed_time( $t2, get_moment() );
-
$template->assign_vars(
array(
- 'TIME' => $time,
'VERSION' => PHPWG_VERSION,
'MAIL'=>$conf['mail_webmaster'],
'L_GEN_TIME' => $lang['generation_time'],
+ 'L_SQL_QUERIES_IN' => $lang['sql_queries_in'],
'L_SEND_MAIL' => $lang['send_mail'],
'L_TITLE_MAIL' => $lang['title_send_mail'],
'L_WEBMASTER'=>$lang['webmaster'],
-
));
-
+//------------------------------------------------------------- generation time
if ($conf['show_gt'])
{
- $template->assign_block_vars('debug', array());
+ $time = get_elapsed_time( $t2, get_moment() );
+
+ $template->assign_block_vars(
+ 'debug',
+ array('TIME' => $time,
+ 'NB_QUERIES' => $count_queries,
+ 'SQL_TIME' => number_format($queries_time, 3, '.', ' ').' s'));
}
//