URL rewriting: capable of fully working with urls without ?

URL rewriting: works with image file instead of image id (change
make_picture_url to generate urls with file name instead of image id)

URL rewriting: completely works with category/best_rated and
picture/best_rated/534 (change 'category.php?' to 'category' in make_index_url
and 'picture.php?' to 'picture' in make_picture_url to see it)

fix: picture category display in upper bar

fix: function rate_picture variables and use of the new user type

fix: caddie icon appears now on category page

fix: admin element_set sql query was using storage_category_id column
(column has moved to #image_categories)

fix: replaced some old $_GET[xxx] with $page[xxx]

fix: pictures have metadata url (use ? parameter - might change later)

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

1 files changed, 13 insertions, 14 deletions

diff --git a/include/page_tail.php b/include/page_tail.php
index 88c813e24..50b433f9e 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -29,12 +29,8 @@ $template->set_filenames(array('tail'=>'footer.tpl'));
 $template->assign_vars(
   array(
     'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
-    
-    'L_GEN_TIME' => $lang['generation_time'],
-    'L_SQL_QUERIES_IN' => $lang['sql_queries_in'],
-    'L_SEND_MAIL' => $lang['send_mail'],
+
     'L_TITLE_MAIL' => urlencode($lang['title_send_mail']),
-    'L_POWERED_BY'=>$lang['powered_by']
     ));
 
 //--------------------------------------------------------------------- contact
@@ -50,6 +46,7 @@ if (!$user['is_the_guest'])
 }
 
 //------------------------------------------------------------- generation time
+$debug_vars = array();
 if ($conf['show_gt'])
 {
   $time = get_elapsed_time($t2, get_moment());
@@ -59,20 +56,22 @@ if ($conf['show_gt'])
     $page['count_queries'] = 0;
     $page['queries_time'] = 0;
   }
-  
-  $template->assign_block_vars(
-    'debug',
+
+  $debug_vars = array_merge($debug_vars,
     array('TIME' => $time,
           'NB_QUERIES' => $page['count_queries'],
-          'SQL_TIME' => number_format($page['queries_time'],3,'.',' ').' s'));
+          'SQL_TIME' => number_format($page['queries_time'],3,'.',' ').' s')
+          );
 }
 
-if ($conf['show_queries']) 
+if ($conf['show_queries'])
 {
-  $template->assign_block_vars(
-    'debug',
-    array('QUERIES_LIST' => $debug)
-  );
+  $debug_vars = array_merge($debug_vars, array('QUERIES_LIST' => $debug) );
+}
+
+if ( !empty($debug_vars) )
+{
+  $template->assign_block_vars('debug',$debug_vars );
 }
 
 //