Changeset 4385 for trunk/admin

Timestamp:

Nov 29, 2009, 1:35:19 PM (14 years ago)

Author:

nikrou

Message:

Feature_1255 :

• single quotes in queries
• start using $confdblayer

Location:

trunk/admin

Files:

• cat_modify.php (modified) (1 diff)
• include/c13y_internal.class.php (modified) (2 diffs)
• include/functions.php (modified) (1 diff)
• include/plugins.class.php (modified) (4 diffs)
• intro.php (modified) (1 diff)

trunk/admin/cat_modify.php

@@ -243 +243 @@
 
     'CAT_STATUS'        => $category['status'],
-    'CAT_VISIBLE'       => $category['visible'],
-    'CAT_COMMENTABLE'   => $category['commentable'],
-    'CAT_UPLOADABLE'    => $category['uploadable'],
+    'CAT_VISIBLE'       => boolean_to_string($category['visible']),
+    'CAT_COMMENTABLE'   => boolean_to_string($category['commentable']),
+    'CAT_UPLOADABLE'    => boolean_to_string($category['uploadable']),
 
     'IMG_ORDER_DEFAULT'  => empty($category['image_order']) ?

trunk/admin/include/c13y_internal.class.php

@@ -39 +39 @@
   function c13y_version($c13y)
   {
+    global $conf;
+
     $check_list = array();
 
@@ -44 +46 @@
 
     $db_version = pwg_get_db_version();
-    $check_list[] = array('type' => 'MySQL', 'current' => $db_version, 'required' => REQUIRED_MYSQL_VERSION);
+    $check_list[] = array('type' => $conf['dblayer'],
+                          'current' => $db_version, 
+                          'required' => constant('REQUIRED_'.strtoupper($conf['dblayer']).'_VERSION')
+                          );
 
     foreach ($check_list as $elem)

trunk/admin/include/functions.php

@@ -417 +417 @@
 {
   $query = '
-SELECT id, if(id_uppercat is null,\'\',id_uppercat) AS id_uppercat, uppercats, rank, global_rank
+SELECT id, id_uppercat, uppercats, rank, global_rank
   FROM '.CATEGORIES_TABLE.'
   ORDER BY id_uppercat,rank,name';

trunk/admin/include/plugins.class.php

@@ -81 +81 @@
         {
           $query = '
-INSERT INTO ' . PLUGINS_TABLE . ' (id,version) VALUES ("'
-. $plugin_id . '","' . $this->fs_plugins[$plugin_id]['version'] . '"
+INSERT INTO ' . PLUGINS_TABLE . ' (id,version) VALUES (\''
+. $plugin_id . '\',\'' . $this->fs_plugins[$plugin_id]['version'] . '\'
 )';
           pwg_query($query);
@@ -111 +111 @@
           $query = '
 UPDATE ' . PLUGINS_TABLE . '
-SET state="active", version="'.$this->fs_plugins[$plugin_id]['version'].'"
-WHERE id="' . $plugin_id . '"';
+SET state=\'active\', version=\''.$this->fs_plugins[$plugin_id]['version'].'\'
+WHERE id=\'' . $plugin_id . '\'';
           pwg_query($query);
         }
@@ -127 +127 @@
         }
         $query = '
-UPDATE ' . PLUGINS_TABLE . ' SET state="inactive" WHERE id="' . $plugin_id . '"';
+UPDATE ' . PLUGINS_TABLE . ' SET state=\'inactive\' WHERE id=\'' . $plugin_id . '\'';
         pwg_query($query);
         if (file_exists($file_to_include))
@@ -145 +145 @@
         }
         $query = '
-DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
+DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
         pwg_query($query);
         if (file_exists($file_to_include))

trunk/admin/intro.php

@@ -197 +197 @@
     'OS' => PHP_OS,
     'PHP_VERSION' => phpversion(),
-    'DB_ENGINE' => 'MySQL',
+    'DB_ENGINE' => $conf['dblayer'],
     'DB_VERSION' => $db_version,
     'DB_ELEMENTS' => l10n_dec('%d element', '%d elements', $nb_elements),