Changeset 2095

Timestamp:

Sep 19, 2007, 5:23:19 AM (17 years ago)

Author:

rvelices

Message:

merge -r 2094 from branch-1_7 to trunk

• fix: quick search error if the query term contained " or '
• optimized sql query in sync_users (called every time on admin page) - a lot faster when #user_cache_categories is big
• added function Template->delete_block_vars (opposite of assign_block_vars)

Location:

trunk

Files:

• admin/include/functions.php (modified) (1 diff)
• include/category_cats.inc.php (modified) (1 diff)
• include/template.php (modified) (1 diff)
• qsearch.php (modified) (1 diff)

trunk/admin/include/functions.php

@@ -1160 +1160 @@
   {
     $query = '
-SELECT user_id
+SELECT DISTINCT user_id
   FROM '.$table.'
 ;';

trunk/include/category_cats.inc.php

@@ -386 +386 @@
 
     $template->assign_var_from_handle('CATEGORIES', 'thumbnails');
-    unset( $template->_tpldata['thumbnails.'] );//maybe write a func for that
+    $template->delete_block_vars('thumbnails', true); // category_default reuse them
   }
   trigger_action('loc_end_index_category_thumbnails', $categories);

trunk/include/template.php

@@ -297 +297 @@
 
   /**
+   * Block-level variable deletion. Deletes the last block iteration.
+   * if all is true - all blocks are removed
+   * return true if a deletion occured
+   */
+  function delete_block_vars($blockname, $all=false)
+    {
+      $blocks = explode('.', $blockname);
+      $blockcount = count($blocks);
+      $str = '$this->_tpldata';
+      for ($i = 0; $i < $blockcount; $i++)
+      {
+        $str .= '[\'' . $blocks[$i] . '.\']';
+        eval('$lastiteration = isset('.$str.') ? sizeof('.$str.')-1:-1;');
+        if ($lastiteration==-1)
+        {
+          return false;
+        }
+        if ($i==$blockcount-1)
+        {
+          break;
+        }
+        $str .= '[' . $lastiteration . ']';
+      }
+
+      if ($all==true or $lastiteration==0)
+      {
+        $str ='unset('.$str.');';
+      }
+      else
+      {
+        $str ='unset('.$str.'['.$lastiteration.']);';
+      }
+      eval($str);
+      return true;
+    }
+
+  /**
    * Root-level variable assignment. Adds to current assignments, overriding
    * any existing variable assignment with the same name.

trunk/qsearch.php

@@ -44 +44 @@
   (rules, last_seen)
   VALUES
-  (\''.serialize($search).'\', NOW() )
+  (\''.addslashes(serialize($search)).'\', NOW() )
 ;';
 pwg_query($query);