aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2009-11-29 12:35:19 +0000
committernikrou <nikrou@piwigo.org>2009-11-29 12:35:19 +0000
commitc96097529e49943eddba78d70e23e38c0eac494d (patch)
tree5925d92bcad222348680a3ea6253d5743dbe38a4 /admin/include
parent13ea9d50e35d9dd8cf7235a39d97a344e6091ea0 (diff)
Feature_1255 :
- single quotes in queries - start using $conf['dblayer'] git-svn-id: http://piwigo.org/svn/trunk@4385 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/c13y_internal.class.php7
-rw-r--r--admin/include/functions.php2
-rw-r--r--admin/include/plugins.class.php12
3 files changed, 13 insertions, 8 deletions
diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php
index 1fe83c0df..7b20e24db 100644
--- a/admin/include/c13y_internal.class.php
+++ b/admin/include/c13y_internal.class.php
@@ -38,12 +38,17 @@ class c13y_internal
*/
function c13y_version($c13y)
{
+ global $conf;
+
$check_list = array();
$check_list[] = array('type' => 'PHP', 'current' => phpversion(), 'required' => REQUIRED_PHP_VERSION);
$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)
{
diff --git a/admin/include/functions.php b/admin/include/functions.php
index b0d5da945..e503e17a8 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -416,7 +416,7 @@ function get_fs_directories($path, $recursive = true)
function update_global_rank()
{
$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';
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 9c5b238df..fb9db0c88 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -80,8 +80,8 @@ class plugins
if (empty($errors))
{
$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);
}
@@ -110,8 +110,8 @@ INSERT INTO ' . PLUGINS_TABLE . ' (id,version) VALUES ("'
{
$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);
}
break;
@@ -126,7 +126,7 @@ WHERE id="' . $plugin_id . '"';
die('invalid current state ' . $crt_db_plugin['state']);
}
$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))
{
@@ -144,7 +144,7 @@ UPDATE ' . PLUGINS_TABLE . ' SET state="inactive" WHERE id="' . $plugin_id . '"'
die ('CANNOT UNINSTALL - NOT INSTALLED');
}
$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))
{