Feature 1244 resolved

Replace all mysql functions in core code by ones independant of database engine

Fix small php code synxtax : hash must be accessed with [ ] and not { }.

git-svn-id: http://piwigo.org/svn/trunk@4325 68402e56-0260-453c-a942-63ccdbb3a9ee

14 files changed, 25 insertions, 25 deletions

diff --git a/install.php b/install.php
index 135c7fb47..a031d1bca 100644
--- a/install.php
+++ b/install.php
@@ -364,7 +364,7 @@ define(\'DB_COLLATE\', \'\');
     // Available upgrades must be ignored after a fresh installation. To
     // make PWG avoid upgrading, we must tell it upgrades have already been
     // made.
-    list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
+    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
     define('CURRENT_DATE', $dbnow);
     $datas = array();
     foreach (get_available_upgrade_ids() as $upgrade_id)
diff --git a/install/db/1-database.php b/install/db/1-database.php
index bd3441a3e..11554645f 100644
--- a/install/db/1-database.php
+++ b/install/db/1-database.php
@@ -32,7 +32,7 @@ $upgrade_description = 'Just a beginning test';
 // |                            Upgrade content                            |
 // +-----------------------------------------------------------------------+
 
-list($now) = mysql_fetch_row(pwg_query('SELECT NOW()'));
+list($now) = pwg_db_fetch_row(pwg_query('SELECT NOW()'));
 echo
 $now
 ."\n"
diff --git a/install/db/12-database.php b/install/db/12-database.php
index 5ccadd324..a6402f7f5 100644
--- a/install/db/12-database.php
+++ b/install/db/12-database.php
@@ -66,7 +66,7 @@ $result = pwg_query($query);
 
 $datas = array();
 
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   array_push(
     $datas,
diff --git a/install/db/18-database.php b/install/db/18-database.php
index 9843fb6af..c93249611 100644
--- a/install/db/18-database.php
+++ b/install/db/18-database.php
@@ -47,7 +47,7 @@ $result = pwg_query($query);
 
 $datas = array();
 
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   array_push(
     $datas,
diff --git a/install/db/19-database.php b/install/db/19-database.php
index 709e23bde..ada51b809 100644
--- a/install/db/19-database.php
+++ b/install/db/19-database.php
@@ -68,7 +68,7 @@ SELECT id, keywords
   WHERE keywords IS NOT NULL
 ;';
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   foreach(preg_split('/[,]+/', $row['keywords']) as $keyword)
   {
diff --git a/install/db/20-database.php b/install/db/20-database.php
index 9a29624b1..cf5ba0e73 100644
--- a/install/db/20-database.php
+++ b/install/db/20-database.php
@@ -47,7 +47,7 @@ SELECT category_id, image_id
 $result = pwg_query($query);
 
 $datas = array();
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   array_push(
     $datas,
diff --git a/install/db/65-database.php b/install/db/65-database.php
index 2d445ea3f..a43f433ee 100644
--- a/install/db/65-database.php
+++ b/install/db/65-database.php
@@ -108,7 +108,7 @@ if ( !defined('PWG_CHARSET') )
 SELECT language, COUNT(user_id) AS count FROM '.USER_INFOS_TABLE.'
   GROUP BY language';
   $result = pwg_query($query);
-  while ( $row=mysql_fetch_assoc($result) )
+  while ( $row=pwg_db_fetch_assoc($result) )
   {
     $language = $row["language"];
     $lang_def = explode('.', $language);
@@ -141,7 +141,7 @@ SELECT language, COUNT(user_id) AS count FROM '.USER_INFOS_TABLE.'
 SELECT language FROM '.USER_INFOS_TABLE.'
   WHERE user_id='.$conf['webmaster_id'];
   $result = pwg_query($query);
-  if (mysql_num_rows($result)==0)
+  if (pwg_db_num_rows($result)==0)
   {
     $query='
 SELECT language FROM '.USER_INFOS_TABLE.'
@@ -150,7 +150,7 @@ SELECT language FROM '.USER_INFOS_TABLE.'
     $result = pwg_query($query);
   }
 
-  if ( $row=mysql_fetch_assoc($result) )
+  if ( $row=pwg_db_fetch_assoc($result) )
   {
     $admin_charset = $all_langs[$row['language']]['charset'];
   }
@@ -165,7 +165,7 @@ SELECT language FROM '.USER_INFOS_TABLE.'
   $all_tables = array();
   $query = 'SHOW TABLES LIKE "'.$prefixeTable.'%"';
   $result = pwg_query($query);
-  while ( $row=mysql_fetch_assoc($result) )
+  while ( $row=pwg_db_fetch_assoc($result) )
   {
     array_push($all_tables, $row[0]);
   }
@@ -176,7 +176,7 @@ SELECT language FROM '.USER_INFOS_TABLE.'
     $query = 'SHOW FULL COLUMNS FROM '.$table;
     $result = pwg_query($query);
     $field_definitions=array();
-    while ( $row=mysql_fetch_assoc($result) )
+    while ( $row=pwg_db_fetch_assoc($result) )
     {
       if ( !isset($row['Collation']) or $row['Collation']=='NULL' )
         continue;
diff --git a/install/db/8-database.php b/install/db/8-database.php
index de742dcf7..89f92104b 100644
--- a/install/db/8-database.php
+++ b/install/db/8-database.php
@@ -60,7 +60,7 @@ $conf = $conf_save;
 // +-Do I already have them in DB ?----------------------------------------+
 $query = 'SELECT param FROM '.PREFIX_TABLE.'config';
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   unset( $params[ $row['param'] ] );
 }
diff --git a/install/db/9-database.php b/install/db/9-database.php
index 77f92c008..a21a99e89 100644
--- a/install/db/9-database.php
+++ b/install/db/9-database.php
@@ -47,7 +47,7 @@ $result = pwg_query($query);
 
 $datas = array();
 
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   array_push(
     $datas,
diff --git a/install/upgrade_1.3.0.php b/install/upgrade_1.3.0.php
index 761e016b0..c924dfecf 100644
--- a/install/upgrade_1.3.0.php
+++ b/install/upgrade_1.3.0.php
@@ -84,7 +84,7 @@ SELECT id, id_uppercat
   FROM '.CATEGORIES_TABLE.'
 ;';
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   if (!isset($row['id_uppercat']) or $row['id_uppercat'] == '')
   {
diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php
index 40657c7f7..8cd57538b 100644
--- a/install/upgrade_1.3.1.php
+++ b/install/upgrade_1.3.1.php
@@ -42,7 +42,7 @@ $query = '
 SELECT prefix_thumbnail, mail_webmaster
   FROM '.PREFIX_TABLE.'config
 ;';
-$save = mysql_fetch_assoc(pwg_query($query));
+$save = pwg_db_fetch_assoc(pwg_query($query));
 
 $queries = array(
   "
@@ -344,7 +344,7 @@ SHOW INDEX
   FROM '.PREFIX_TABLE.$table.'
 ;';
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     if ($row['Key_name'] != 'PRIMARY')
     {
@@ -536,7 +536,7 @@ SELECT DISTINCT(storage_category_id) AS unique_storage_category_id
   FROM '.IMAGES_TABLE.'
 ;';
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   array_push($cat_ids, $row['unique_storage_category_id']);
 }
@@ -561,7 +561,7 @@ SELECT id
   WHERE status = \'private\'
 ;';
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   array_push($cat_ids, $row['id']);
 }
diff --git a/install/upgrade_1.4.0.php b/install/upgrade_1.4.0.php
index 78ff1d5f7..05e59a132 100644
--- a/install/upgrade_1.4.0.php
+++ b/install/upgrade_1.4.0.php
@@ -42,7 +42,7 @@ SELECT value
   FROM '.CONFIG_TABLE.'
   WHERE param = \'prefix_thumbnail\'
 ;';
-list($prefix_thumbnail) = mysql_fetch_row(pwg_query($query));
+list($prefix_thumbnail) = pwg_db_fetch_row(pwg_query($query));
 
 // delete obsolete configuration
 $query = '
@@ -191,10 +191,10 @@ SELECT *
 ;';
 
 $datas = array();
-list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
+list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
 
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   $row['user_id'] = $row['id'];
   $row['registration_date'] = $dbnow;
diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php
index 87f9a0c7c..c1ea2e344 100644
--- a/install/upgrade_1.5.0.php
+++ b/install/upgrade_1.5.0.php
@@ -79,7 +79,7 @@ SELECT id, keywords
   WHERE keywords IS NOT NULL
 ;';
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     foreach(preg_split('/[,]+/', $row['keywords']) as $keyword)
     {
@@ -351,7 +351,7 @@ $conf = $conf_save;
 // Do I already have them in DB ?
 $query = 'SELECT param FROM '.PREFIX_TABLE.'config';
 $result = pwg_query($query);
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   unset( $params[ $row['param'] ] );
 }
@@ -452,7 +452,7 @@ DESC '.PREFIX_TABLE.'users
 
 $result = pwg_query($query);
 
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   if (!in_array($row['Field'], $to_keep))
   {
diff --git a/install/upgrade_1.7.0.php b/install/upgrade_1.7.0.php
index af8ca6103..a1bbb18f3 100644
--- a/install/upgrade_1.7.0.php
+++ b/install/upgrade_1.7.0.php
@@ -35,7 +35,7 @@ else
 
 define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db');
 
-list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
+list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
 define('CURRENT_DATE', $dbnow);
 
 // +-----------------------------------------------------------------------+