Changeset 4325 for trunk/include

Timestamp:

Nov 20, 2009, 3:17:04 PM (14 years ago)

Author:

nikrou

Message:

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 { }.

Location:

trunk/include

Files:

• calendar_monthly.class.php (modified) (4 diffs)
• category_cats.inc.php (modified) (5 diffs)
• category_default.inc.php (modified) (1 diff)
• common.inc.php (modified) (2 diffs)
• dblayer (added)
• dblayer/functions_mysql.inc.php (added)
• functions.inc.php (modified) (9 diffs)
• functions_category.inc.php (modified) (8 diffs)
• functions_comment.inc.php (modified) (4 diffs)
• functions_mail.inc.php (modified) (3 diffs)
• functions_notification.inc.php (modified) (5 diffs)
• functions_plugins.inc.php (modified) (1 diff)
• functions_rate.inc.php (modified) (1 diff)
• functions_search.inc.php (modified) (4 diffs)
• functions_session.inc.php (modified) (1 diff)
• functions_tag.inc.php (modified) (4 diffs)
• functions_user.inc.php (modified) (20 diffs)
• picture_comment.inc.php (modified) (2 diffs)
• picture_rate.inc.php (modified) (2 diffs)
• ws_functions.inc.php (modified) (18 diffs)

trunk/include/calendar_monthly.class.php

@@ -232 +232 @@
   $result = pwg_query($query);
   $items=array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $y = substr($row['period'], 0, 4);
@@ -284 +284 @@
   $result = pwg_query($query);
   $items=array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $m = (int)substr($row['period'], 0, 2);
@@ -334 +334 @@
   $items=array();
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $d = (int)$row['period'];
@@ -352 +352 @@
     unset ( $page['chronology_date'][CDAY] );
 
-    $row = mysql_fetch_assoc(pwg_query($query));
+    $row = pwg_db_fetch_assoc(pwg_query($query));
     $items[$day]['tn_url'] = get_thumbnail_url($row);
     $items[$day]['file'] = $row['file'];

trunk/include/category_cats.inc.php

@@ -76 +76 @@
 $image_ids = array();
 
-while ($row = mysql_fetch_assoc($result))
+while ($row = pwg_db_fetch_assoc($result))
 {
   $row['is_child_date_last'] = @$row['max_date_last']>@$row['date_last'];
@@ -109 +109 @@
 ;';
       $subresult = pwg_query($query);
-      if (mysql_num_rows($subresult) > 0)
+      if (pwg_db_num_rows($subresult) > 0)
       {
-        list($image_id) = mysql_fetch_row($subresult);
+        list($image_id) = pwg_db_fetch_row($subresult);
       }
     }
@@ -137 +137 @@
   ;';
       $subresult = pwg_query($query);
-      if (mysql_num_rows($subresult) > 0)
+      if (pwg_db_num_rows($subresult) > 0)
       {
-        list($image_id) = mysql_fetch_row($subresult);
+        list($image_id) = pwg_db_fetch_row($subresult);
       }
     }
@@ -179 +179 @@
 ;';
     $result = pwg_query($query);
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       $dates_of_category[ $row['category_id'] ] = array(
@@ -203 +203 @@
 ;';
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $thumbnail_src_of[$row['id']] = get_thumbnail_url($row);

trunk/include/category_default.inc.php

@@ -46 +46 @@
 ;';
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $row['rank'] = $rank_of[ $row['id'] ];

trunk/include/common.inc.php

@@ -93 +93 @@
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+include(PHPWG_ROOT_PATH .'include/dblayer/functions_mysql.inc.php');
 
 if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors']))
@@ -105 +106 @@
 
 // Database connection
-@mysql_connect( $conf['db_host'], $conf['db_user'], $conf['db_password'] ) or my_error( 'mysql_connect', true );
-@mysql_select_db( $conf['db_base'] ) or my_error( 'mysql_select_db', true );
-
-defined('PWG_CHARSET') and defined('DB_CHARSET')
-  or fatal_error('PWG_CHARSET and/or DB_CHARSET is not defined');
-if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') )
-{
-  if (DB_CHARSET!='')
-  {
-    pwg_query('SET NAMES "'.DB_CHARSET.'"');
-  }
-}
-elseif ( strtolower(PWG_CHARSET)!='iso-8859-1' )
-{
-  fatal_error('PWG supports only iso-8859-1 charset on MySql version '.mysql_get_server_info());
-}
+$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], 
+                              $conf['db_password'], $conf['db_base']) 
+  or my_error('pwg_db_connect', true);
+
+pwg_db_check_charset();
 
 load_conf_from_db();

trunk/include/functions.inc.php

@@ -45 +45 @@
   // columns are 'Field', 'Type'
   $result = pwg_query('desc '.$table);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     // we are only interested in the the field given in parameter for the
@@ -60 +60 @@
     }
   }
-  mysql_free_result($result);
+  pwg_db_free_result($result);
   return $options;
 }
@@ -597 +597 @@
 }
 
-function pwg_query($query)
-{
-  global $conf,$page,$debug,$t2;
-
-  $start = get_moment();
-  ($result = mysql_query($query)) or my_error($query, $conf['die_on_sql_error']);
-
-  $time = get_moment() - $start;
-
-  if (!isset($page['count_queries']))
-  {
-    $page['count_queries'] = 0;
-    $page['queries_time'] = 0;
-  }
-
-  $page['count_queries']++;
-  $page['queries_time']+= $time;
-
-  if ($conf['show_queries'])
-  {
-    $output = '';
-    $output.= '<pre>['.$page['count_queries'].'] ';
-    $output.= "\n".$query;
-    $output.= "\n".'(this query time : ';
-    $output.= '<b>'.number_format($time, 3, '.', ' ').' s)</b>';
-    $output.= "\n".'(total SQL time  : ';
-    $output.= number_format($page['queries_time'], 3, '.', ' ').' s)';
-    $output.= "\n".'(total time      : ';
-    $output.= number_format( ($time+$start-$t2), 3, '.', ' ').' s)';
-    if ( $result!=null and preg_match('/\s*SELECT\s+/i',$query) )
-    {
-      $output.= "\n".'(num rows        : ';
-      $output.= mysql_num_rows($result).' )';
-    }
-    elseif ( $result!=null
-      and preg_match('/\s*INSERT|UPDATE|REPLACE|DELETE\s+/i',$query) )
-    {
-      $output.= "\n".'(affected rows   : ';
-      $output.= mysql_affected_rows().' )';
-    }
-    $output.= "</pre>\n";
-
-    $debug .= $output;
-  }
-
-  return $result;
-}
-
 function pwg_debug( $string )
 {
@@ -904 +856 @@
 
   return $thumbnail_title;
-}
-
-// my_error returns (or send to standard output) the message concerning the
-// error occured for the last mysql query.
-function my_error($header, $die)
-{
-  $error = "[mysql error ".mysql_errno().'] '.mysql_error()."\n";
-  $error .= $header;
-
-  if ($die)
-  {
-    fatal_error($error);
-  }
-  echo("<pre>");
-  trigger_error($error, E_USER_WARNING);
-  echo("</pre>");
-}
-
-
-/**
- * creates an array based on a query, this function is a very common pattern
- * used here
- *
- * @param string $query
- * @param string $fieldname
- * @return array
- */
-function array_from_query($query, $fieldname)
-{
-  $array = array();
-
-  $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
-  {
-    array_push($array, $row[$fieldname]);
-  }
-
-  return $array;
 }
 
@@ -1122 +1036 @@
   WHERE '.$conf['user_fields']['id'].' = '.$conf['webmaster_id'].'
 ;';
-  list($email) = mysql_fetch_row(pwg_query($query));
+  list($email) = pwg_db_fetch_row(pwg_query($query));
 
   return $email;
@@ -1143 +1057 @@
   $result = pwg_query($query);
 
-  if ((mysql_num_rows($result) == 0) and !empty($condition))
+  if ((pwg_db_num_rows($result) == 0) and !empty($condition))
   {
     fatal_error('No configuration data');
   }
 
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $conf[ $row['param'] ] = isset($row['value']) ? $row['value'] : '';
@@ -1193 +1107 @@
 
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $array[ $row[$keyname] ] = $row[$valuename];
@@ -1214 +1128 @@
   $array = array();
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $array[ $row[$keyname] ] = $row;
@@ -1585 +1499 @@
     // Use MySql date in order to standardize all recent "actions/queries"
     list($cache['get_icon']['sql_recent_date']) =
-      mysql_fetch_row(pwg_query('select SUBDATE(
+      pwg_db_fetch_row(pwg_query('select SUBDATE(
       CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)'));
   }

trunk/include/functions_category.inc.php

@@ -102 +102 @@
   $cats = array();
   $selected_category = isset($page['category']) ? $page['category'] : null;
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $child_date_last = @$row['max_date_last']> @$row['date_last'];
@@ -166 +166 @@
   WHERE id = '.$id.'
 ;';
-  $cat = mysql_fetch_assoc(pwg_query($query));
+  $cat = pwg_db_fetch_assoc(pwg_query($query));
   if (empty($cat))
     return null;
@@ -241 +241 @@
     $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$category_id;
     $query.= ';';
-    $row = mysql_fetch_assoc( pwg_query( $query ) );
+    $row = pwg_db_fetch_assoc( pwg_query( $query ) );
     $uppercats = $row['uppercats'];
   }
@@ -252 +252 @@
   $query.= ';';
   $result = pwg_query( $query );
-  while( $row = mysql_fetch_assoc( $result ) )
+  while( $row = pwg_db_fetch_assoc( $result ) )
   {
     $database_dirs[$row['id']] = $row['dir'];
@@ -276 +276 @@
     AND c.id = '.$category_id.'
 ;';
-  $row = mysql_fetch_assoc(pwg_query($query));
+  $row = pwg_db_fetch_assoc(pwg_query($query));
   return $row['galleries_url'];
 }
@@ -345 +345 @@
   if (!empty($result))
   {
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       array_push($categories, $row);
@@ -385 +385 @@
 
   $subcats = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($subcats, $row['id']);
@@ -534 +534 @@
 LIMIT 1';
 
-      $show_link = mysql_num_rows(pwg_query($query)) <> 0;
+      $show_link = pwg_db_num_rows(pwg_query($query)) <> 0;
     }
   }

trunk/include/functions_comment.inc.php

@@ -101 +101 @@
   FROM '.USERS_TABLE.'
   WHERE '.$conf['user_fields']['username']." = '".addslashes($comm['author'])."'";
-      $row = mysql_fetch_assoc( pwg_query( $query ) );
+      $row = pwg_db_fetch_assoc( pwg_query( $query ) );
       if ( $row['user_exists'] == 1 )
       {
@@ -139 +139 @@
   WHERE date > FROM_UNIXTIME('.$reference_date.')
     AND author_id = '.$comm['author_id'];
-    if ( mysql_num_rows( pwg_query( $query ) ) > 0 )
+    if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
     {
       array_push( $infos, l10n('comment_anti-flood') );
@@ -169 +169 @@
     pwg_query($query);
 
-    $comm['id'] = mysql_insert_id();
+    $comm['id'] = pwg_db_insert_id();
 
     if (($comment_action=='validate' and $conf['email_admin_on_comment']) or
@@ -267 +267 @@
   WHERE date > FROM_UNIXTIME('.$reference_date.')
     AND author_id = '.$comm['author_id'];
-    if ( mysql_num_rows( pwg_query( $query ) ) > 0 )
+    if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
     {
       //?? array_push( $infos, l10n('comment_anti-flood') );

trunk/include/functions_mail.inc.php

@@ -352 +352 @@
   if (!empty($datas))
   {
-    while ($admin = mysql_fetch_assoc($datas))
+    while ($admin = pwg_db_fetch_assoc($datas))
     {
       if (!empty($admin['mail_address']))
@@ -448 +448 @@
   $result = pwg_query($query);
 
-  if (mysql_num_rows($result) > 0)
+  if (pwg_db_num_rows($result) > 0)
   {
     $list = array();
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       $row['template_theme'] = $row['template'];
@@ -477 +477 @@
       $result = pwg_query($query);
 
-      if (mysql_num_rows($result) > 0)
+      if (pwg_db_num_rows($result) > 0)
       {
         $Bcc = array();
-        while ($row = mysql_fetch_assoc($result))
+        while ($row = pwg_db_fetch_assoc($result))
         {
           if (!empty($row['mail_address']))

trunk/include/functions_notification.inc.php

@@ -146 +146 @@
     $query = 'SELECT count(distinct '.$field_id.') as CountId
 '.$query;
-    list($count) = mysql_fetch_row(pwg_query($query));
+    list($count) = pwg_db_fetch_row(pwg_query($query));
     return $count;
 
@@ -179 +179 @@
     $infos = array();
 
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       array_push($infos, $row);
@@ -449 +449 @@
   $result = pwg_query($query);
   $dates = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($dates, $row);
@@ -469 +469 @@
       $dates[$i]['elements'] = array();
       $result = pwg_query($query);
-      while ($row = mysql_fetch_assoc($result))
+      while ($row = pwg_db_fetch_assoc($result))
       {
         array_push($dates[$i]['elements'], $row);
@@ -489 +489 @@
       $dates[$i]['categories'] = array();
       $result = pwg_query($query);
-      while ($row = mysql_fetch_assoc($result))
+      while ($row = pwg_db_fetch_assoc($result))
       {
         array_push($dates[$i]['categories'], $row);

trunk/include/functions_plugins.inc.php

@@ -239 +239 @@
   $result = pwg_query($query);
   $plugins = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($plugins, $row);

trunk/include/functions_rate.inc.php

@@ -125 +125 @@
   WHERE element_id = '.$image_id.'
 ;';
-  $row = mysql_fetch_assoc(pwg_query($query));
+  $row = pwg_db_fetch_assoc(pwg_query($query));
   $query = '
 UPDATE '.IMAGES_TABLE.'

trunk/include/functions_search.inc.php

@@ -42 +42 @@
   WHERE id = '.$search_id.'
 ;';
-  list($serialized_rules) = mysql_fetch_row(pwg_query($query));
+  list($serialized_rules) = pwg_db_fetch_row(pwg_query($query));
 
   return unserialize($serialized_rules);
@@ -459 +459 @@
   $by_weights=array();
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   { // weight is important when sorting images by relevance
     if ($row['weight'])
@@ -490 +490 @@
   GROUP BY image_id';
       $result = pwg_query($query);
-      while ($row = mysql_fetch_assoc($result))
+      while ($row = pwg_db_fetch_assoc($result))
       { // weight is important when sorting images by relevance
         $image_id=(int)$row['image_id'];
@@ -511 +511 @@
     );
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   { // weight is important when sorting images by relevance
     if ($row['nb_images']==0)

trunk/include/functions_session.inc.php

@@ -122 +122 @@
   if ($result)
   {
-    $row = mysql_fetch_assoc($result);
+    $row = pwg_db_fetch_assoc($result);
     return $row['data'];
   }

trunk/include/functions_tag.inc.php

@@ -64 +64 @@
   $result = pwg_query($query);
   $tags = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $counter = @$tag_counters[ $row['id'] ];
@@ -89 +89 @@
   $result = pwg_query($query);
   $tags = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($tags, $row);
@@ -250 +250 @@
   $result = pwg_query($query);
   $tags = array();
-  while($row = mysql_fetch_assoc($result))
+  while($row = pwg_db_fetch_assoc($result))
   {
     array_push($tags, $row);
@@ -312 +312 @@
   $result = pwg_query($query);
   $tags = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($tags, $row);

trunk/include/functions_user.inc.php

@@ -59 +59 @@
 '.(is_numeric($user_id) ? 'and '.$conf['user_fields']['id'].' != \''.$user_id.'\'' : '').'
 ;';
-    list($count) = mysql_fetch_row(pwg_query($query));
+    list($count) = pwg_db_fetch_row(pwg_query($query));
     if ($count != 0)
     {
@@ -111 +111 @@
   FROM '.USERS_TABLE.'
 ;';
-    list($next_id) = mysql_fetch_row(pwg_query($query));
+    list($next_id) = pwg_db_fetch_row(pwg_query($query));
 
     $insert =
       array(
         $conf['user_fields']['id'] => $next_id,
-        $conf['user_fields']['username'] => mysql_real_escape_string($login),
+        $conf['user_fields']['username'] => pwg_db_real_escape_string($login),
         $conf['user_fields']['password'] => $conf['pass_convert']($password),
         $conf['user_fields']['email'] => $mail_address
@@ -135 +135 @@
 
       $inserts = array();
-      while ($row = mysql_fetch_assoc($result))
+      while ($row = pwg_db_fetch_assoc($result))
       {
         array_push
@@ -250 +250 @@
   WHERE '.$conf['user_fields']['id'].' = \''.$user_id.'\'';
 
-  $row = mysql_fetch_assoc(pwg_query($query));
+  $row = pwg_db_fetch_assoc(pwg_query($query));
 
   while (true)
@@ -260 +260 @@
   WHERE ui.user_id = \''.$user_id.'\'';
     $result = pwg_query($query);
-    if (mysql_num_rows($result) > 0)
+    if (pwg_db_num_rows($result) > 0)
     {
       break;
@@ -270 +270 @@
   }
 
-  $row = array_merge($row, mysql_fetch_assoc($result));
+  $row = array_merge($row, pwg_db_fetch_assoc($result));
 
   foreach ($row as $key => $value)
@@ -325 +325 @@
   WHERE category_id NOT IN ('.$userdata['forbidden_categories'].')
     AND image_id '.$userdata['image_access_type'].' ('.$userdata['image_access_list'].')';
-      list($userdata['nb_total_images']) = mysql_fetch_row(pwg_query($query));
+      list($userdata['nb_total_images']) = pwg_db_fetch_row(pwg_query($query));
 
 
@@ -429 +429 @@
   $result = pwg_query($query);
   $authorizeds = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($authorizeds, $row['image_id']);
@@ -441 +441 @@
   $result = pwg_query($query);
   $favorites = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($favorites, $row['image_id']);
@@ -482 +482 @@
 ;';
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($private_array, $row['id']);
@@ -524 +524 @@
 ;';
     $result = pwg_query($query);
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       array_push($forbidden_array, $row['id']);
@@ -648 +648 @@
 
   $cats = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $row['user_id'] = $userdata['id'];
@@ -693 +693 @@
   global $conf;
 
-  $username = mysql_real_escape_string($username);
+  $username = pwg_db_real_escape_string($username);
 
   $query = '
@@ -702 +702 @@
   $result = pwg_query($query);
 
-  if (mysql_num_rows($result) == 0)
+  if (pwg_db_num_rows($result) == 0)
   {
     return false;
@@ -708 +708 @@
   else
   {
-    list($user_id) = mysql_fetch_row($result);
+    list($user_id) = pwg_db_fetch_row($result);
     return $user_id;
   }
@@ -728 +728 @@
   WHERE id = \''.$key.'\'
 ;';
-    list($count) = mysql_fetch_row(pwg_query($query));
+    list($count) = pwg_db_fetch_row(pwg_query($query));
     if (0 == $count)
     {
@@ -751 +751 @@
 
     $result = pwg_query($query);
-    $cache['default_user'] = mysql_fetch_assoc($result);
+    $cache['default_user'] = pwg_db_fetch_assoc($result);
 
     if ($cache['default_user'] !== false)
@@ -866 +866 @@
   {
     $inserts = array();
-    list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
+    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
 
     $default_user = get_default_user_info(false);
@@ -931 +931 @@
 WHERE '.$conf['user_fields']['id'].' = '.$user_id;
   $result = pwg_query($query);
-  if (mysql_num_rows($result) > 0)
-  {
-    $row = mysql_fetch_assoc($result);
+  if (pwg_db_num_rows($result) > 0)
+  {
+    $row = pwg_db_fetch_assoc($result);
     $username = stripslashes($row['username']);
     $data = $time.stripslashes($row['username']).$row['password'];
@@ -1042 +1042 @@
   WHERE '.$conf['user_fields']['username'].' = \''.mysql_real_escape_string($username).'\'
 ;';
-  $row = mysql_fetch_assoc(pwg_query($query));
+  $row = pwg_db_fetch_assoc(pwg_query($query));
   if ($row['password'] == $conf['pass_convert']($password))
   {

trunk/include/picture_comment.inc.php

@@ -94 +94 @@
   FROM '.COMMENTS_TABLE.'
   WHERE image_id='.$page['image_id']." AND validated = 'true'";
-  $row = mysql_fetch_assoc( pwg_query( $query ) );
+  $row = pwg_db_fetch_assoc( pwg_query( $query ) );
 
   // navigation bar creation
@@ -141 +141 @@
     $result = pwg_query( $query );
 
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       if (!empty($row['author']))

trunk/include/picture_rate.inc.php

@@ -38 +38 @@
   WHERE element_id = '.$picture['current']['id'].'
 ;';
-    $row = mysql_fetch_assoc(pwg_query($query));
+    $row = pwg_db_fetch_assoc(pwg_query($query));
   }
   else
@@ -68 +68 @@
 
       $result = pwg_query($query);
-      if (mysql_num_rows($result) > 0)
+      if (pwg_db_num_rows($result) > 0)
       {
-        $row = mysql_fetch_assoc($result);
+        $row = pwg_db_fetch_assoc($result);
         $user_rate = $row['rate'];
       }

trunk/include/ws_functions.inc.php

@@ -257 +257 @@
   $result = pwg_query($query);
   $cats = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $row['id'] = (int)$row['id'];
@@ -296 +296 @@
 
     $result = pwg_query($query);
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       $image = array();
@@ -406 +406 @@
 
   $cats = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $row['url'] = make_index_url(
@@ -472 +472 @@
   $cats = array();
 
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $id = $row['id'];
@@ -518 +518 @@
       ' AND'
     );
-  if ( !mysql_num_rows( pwg_query( $query ) ) )
+  if ( !pwg_db_num_rows( pwg_query( $query ) ) )
   {
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid image_id");
@@ -578 +578 @@
 LIMIT 1';
 
-  $image_row = mysql_fetch_assoc(pwg_query($query));
+  $image_row = pwg_db_fetch_assoc(pwg_query($query));
   if ($image_row==null)
   {
@@ -599 +599 @@
   $is_commentable = false;
   $related_categories = array();
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     if ($row['commentable']=='true')
@@ -656 +656 @@
   WHERE element_id = '.$image_row['id'].'
 ;';
-  $rating = mysql_fetch_assoc(pwg_query($query));
+  $rating = pwg_db_fetch_assoc(pwg_query($query));
   $rating['count'] = (int)$rating['count'];
 
@@ -687 +687 @@
 
     $result = pwg_query($query);
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       $row['id']=(int)$row['id'];
@@ -758 +758 @@
     ).'
     LIMIT 1';
-  if ( mysql_num_rows( pwg_query($query) )==0 )
+  if ( pwg_db_num_rows( pwg_query($query) )==0 )
   {
     return new PwgError(404, "Invalid image_id or access denied" );
@@ -814 +814 @@
     $image_ids = array_flip($image_ids);
     $result = pwg_query($query);
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       $image = array();
@@ -871 +871 @@
   WHERE id IN ('.implode(',',$params['image_id']).')';
   $result = pwg_query($query);
-  $affected_rows = mysql_affected_rows();
+  $affected_rows = pwg_db_affected_rows();
   if ($affected_rows)
   {
@@ -1008 +1008 @@
   WHERE md5sum = \''.$params['original_sum'].'\'
 ;';
-  list($counter) = mysql_fetch_row(pwg_query($query));
+  list($counter) = pwg_db_fetch_row(pwg_query($query));
   if ($counter != 0) {
     return new PwgError(500, 'file already exists');
@@ -1014 +1014 @@
 
   // current date
-  list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
+  list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
   list($year, $month, $day) = preg_split('/[^\d]/', $dbnow, 4);
 
@@ -1200 +1200 @@
     );
 
-  $image_id = mysql_insert_id();
+  $image_id = pwg_db_insert_id();
 
   // let's add links between the image and the categories
@@ -1359 +1359 @@
   GROUP BY image_id';
       $result = pwg_query($query);
-      while ( $row=mysql_fetch_assoc($result) )
+      while ( $row=pwg_db_fetch_assoc($result) )
       {
         $row['image_id'] = (int)$row['image_id'];
@@ -1402 +1402 @@
 
     $result = pwg_query($query);
-    while ($row = mysql_fetch_assoc($result))
+    while ($row = pwg_db_fetch_assoc($result))
     {
       $image = array();
@@ -1573 +1573 @@
 ;';
 
-  $image_row = mysql_fetch_assoc(pwg_query($query));
+  $image_row = pwg_db_fetch_assoc(pwg_query($query));
   if ($image_row == null)
   {