Changeset 587 for trunk/include


Ignore:
Timestamp:
Oct 30, 2004, 5:42:29 PM (20 years ago)
Author:
z0rglub
Message:
  • function mysql_query replaced by pwg_query : the same with debugging features
  • by default, DEBUG is set to 0 (off)
Location:
trunk/include
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/category_calendar.inc.php

    r579 r587  
    4040  GROUP BY year
    4141;';
    42 $result = mysql_query($query);
     42$result = pwg_query($query);
    4343$calendar_years = array();
    4444while ($row = mysql_fetch_array($result))
    … …  
    9393  GROUP BY MONTH('.$conf['calendar_datefield'].')
    9494;';
    95   $result = mysql_query($query);
     95  $result = pwg_query($query);
    9696  $calendar_months = array();
    9797  while ($row = mysql_fetch_array($result))
    … …  
    165165  GROUP BY day
    166166;';
    167   $result = mysql_query($query);
     167  $result = pwg_query($query);
    168168  $calendar_days = array();
    169169  while ($row = mysql_fetch_array($result))
    … …  
    189189  GROUP BY category_id
    190190;';
    191   $result = mysql_query($query);
     191  $result = pwg_query($query);
    192192  $calendar_categories = array();
    193193  // special category 0 : gathering all available categories (0 cannot be a
    … …  
    228228  LIMIT 0,1
    229229;';
    230     $row = mysql_fetch_array(mysql_query($query));
     230    $row = mysql_fetch_array(pwg_query($query));
    231231   
    232232    $thumbnail_src = get_thumbnail_src($row['file'],
    … …  
    276276  LIMIT 0,1
    277277;';
    278     $row = mysql_fetch_array(mysql_query($query));
     278    $row = mysql_fetch_array(pwg_query($query));
    279279   
    280280    $thumbnail_src = get_thumbnail_src($row['file'],
    … …  
    331331  LIMIT 0,1
    332332;';
    333     $row = mysql_fetch_array(mysql_query($query));
     333    $row = mysql_fetch_array(pwg_query($query));
    334334   
    335335    $thumbnail_src = get_thumbnail_src($row['file'],
    … …  
    400400  LIMIT 0,1
    401401;';
    402     $row = mysql_fetch_array(mysql_query($query));
     402    $row = mysql_fetch_array(pwg_query($query));
    403403   
    404404    $thumbnail_src = get_thumbnail_src($row['file'],

  • trunk/include/category_default.inc.php

    r579 r587  
    4848;';
    4949// echo '<pre>'.$query.'</pre>';
    50 $result = mysql_query($query);
     50$result = pwg_query($query);
    5151
    5252// template thumbnail initialization
    … …  
    129129    AND validated = \'true\'
    130130;';
    131     $row = mysql_fetch_array(mysql_query($query));
     131    $row = mysql_fetch_array(pwg_query($query));
    132132    $template->assign_block_vars(
    133133      'thumbnails.line.thumbnail.nb_comments',

  • trunk/include/category_recent_cats.inc.php

    r579 r587  
    4747$query.= '
    4848;';
    49 $result = mysql_query( $query );
     49$result = pwg_query( $query );
    5050
    5151// template thumbnail initialization
    … …  
    7676  LIMIT 0,1
    7777;';
    78   $subrow = mysql_fetch_array( mysql_query( $query ) );
     78  $subrow = mysql_fetch_array( pwg_query( $query ) );
    7979
    8080  $thumbnail_src = get_thumbnail_src($subrow['file'],

  • trunk/include/category_subcats.inc.php

    r579 r587  
    5151  $row_number = 0;
    5252}
    53  
     53
    5454foreach ($subcats as $subcat_id => $non_empty_id)
    5555{
    … …  
    6262  WHERE id = '.$non_empty_id.'
    6363;';
    64   $row = mysql_fetch_array(mysql_query($query));
     64  $row = mysql_fetch_array(pwg_query($query));
    6565   
    6666  $query = '
    … …  
    8484  $query.= '
    8585;';
    86   $image_result = mysql_query($query);
     86  $image_result = pwg_query($query);
    8787  $image_row    = mysql_fetch_array($image_result);
    8888

  • trunk/include/common.inc.php

    r541 r587  
    172172 FROM '.CONFIG_TABLE.'
    173173;';
    174 if( !( $result = mysql_query( $query ) ) )
     174if( !( $result = pwg_query( $query ) ) )
    175175{
    176176  die("Could not query config information");

  • trunk/include/config.inc.php

    r571 r587  
    122122// calendar_datefield : date field of table "images" used for calendar
    123123// catgory
    124 $conf['calendar_datefield'] = 'date_available';
     124$conf['calendar_datefield'] = 'date_creation';
    125125
    126126// rate : enable feature for rating elements

  • trunk/include/constants.php

    r519 r587  
    3333
    3434// Debug Level
    35 define('DEBUG', 1); // Debugging on
    36 //define('DEBUG', 0); // Debugging off
     35//define('DEBUG', 1); // Debugging on
     36define('DEBUG', 0); // Debugging off
    3737 
    3838// User level

  • trunk/include/functions.inc.php

    r579 r587  
    5252  // retrieving the properties of the table. Each line represents a field :
    5353  // columns are 'Field', 'Type'
    54   $result=mysql_query("desc $table");
     54  $result=pwg_query("desc $table");
    5555  while ( $row = mysql_fetch_array( $result ) )
    5656  {
    … …  
    351351    $query.= ",'".$_SERVER['REMOTE_ADDR']."'";
    352352    $query.= ",'".$file."','".$category."','".$picture."');";
    353     mysql_query( $query );
     353    pwg_query( $query );
    354354  }
    355355}
    … …  
    409409  $query.= ' AND mail_address IS NOT NULL';
    410410  $query.= ';';
    411   $result = mysql_query( $query );
     411  $result = pwg_query( $query );
    412412  while ( $row = mysql_fetch_array( $result ) )
    413413  {
    … …  
    445445}
    446446
    447 function pwg_query( $query )
    448 {
    449   global $count_queries,$queries_time;
    450 
     447function pwg_query($query)
     448{
    451449  $start = get_moment();
    452   $output = '';
    453  
    454   $count_queries++;
    455   $output.= '<br /><br />['.$count_queries.'] '.$query;
    456   $result = mysql_query( $query );
    457   $time = get_moment() - $start;
    458   $queries_time+= $time;
    459   $output.= '<b>('.number_format( $time, 3, '.', ' ').' s)</b>';
    460   $output.= '('.number_format( $queries_time, 3, '.', ' ').' s)';
    461 
    462   // echo $output;
     450  $result = mysql_query($query);
     451
     452  if (DEBUG)
     453  {
     454    global $count_queries,$queries_time;
     455   
     456    $time = get_moment() - $start;
     457    $count_queries++;
     458   
     459    $output = '';
     460    $output.= '<pre>['.$count_queries.'] '."\n".$query;
     461    $queries_time+= $time;
     462    $output.= "\n".'(this query time : '.number_format( $time, 3, '.', ' ').' s)</b>';
     463    $output.= "\n".'(total SQL time  : '.number_format( $queries_time, 3, '.', ' ').' s)';
     464    $output.= '</pre>';
     465    echo $output;
     466  }
    463467 
    464468  return $result;

  • trunk/include/functions_category.inc.php

    r579 r587  
    8989      $query = 'SELECT id';
    9090      $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$cat.';';
    91       $result = mysql_query( $query );
     91      $result = pwg_query( $query );
    9292      if ( mysql_num_rows( $result ) != 0 )
    9393      {
    … …  
    140140
    141141  $plain_structure = array();
    142   $result = mysql_query( $query );
     142  $result = pwg_query( $query );
    143143  while ( $row = mysql_fetch_array( $result ) )
    144144  {
    … …  
    271271// ;';
    272272 
    273   $row = mysql_fetch_array( mysql_query( $query ) );
     273  $row = mysql_fetch_array( pwg_query( $query ) );
    274274
    275275  if ( !isset( $row['total'] ) ) $row['total'] = 0;
    … …  
    307307  $query.= ' AND a.site_id = b.id';
    308308  $query.= ';';
    309   $row = mysql_fetch_array( mysql_query( $query ) );
     309  $row = mysql_fetch_array( pwg_query( $query ) );
    310310
    311311  $cat = array();
    … …  
    330330  $query.= ' ORDER BY id ASC';
    331331  $query.= ';';
    332   $result = mysql_query( $query );
     332  $result = pwg_query( $query );
    333333  while( $row = mysql_fetch_array( $result ) )
    334334  {
    … …  
    369369    $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$category_id;
    370370    $query.= ';';
    371     $row = mysql_fetch_array( mysql_query( $query ) );
     371    $row = mysql_fetch_array( pwg_query( $query ) );
    372372    $uppercats = $row['uppercats'];
    373373  }
    … …  
    379379  $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id IN ('.$uppercats.')';
    380380  $query.= ';';
    381   $result = mysql_query( $query );
     381  $result = pwg_query( $query );
    382382  while( $row = mysql_fetch_array( $result ) )
    383383  {
    … …  
    404404    AND c.id = '.$category_id.'
    405405;';
    406   $row = mysql_fetch_array(mysql_query($query));
     406  $row = mysql_fetch_array(pwg_query($query));
    407407  return $row['galleries_url'];
    408408}
    … …  
    594594  WHERE '.implode(' OR ', $search_cat_clauses).'
    595595;';
    596             $result = mysql_query($query);
     596            $result = pwg_query($query);
    597597            $cat_ids = array();
    598598            while ($row = mysql_fetch_array($result))
    … …  
    669669      {
    670670        $page['title'] = $conf['top_number'].' '.$lang['most_visited_cat'];
    671        
    672         if ( isset( $forbidden ) ) $page['where'] = ' WHERE '.$forbidden;
    673         else                       $page['where'] = '';
     671
     672        $page['where'] = 'WHERE hit > 0';
     673        if (isset($forbidden))
     674        {
     675          $page['where'] = "\n".'    AND '.$forbidden;
     676        }
     677
    674678        $conf['order_by'] = ' ORDER BY hit DESC, file ASC';
    675679        $page['cat_nb_images'] = $conf['top_number'];
    … …  
    750754  '.$page['where'].'
    751755;';
    752         $row = mysql_fetch_array(mysql_query($query));
     756        $row = mysql_fetch_array(pwg_query($query));
    753757        if ($row['count'] < $conf['top_number'])
    754758        {
    … …  
    789793      if (isset($query))
    790794      {
    791         $result = mysql_query( $query );
     795        $result = pwg_query( $query );
    792796        $row = mysql_fetch_array( $result );
    793797        $page['cat_nb_images'] = $row['nb_total_images'];
    … …  
    844848  $query.= ';';
    845849
    846   $result = mysql_query( $query );
     850  $result = pwg_query( $query );
    847851  while ( $row = mysql_fetch_array( $result ) )
    848852  {
    … …  
    875879  $query.= ' ORDER BY RAND()';
    876880  $query.= ';';
    877   $result = mysql_query( $query );
     881  $result = pwg_query( $query );
    878882  while ( $row = mysql_fetch_array( $result ) )
    879883  {
    … …  
    883887    }
    884888  }
    885   $result = mysql_query( $query );
     889  $result = pwg_query( $query );
    886890  while ( $row = mysql_fetch_array( $result ) )
    887891  {

  • trunk/include/functions_group.inc.php

    r362 r587  
    3535  $query.= " WHERE status = 'private'";
    3636  $query.= ';';
    37   $result = mysql_query( $query );
     37  $result = pwg_query( $query );
    3838  $privates = array();
    3939  while ( $row = mysql_fetch_array( $result ) )
    … …  
    4747  $query.= ' WHERE group_id = '.$group_id;
    4848  $query.= ';';
    49   $result = mysql_query( $query );
     49  $result = pwg_query( $query );
    5050  while ( $row = mysql_fetch_array( $result ) )
    5151  {
    … …  
    9393    $query.= ' WHERE id = '.$category_id;
    9494    $query.= ';';
    95     $row = mysql_fetch_array( mysql_query( $query ) );
     95    $row = mysql_fetch_array( pwg_query( $query ) );
    9696    if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = '';
    9797    if ( $row['id_uppercat'] == '' ) $is_root = true;

  • trunk/include/functions_session.inc.php

    r555 r587  
    8080  WHERE id = \''.$generated_id.'\'
    8181;';
    82     $result = mysql_query($query);
     82    $result = pwg_query($query);
    8383    if (mysql_num_rows($result) == 0)
    8484    {
    … …  
    9595   \''.$_SERVER['REMOTE_ADDR'].'\')
    9696;';
    97   mysql_query($query);
     97  pwg_query($query);
    9898
    9999  setcookie('id', $generated_id, $expiration, cookie_path());

  • trunk/include/functions_user.inc.php

    r532 r587  
    7070    $query.= " WHERE username = '".$login."'";
    7171    $query.= ';';
    72     $result = mysql_query( $query );
     72    $result = pwg_query( $query );
    7373    if ( mysql_num_rows($result) > 0 ) $error[$i++] = $lang['reg_err_login5'];
    7474  }
    … …  
    9595    $query.= " WHERE username = 'guest'";
    9696    $query.= ';';
    97     $row = mysql_fetch_array( mysql_query( $query ) );
     97    $row = mysql_fetch_array( pwg_query( $query ) );
    9898    // 2. adding new user
    9999    $query = 'INSERT INTO '.USERS_TABLE;
    … …  
    116116    }
    117117    $query.= ');';
    118     mysql_query( $query );
     118    pwg_query( $query );
    119119    // 3. retrieving the id of the newly created user
    120120    $query = 'SELECT id';
    121121    $query.= ' FROM '.USERS_TABLE;
    122122    $query.= " WHERE username = '".$login."';";
    123     $row = mysql_fetch_array( mysql_query( $query ) );
     123    $row = mysql_fetch_array( pwg_query( $query ) );
    124124    $user_id = $row['id'];
    125125    // 4. adding access to the new user, the same as the user "guest"
    … …  
    129129    $query.= ' where u.id = ua.user_id';
    130130    $query.= " and u.username = 'guest';";
    131     $result = mysql_query( $query );
     131    $result = pwg_query( $query );
    132132    while( $row = mysql_fetch_array( $result ) )
    133133    {
    … …  
    135135      $query.= ' (user_id,cat_id) VALUES';
    136136      $query.= ' ('.$user_id.','.$row['cat_id'].');';
    137       mysql_query ( $query );
     137      pwg_query ( $query );
    138138    }
    139139    // 5. associate new user to the same groups that the guest
    … …  
    144144    $query.= ' AND ug.user_id = u.id';
    145145    $query.= ';';
    146     $result = mysql_query( $query );
     146    $result = pwg_query( $query );
    147147    while( $row = mysql_fetch_array( $result ) )
    148148    {
    … …  
    151151      $query.= ' ('.$user_id.','.$row['group_id'].')';
    152152      $query.= ';';
    153       mysql_query ( $query );
     153      pwg_query ( $query );
    154154    }
    155155  }
    … …  
    188188    $query.= ' WHERE id = '.$user_id;
    189189    $query.= ';';
    190     mysql_query( $query );
     190    pwg_query( $query );
    191191  }
    192192  return $error;
    … …  
    271271  $sql.= " WHERE ";
    272272  $sql .= ( ( is_integer($user) ) ? "id = $user" : "username = '" .  str_replace("\'", "''", $user) . "'" ) . " AND id <> " . ANONYMOUS;
    273   $result = mysql_query($sql);
     273  $result = pwg_query($sql);
    274274  return ( $row = mysql_fetch_array($result) ) ? $row : false;
    275275}

  • trunk/include/user.inc.php

    r555 r587  
    6464  WHERE id = \''.$page['session_id'].'\'
    6565;';
    66   $result = mysql_query($query);
     66  $result = pwg_query($query);
    6767  if (mysql_num_rows($result) > 0)
    6868  {
    … …  
    7777        $delete_query.= " WHERE id = '".$page['session_id']."'";
    7878        $delete_query.= ';';
    79         mysql_query($delete_query);
     79        pwg_query($delete_query);
    8080      }
    8181      else if ($_SERVER['REMOTE_ADDR'] == $row['ip'])
    … …  
    9898}
    9999$query_user .= ';';
    100 $row = mysql_fetch_array(mysql_query($query_user));
     100$row = mysql_fetch_array(pwg_query($query_user));
    101101
    102102// affectation of each value retrieved in the users table into a variable
Note: See TracChangeset for help on using the changeset viewer.