Changeset 21238

Timestamp:

Mar 6, 2013, 1:54:04 PM (11 years ago)

Author:

plg

Message:

compatibility with Piwigo 2.5: replace functions mysql_* with pwg_db_* equivalent

switch version to "auto"

use the new $template->add_index_button function

Location:

extensions/piclens

Files:

• admin/functions.inc.php (modified) (1 diff)
• admin/piclenswallconfig.php (modified) (4 diffs)
• admin/rssfeed.php (modified) (1 diff)
• generate_rss.php (modified) (3 diffs)
• include/Piclens.class.php (modified) (5 diffs)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)

extensions/piclens/admin/functions.inc.php

@@ -57 +57 @@
 
 $ext = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     if (empty($row['tn_ext']))

extensions/piclens/admin/piclenswallconfig.php

@@ -43 +43 @@
         if (!empty($result))
         {
-                while ($row = mysql_fetch_assoc($result))
+                while ($row = pwg_db_fetch_assoc($result))
                         array_push($categories, $row);                  
         }
@@ -67 +67 @@
   $me->my_config['piclens_wall_nav'] = isset($_POST['piclens_wall_nav']);
   $me->my_config['piclens_wall_cat_nav_replace'] = isset($_POST['categories_nav']) ? 
-                          array_map("mysql_escape_string", $_POST['categories_nav']) :
+                          array_map("pwg_db_real_escape_string", $_POST['categories_nav']) :
                           array(); 
   $me->my_config['piclens_wall_specif'] =   $_POST['piclens_wall_specif'];
@@ -124 +124 @@
 if (!empty($result))
 {
-        while ($row = mysql_fetch_assoc($result))
+        while ($row = pwg_db_fetch_assoc($result))
                 array_push($categories, $row);
 }
@@ -157 +157 @@
 if (!empty($result))
 {
-        while ($row = mysql_fetch_assoc($result))
+        while ($row = pwg_db_fetch_assoc($result))
                 array_push($categories, $row);
 }

extensions/piclens/admin/rssfeed.php

@@ -35 +35 @@
   
   $included_file_types = isset($_POST['file_types']) ? 
-                          array_map("mysql_escape_string", $_POST['file_types']) :
+                          array_map("pwg_db_real_escape_string", $_POST['file_types']) :
                           array(); 
   $me->my_config['included_file_types'] = $included_file_types;

extensions/piclens/generate_rss.php

@@ -251 +251 @@
                                         $result = pwg_query($query);
 
-                                        while ($row = mysql_fetch_assoc($result))
+                                        while ($row = pwg_db_fetch_assoc($result))
                                         {
                                                 if (!(in_array($row['id'], explode(',', $user['forbidden_categories']))))
@@ -386 +386 @@
                         $result = pwg_query($query);
                         
-                        while ($row = mysql_fetch_assoc($result))
+                        while ($row = pwg_db_fetch_assoc($result))
                         {
                                 // Plugin Extended Description present et active
@@ -756 +756 @@
                 $first = true;
 
-                while ($row = mysql_fetch_array($result))
+                while ($row = pwg_db_fetch_assoc($result))
                 {
                 

extensions/piclens/include/Piclens.class.php

@@ -84 +84 @@
                                                 $piclnkMaster='';
                                                 $result = pwg_query($query);
-                                                while ($row = mysql_fetch_assoc($result))
+                                                while ($row = pwg_db_fetch_assoc($result))
                                                 {
                                                         // Gestion des permalinks
@@ -150 +150 @@
                                                         $result = pwg_query($query);
 
-                                                        while ($row = mysql_fetch_assoc($result))
+                                                        while ($row = pwg_db_fetch_assoc($result))
                                                         {
                                                                 if (!(in_array($row['id'], explode(',', $user['forbidden_categories']))))
@@ -193 +193 @@
                                                         $result = pwg_query($query);
 
-                                                        while ($row = mysql_fetch_array($result))
+                                                        while ($row = pwg_db_fetch_assoc($result))
                                                         {
                                                                 $piclnkMaster.='<link rel="alternate"'
@@ -283 +283 @@
                                                 $tpl_code='<li><img src="'.$this->root_site_piclens.PICLENS_IMG_PATH.'cooliris-icon-black.png" NAME="but1" class="button" alt="'.l10n('piclens_button').'" width="24" height="24"></a></li>';
                                 }
+        
                                 if (isset($tpl_code))
-                                        $template->concat('PLUGIN_INDEX_ACTIONS', $tpl_code."\n");
+        {
+          $template->add_index_button($tpl_code, 100);
+        }
                         }
                         
@@ -318 +321 @@
             if($result) 
                 {
-                     $row = mysql_fetch_row($result);
+                     $row = pwg_db_fetch_row($result);
                      if(is_string($row[0])) 
                          {

extensions/piclens/main.inc.php

@@ -2 +2 @@
 /*
  * Plugin Name: CoolIris-Piclens
- * Version: 0.4.4
+ * Version: auto
  * Description: Cooliris/Piclens activation
  * Plugin URI: http://piwigo.org/ext/extension_view.php?eid=234

extensions/piclens/maintain.inc.php

@@ -26 +26 @@
         if($result) 
         {
-                 $row = mysql_fetch_row($result);
+                 $row = pwg_db_fetch_row($result);
                  if(is_string($row[0])) 
                  {