From 80754de17245e385bbbd7429bd2147312ee1b62e Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Sat, 13 Jan 2007 03:13:40 +0000
Subject: very small improvements: - mass_inserts does not requires keys to
 start at 0 - recent_cats categories are sorted by global_rank (consistency) -
 removed warning from page_header.php (when included from redirect) - added 2
 template functions for plugins (get_var and concat_var) - removed unused code
 from profile.php - changed css width for tag selection (search page) from
 55em to almost 100%

git-svn-id: http://piwigo.org/svn/trunk@1719 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/category_cats.inc.php |  8 ++++++--
 include/page_header.php       |  2 +-
 include/template.php          | 31 +++++++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index 67e666fb8..f6f188831 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $Id$
@@ -37,7 +37,7 @@ if ($page['section']=='recent_cats')
   $query = '
 SELECT
   id,name, representative_picture_id, comment, nb_images, uppercats,
-  date_last, max_date_last, count_images, count_categories
+  date_last, max_date_last, count_images, count_categories, global_rank
   FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
   ON id = cat_id and user_id = '.$user['id'].'
   WHERE date_last > SUBDATE(
@@ -151,6 +151,10 @@ SELECT representative_picture_id
   unset($image_id);
 }
 
+if ($page['section']=='recent_cats')
+{
+  usort($categories, 'global_rank_compare');
+}
 if (count($categories) > 0)
 {
   $thumbnail_src_of = array();
diff --git a/include/page_header.php b/include/page_header.php
index 8b0d69d2d..4ebe643b2 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -62,7 +62,7 @@ if (isset($header_infos))
 }
 
 // Header notes
-if (count($header_notes) > 0)
+if ( isset($header_notes) and count($header_notes)>0)
 {
   foreach ($header_notes as $header_note)
   {
diff --git a/include/template.php b/include/template.php
index 8de10e0d9..276464a22 100644
--- a/include/template.php
+++ b/include/template.php
@@ -2,10 +2,10 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -293,10 +293,37 @@ class Template {
   function assign_var($varname, $varval)
     {
       $this->_tpldata['.'][0][$varname] = $varval;
+      return true;
+    }
 
+  /**
+   * Root-level variable concatenation. Appends a  string to an existing
+   * variable assignment with the same name.
+   */
+  function concat_var($varname, $varval)
+    {
+      if ( isset($this->_tpldata['.'][0][$varname]) )
+      {
+        $this->_tpldata['.'][0][$varname] .= $varval;
+      }
+      else
+      {
+        $this->_tpldata['.'][0][$varname] = $varval;
+      }
       return true;
     }
 
+  /**
+   * Returns a root-level variable value
+   */
+  function get_var($varname, $default=null)
+    {
+      if ( isset($this->_tpldata['.'][0][$varname]) )
+      {
+        return $this->_tpldata['.'][0][$varname];
+      }
+      return $default;
+    }
 
   /**
    * Generates a full path+filename for the given filename, which can either
-- 
cgit v1.2.3