Changeset 4325 for trunk/include/functions.inc.php

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

File:

• trunk/include/functions.inc.php (modified) (9 diffs)

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)'));
   }