Changeset 1719

Timestamp:

Jan 13, 2007, 4:13:40 AM (17 years ago)

Author:

rvelices

Message:

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%

Location:

trunk

Files:

• admin/include/functions.php (modified) (2 diffs)
• include/category_cats.inc.php (modified) (3 diffs)
• include/page_header.php (modified) (1 diff)
• include/template.php (modified) (2 diffs)
• profile.php (modified) (2 diffs)
• template/yoga/default-layout.css (modified) (1 diff)

trunk/admin/include/functions.php

@@ -529 +529 @@
     ('.implode(',', $dbfields).')
      VALUES';
-    foreach ($datas as $insert_id => $insert)
+    $first = 1;
+    foreach ($datas as $insert)
     {
       $query.= '
     ';
-      if ($insert_id > 0)
+      if ($first)
+      {
+        $first = 0;
+      }
+      else
       {
         $query.= ',';
@@ -1891 +1896 @@
   global $conf, $header_notes;
   $count = 0;
-  
+
   if (($conf['show_exif']) and (!function_exists('read_exif_data')))
   {

trunk/include/category_cats.inc.php

@@ -3 +3 @@
 // | 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)
@@ -38 +38 @@
 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'].'
@@ -152 +152 @@
 }
 
+if ($page['section']=='recent_cats')
+{
+  usort($categories, 'global_rank_compare');
+}
 if (count($categories) > 0)
 {

trunk/include/page_header.php

@@ -63 +63 @@
 
 // Header notes
-if (count($header_notes) > 0)
+if ( isset($header_notes) and count($header_notes)>0)
 {
   foreach ($header_notes as $header_note)

trunk/include/template.php

@@ -3 +3 @@
 // | 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$
@@ -294 +294 @@
     {
       $this->_tpldata['.'][0][$varname] = $varval;
-
-      return true;
-    }
-
+      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;
+    }
 
   /**

trunk/profile.php

@@ -3 +3 @@
 // | 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$
@@ -39 +39 @@
 check_status(ACCESS_CLASSIC);
 
-if ($user['is_the_guest'] and !$guest_allowed)
-{
-  echo '<div style="text-align:center;">'.$lang['only_members'].'<br />';
-  echo '<a href="./identification.php">'.$lang['ident_title'].'</a></div>';
-  exit();
-}
-
 $userdata = $user;
 

trunk/template/yoga/default-layout.css

@@ -234 +234 @@
 
 UL.tagSelection {
-  width: 40em;
+  width: 99%;
   margin: 1em 0 1em 0;
   padding: 0;