Changeset 587 for trunk


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
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin.php

    r539 r587  
    5454   $query.= ' WHERE id = '.$_GET['group_id'];
    5555   $query.= ';';
    56    $result = mysql_query( $query );
     56   $result = pwg_query( $query );
    5757   if ( mysql_num_rows( $result ) > 0 )
    5858   {
    … …  
    142142$query.= " WHERE validated='false'";
    143143$query.= ';';
    144 $result = mysql_query( $query );
     144$result = pwg_query( $query );
    145145$nb_waiting = '';
    146146if ( mysql_num_rows( $result ) > 0 )
    … …  
    152152$query.= " WHERE validated='false'";
    153153$query.= ';';
    154 $result = mysql_query( $query );
     154$result = pwg_query( $query );
    155155$nb_comments = '';
    156156if ( mysql_num_rows( $result ) > 0 )

  • trunk/admin/admin_upload.php

    r403 r587  
    5151 }
    5252 $query.=');';
    53  mysql_query ($query);
     53 pwg_query ($query);
    5454}
    5555
    … …  
    5959$query.= ' ORDER BY name ASC';
    6060$query.= ';';
    61 $result = mysql_query( $query );
     61$result = pwg_query( $query );
    6262while ( $row = mysql_fetch_assoc( $result ) )
    6363{

  • trunk/admin/cat_list.php

    r580 r587  
    7070  WHERE id = '.$parent_id.'
    7171;';
    72       $parent_uppercats = array_pop(mysql_fetch_array(mysql_query($query)));
     72      $parent_uppercats = array_pop(mysql_fetch_array(pwg_query($query)));
    7373    }
    7474       
    … …  
    8080  (\''.$_POST['virtual_name'].'\','.$parent_id.','.$_POST['rank'].')
    8181;';
    82     mysql_query($query);
     82    pwg_query($query);
    8383       
    8484    // And last we update the uppercats
    … …  
    8787  FROM '.CATEGORIES_TABLE.'
    8888;';
    89     $my_id = array_pop(mysql_fetch_array(mysql_query($query)));
     89    $my_id = array_pop(mysql_fetch_array(pwg_query($query)));
    9090
    9191    $query = '
    … …  
    100100  WHERE id = '.$my_id.'
    101101;';
    102     mysql_query($query);
     102    pwg_query($query);
    103103    array_push($infos, $lang['cat_list_virtual_category_added']);
    104104  }
    … …  
    123123  ORDER BY rank ASC
    124124;';
    125 $result = mysql_query($query);
     125$result = pwg_query($query);
    126126while ($row = mysql_fetch_assoc($result))
    127127{
    … …  
    170170  WHERE id = '.$_GET['up'].'
    171171;';
    172     mysql_query($query);
     172    pwg_query($query);
    173173    $query = '
    174174UPDATE '.CATEGORIES_TABLE.'
    … …  
    176176  WHERE id = '.$categories[($current_rank-1)]['id'].'
    177177;';
    178     mysql_query($query);
     178    pwg_query($query);
    179179    // 3. Updating the cache array
    180180    $categories[$current_rank] = $categories[($current_rank-1)];
    … …  
    189189  WHERE id = '.$_GET['up'].'
    190190;';
    191     mysql_query($query);
     191    pwg_query($query);
    192192    $query = '
    193193UPDATE '.CATEGORIES_TABLE.'
    … …  
    204204    $query.= '
    205205;';
    206     mysql_query($query);
     206    pwg_query($query);
    207207    // 3. Updating the cache array
    208208    array_push($categories, $current);
    … …  
    229229  WHERE id = '.$_GET['down'].'
    230230;';
    231     mysql_query($query);
     231    pwg_query($query);
    232232    $query = '
    233233UPDATE '.CATEGORIES_TABLE.'
    … …  
    235235  WHERE id = '.$categories[($current_rank+1)]['id'].'
    236236;';
    237     mysql_query($query);
     237    pwg_query($query);
    238238    // 3. Updating the cache array
    239239    $categories[$current_rank]=$categories[($current_rank+1)];
    … …  
    248248  WHERE id = '.$_GET['down'].'
    249249;';
    250     mysql_query($query);
     250    pwg_query($query);
    251251    $query = '
    252252UPDATE '.CATEGORIES_TABLE.'
    … …  
    263263    $query.= '
    264264;';
    265     mysql_query($query);
     265    pwg_query($query);
    266266    // 3. Updating the cache array
    267267    array_unshift($categories, $current);
    … …  
    351351  WHERE id_uppercat = '.$category['id'].'
    352352;';
    353     $row = mysql_fetch_array(mysql_query($query));
     353    $row = mysql_fetch_array(pwg_query($query));
    354354
    355355    if ($row['nb_sub_cats'] > 0)

  • trunk/admin/cat_modify.php

    r530 r587  
    4949  $query.= ' WHERE id = '.$_GET['cat_id'];
    5050  $query.= ';';
    51   $row = mysql_fetch_array( mysql_query( $query ) );
     51  $row = mysql_fetch_array( pwg_query( $query ) );
    5252 
    5353  $query = 'UPDATE '.CATEGORIES_TABLE;
    … …  
    7979  $query.= ' WHERE id = '.$_GET['cat_id'];
    8080  $query.= ';';
    81   mysql_query( $query );
     81  pwg_query( $query );
    8282
    8383  if ( $_POST['status'] != $row['status'] )
    … …  
    8787    $query.= ' FROM '.GROUP_ACCESS_TABLE;
    8888    $query.= ' WHERE cat_id = '.$_GET['cat_id'];
    89     mysql_query( $query );
     89    pwg_query( $query );
    9090    // deletion of all access for users concerning this category
    9191    $query = 'DELETE';
    9292    $query.= ' FROM '.USER_ACCESS_TABLE;
    9393    $query.= ' WHERE cat_id = '.$_GET['cat_id'];
    94     mysql_query( $query );
     94    pwg_query( $query );
    9595  }
    9696
    … …  
    9999  $query.= ' FROM '.USERS_TABLE;
    100100  $query.= ';';
    101   $result = mysql_query( $query );
     101  $result = pwg_query( $query );
    102102  while ( $row = mysql_fetch_array( $result ) )
    103103  {
    … …  
    112112$query.= ' AND a.site_id = b.id';
    113113$query.= ';';
    114 $category = mysql_fetch_array( mysql_query( $query ) );
     114$category = mysql_fetch_array( pwg_query( $query ) );
    115115// nullable fields
    116116foreach (array('comment','dir') as $nullable)
    … …  
    181181  $query.= ' FROM '.CATEGORIES_TABLE;
    182182  $query.= ';';
    183   $countrow = mysql_fetch_array( mysql_query( $query ) );
     183  $countrow = mysql_fetch_array( pwg_query( $query ) );
    184184  if ( $countrow['nb_total_categories'] < $conf['max_LOV_categories'] )
    185185  {

  • trunk/admin/cat_perm.php

    r364 r587  
    5252  $query.= ' WHERE cat_id = '.$page['cat'];
    5353  $query.= ';';
    54   mysql_query( $query );
     54  pwg_query( $query );
    5555  $query = 'SELECT id';
    5656  $query.= ' FROM '.PREFIX_TABLE.'groups';
    5757  $query.= ';';
    58   $result = mysql_query( $query );
     58  $result = pwg_query( $query );
    5959  while ( $row = mysql_fetch_array( $result ) )
    6060  {
    … …  
    6666      $query.= ' ('.$page['cat'].','.$row['id'].')';
    6767      $query.= ';';
    68       mysql_query( $query );
     68      pwg_query( $query );
    6969    }
    7070  }
    … …  
    7474  $query.= ' WHERE cat_id = '.$page['cat'];
    7575  $query.= ';';
    76   mysql_query( $query );
     76  pwg_query( $query );
    7777  $query = 'SELECT id';
    7878  $query.= ' FROM '.USERS_TABLE;
    7979  $query.= ';';
    80   $result = mysql_query( $query );
     80  $result = pwg_query( $query );
    8181  while ( $row = mysql_fetch_array( $result ) )
    8282  {
    … …  
    8888      $query.= ' ('.$page['cat'].','.$row['id'].')';
    8989      $query.= ';';
    90       mysql_query( $query );
     90      pwg_query( $query );
    9191    }
    9292    check_favorites( $row['id'] );
    … …  
    9999$query.= ' FROM '.PREFIX_TABLE.'groups';
    100100$query. ';';
    101 $result = mysql_query( $query );
     101$result = pwg_query( $query );
    102102if ( mysql_num_rows( $result ) > 0 )
    103103{
    … …  
    108108  $query.= ' WHERE cat_id = '.$_GET['cat_id'];
    109109  $query.= ';';
    110   $subresult = mysql_query( $query );
     110  $subresult = pwg_query( $query );
    111111  $authorized_groups = array();
    112112  while ( $subrow = mysql_fetch_array( $subresult ) )
    … …  
    145145}
    146146$query.= ';';
    147 $result = mysql_query( $query );
     147$result = pwg_query( $query );
    148148while ( $row = mysql_fetch_array( $result ) )
    149149{
    … …  
    196196  $query.= ' AND ug.user_id = '.$row['id'];
    197197  $query.= ';';
    198   $subresult = mysql_query( $query );
     198  $subresult = pwg_query( $query );
    199199  if ( mysql_num_rows( $subresult ) > 0 )
    200200  {

  • trunk/admin/configuration.php

    r555 r587  
    4242}
    4343//------------------------------------------------------ $conf reinitialization
    44 $result = mysql_query('SELECT param,value FROM '.CONFIG_TABLE);
     44$result = pwg_query('SELECT param,value FROM '.CONFIG_TABLE);
    4545while ($row = mysql_fetch_array($result))
    4646{
    … …  
    126126  if (count($errors) == 0)
    127127  {
    128     $result = mysql_query('SELECT * FROM '.CONFIG_TABLE);
     128    $result = pwg_query('SELECT * FROM '.CONFIG_TABLE);
    129129    while ($row = mysql_fetch_array($result))
    130130    {
    … …  
    136136  WHERE param = \''.$row['param'].'\'
    137137;';
    138         mysql_query($query);
     138        pwg_query($query);
    139139      }
    140140    }

  • trunk/admin/group_list.php

    r362 r587  
    4040  $query.= ' WHERE id = '.$_GET['delete'];
    4141  $query.= ';';
    42   $row = mysql_fetch_array( mysql_query( $query ) );
     42  $row = mysql_fetch_array( pwg_query( $query ) );
    4343  // confirm group deletion ?
    4444  if ( !isset( $_GET['confirm'] ) or $_GET['confirm'] != 1 )
    … …  
    6161    $query.= ' WHERE id = '.$_GET['delete'];
    6262    $query.= ';';
    63     $row2 = mysql_fetch_array( mysql_query( $query ) );
     63    $row2 = mysql_fetch_array( pwg_query( $query ) );
    6464    if ( $row2['nb_result'] > 0 )
    6565    {
    … …  
    9292    $query.= " WHERE name = '".$_POST['name']."'";
    9393    $query.= ';';
    94     $result = mysql_query( $query );
     94    $result = pwg_query( $query );
    9595    if ( mysql_num_rows( $result ) > 0 )
    9696    {
    … …  
    104104    $query.= " (name) VALUES ('".$_POST['name']."')";
    105105    $query.= ';';
    106     mysql_query( $query );
     106    pwg_query( $query );
    107107  }
    108108}
    … …  
    126126$query.= ' ORDER BY id ASC';
    127127$query.= ';';
    128 $result = mysql_query( $query );
     128$result = pwg_query( $query );
    129129while ( $row = mysql_fetch_array( $result ) )
    130130{

  • trunk/admin/group_perm.php

    r364 r587  
    4141  $query.= ' WHERE group_id = '.$_GET['group_id'];
    4242  $query.= ';';
    43   mysql_query( $query );
     43  pwg_query( $query );
    4444  // selecting all private categories
    4545  $query = 'SELECT id';
    … …  
    4747  $query.= " WHERE status = 'private'";
    4848  $query.= ';';
    49   $result = mysql_query( $query );
     49  $result = pwg_query( $query );
    5050  while ( $row = mysql_fetch_array( $result ) )
    5151  {
    … …  
    5757      $query.= ' ('.$_GET['group_id'].','.$row['id'].')';
    5858      $query.= ';';
    59       mysql_query ( $query );
     59      pwg_query ( $query );
    6060    }
    6161  }
    … …  
    6464  $query.= ' FROM '.USERS_TABLE;
    6565  $query.= ';';
    66   $result = mysql_query( $query );
     66  $result = pwg_query( $query );
    6767  while ( $row = mysql_fetch_array( $result ) )
    6868  {
    … …  
    8686$query.= " WHERE status = 'private'";
    8787$query.= ';';
    88 $result = mysql_query( $query );
     88$result = pwg_query( $query );
    8989while ( $row = mysql_fetch_array( $result ) )
    9090{

  • trunk/admin/images/global_stats.img.php

    r566 r587  
    7373
    7474// Add Values to the bargraph..
    75 $result = mysql_query($sql)
     75$result = pwg_query($sql)
    7676or die(mysql_errno().": ".mysql_error()."<BR>".$sql);
    7777

  • trunk/admin/include/functions.php

    r563 r587  
    168168  WHERE site_id = '.$id.'
    169169;';
    170   $result = mysql_query($query);
     170  $result = pwg_query($query);
    171171  $category_ids = array();
    172172  while ($row = mysql_fetch_array($result))
    … …  
    181181  WHERE id = '.$id.'
    182182;';
    183   mysql_query($query);
     183  pwg_query($query);
    184184}
    185185       
    … …  
    206206  WHERE storage_category_id IN ('.implode(',', $ids).')
    207207;';
    208   $result = mysql_query($query);
     208  $result = pwg_query($query);
    209209  $element_ids = array();
    210210  while ($row = mysql_fetch_array($result))
    … …  
    219219  WHERE category_id IN ('.implode(',', $ids).')
    220220;';
    221   mysql_query($query);
     221  pwg_query($query);
    222222
    223223  // destruction of the access linked to the category
    … …  
    226226  WHERE cat_id IN ('.implode(',', $ids).')
    227227;';
    228   mysql_query($query);
     228  pwg_query($query);
    229229  $query = '
    230230DELETE FROM '.GROUP_ACCESS_TABLE.'
    231231  WHERE cat_id IN ('.implode(',', $ids).')
    232232;';
    233   mysql_query($query);
     233  pwg_query($query);
    234234
    235235  // destruction of the sub-categories
    … …  
    239239  WHERE id_uppercat IN ('.implode(',', $ids).')
    240240;';
    241   $result = mysql_query($query);
     241  $result = pwg_query($query);
    242242  $subcat_ids = array();
    243243  while($row = mysql_fetch_array($result))
    … …  
    255255  WHERE id IN ('.implode(',', $ids).')
    256256;';
    257   mysql_query($query);
     257  pwg_query($query);
    258258
    259259  if (isset($counts['del_categories']))
    … …  
    283283'.wordwrap(implode(', ', $ids), 80, "\n").')
    284284;';
    285   mysql_query($query);
     285  pwg_query($query);
    286286
    287287  // destruction of the links between images and this category
    … …  
    291291'.wordwrap(implode(', ', $ids), 80, "\n").')
    292292;';
    293   mysql_query($query);
     293  pwg_query($query);
    294294
    295295  // destruction of the favorites associated with the picture
    … …  
    299299'.wordwrap(implode(', ', $ids), 80, "\n").')
    300300;';
    301   mysql_query($query);
     301  pwg_query($query);
    302302
    303303  // destruction of the rates associated to this element
    … …  
    307307'.wordwrap(implode(', ', $ids), 80, "\n").')
    308308;';
    309   mysql_query($query);
     309  pwg_query($query);
    310310               
    311311  // destruction of the image
    … …  
    315315'.wordwrap(implode(', ', $ids), 80, "\n").')
    316316;';
    317   mysql_query($query);
     317  pwg_query($query);
    318318
    319319  if (isset($counts['del_elements']))
    … …  
    336336  $query.= ' WHERE user_id = '.$user_id;
    337337  $query.= ';';
    338   mysql_query( $query );
     338  pwg_query( $query );
    339339
    340340  // destruction of the group links for this user
    … …  
    342342  $query.= ' WHERE user_id = '.$user_id;
    343343  $query.= ';';
    344   mysql_query( $query );
     344  pwg_query( $query );
    345345
    346346  // destruction of the favorites associated with the user
    … …  
    348348  $query.= ' WHERE user_id = '.$user_id;
    349349  $query.= ';';
    350   mysql_query( $query );
     350  pwg_query( $query );
    351351
    352352  // destruction of the sessions linked with the user
    … …  
    354354  $query.= ' WHERE user_id = '.$user_id;
    355355  $query.= ';';
    356   mysql_query( $query );
     356  pwg_query( $query );
    357357
    358358  // destruction of the user
    … …  
    360360  $query.= ' WHERE id = '.$user_id;
    361361  $query.= ';';
    362   mysql_query( $query );
     362  pwg_query( $query );
    363363}
    364364
    … …  
    373373  $query.= ' WHERE group_id = '.$group_id;
    374374  $query.= ';';
    375   mysql_query( $query );
     375  pwg_query( $query );
    376376
    377377  // synchronize all users linked to the group
    … …  
    382382  $query.= ' WHERE group_id = '.$group_id;
    383383  $query.= ';';
    384   mysql_query( $query );
     384  pwg_query( $query );
    385385
    386386  // destruction of the group
    … …  
    388388  $query.= ' WHERE id = '.$group_id;
    389389  $query.= ';';
    390   mysql_query( $query );
     390  pwg_query( $query );
    391391}
    392392
    … …  
    400400  $query.= ' WHERE id = '.$user_id;
    401401  $query.= ';';
    402   $row = mysql_fetch_array( mysql_query( $query ) );
     402  $row = mysql_fetch_array( pwg_query( $query ) );
    403403  $status = $row['status'];
    404404  // retrieving all the restricted categories for this user
    … …  
    413413  $query.= ' WHERE user_id = '.$user_id;
    414414  $query.= ';';
    415   $result = mysql_query ( $query );
     415  $result = pwg_query ( $query );
    416416  while ( $row = mysql_fetch_array( $result ) )
    417417  {
    … …  
    424424    $query.= ' WHERE image_id = '.$row['image_id'];
    425425    $query.= ';';
    426     $picture_result = mysql_query( $query );
     426    $picture_result = pwg_query( $query );
    427427    $picture_cat = array();
    428428    while ( $picture_row = mysql_fetch_array( $picture_result ) )
    … …  
    436436      $query.= ' AND user_id = '.$user_id;
    437437      $query.= ';';
    438       mysql_query( $query );
     438      pwg_query( $query );
    439439    }
    440440  }
    … …  
    465465  GROUP BY category_id
    466466;';
    467   $result = mysql_query( $query );
     467  $result = pwg_query( $query );
    468468  while ( $row = mysql_fetch_array( $result ) )
    469469  {
    … …  
    475475  WHERE id = '.$row['category_id'].'
    476476;';
    477     mysql_query($query);
     477    pwg_query($query);
    478478  }
    479479
    … …  
    486486    AND id IN ('.implode(',', $cat_ids).')
    487487;';
    488     $result = mysql_query( $query );
     488    $result = pwg_query( $query );
    489489    while ( $row = mysql_fetch_array( $result ) )
    490490    {
    … …  
    495495    AND image_id = '.$row['representative_picture_id'].'
    496496;';
    497       $result = mysql_query( $query );
     497      $result = pwg_query( $query );
    498498      if (mysql_num_rows($result) == 0)
    499499      {
    … …  
    503503  WHERE id = '.$row['id'].'
    504504;';
    505         mysql_query( $query );
     505        pwg_query( $query );
    506506      }
    507507    }
    … …  
    599599  $query.= " WHERE status = 'private'";
    600600  $query.= ';';
    601   $result = mysql_query( $query );
     601  $result = pwg_query( $query );
    602602  $privates = array();
    603603  while ( $row = mysql_fetch_array( $result ) )
    … …  
    612612  $query.= ' WHERE user_id = '.$user_id;
    613613  $query.= ';';
    614   $result = mysql_query( $query );
     614  $result = pwg_query( $query );
    615615  while ( $row = mysql_fetch_array( $result ) )
    616616  {
    … …  
    627627    $query.= ' AND ug.user_id = '.$user_id;
    628628    $query.= ';';
    629     $result = mysql_query( $query );
     629    $result = pwg_query( $query );
    630630    while ( $row = mysql_fetch_array( $result ) )
    631631    {
    … …  
    650650      $query = 'SELECT id FROM '.CATEGORIES_TABLE;
    651651      $query.= " WHERE visible = 'false';";
    652       $result = mysql_query( $query );
     652      $result = pwg_query( $query );
    653653      while ( $row = mysql_fetch_array( $result ) )
    654654      {
    … …  
    680680  $query .= ' WHERE id = '.$user_id;
    681681  $query.= ';';
    682   mysql_query( $query );
     682  pwg_query( $query );
    683683
    684684  return $restrictions;
    … …  
    699699  $query.= ' WHERE id = '.$user_id;
    700700  $query.= ';';
    701   $row = mysql_fetch_array( mysql_query( $query ) );
     701  $row = mysql_fetch_array( pwg_query( $query ) );
    702702 
    703703  $base_restrictions=get_user_restrictions($user_id,$row['status'],true,true);
    … …  
    728728  $query.= ' WHERE id = '.$category_id;
    729729  $query.= ';';
    730   $row = mysql_fetch_array( mysql_query( $query ) );
     730  $row = mysql_fetch_array( pwg_query( $query ) );
    731731  $uppercats = explode( ',', $row['uppercats'] );
    732732  foreach ( $uppercats as $category_id ) {

  • trunk/admin/include/functions_metadata.php

    r582 r587  
    129129    // update queries
    130130    $query = 'SELECT VERSION() AS version;';
    131     $row = mysql_fetch_array(mysql_query($query));
     131    $row = mysql_fetch_array(pwg_query($query));
    132132    if (version_compare($row['version'],'4.0.4') < 0)
    133133    {
    … …  
    152152;';
    153153        // echo '<pre>'.$query.'</pre>';
    154         mysql_query($query);
     154        pwg_query($query);
    155155      }
    156156    }
    … …  
    161161DESCRIBE '.IMAGES_TABLE.'
    162162;';
    163       $result = mysql_query($query);
     163      $result = pwg_query($query);
    164164      $columns = array();
    165165      while ($row = mysql_fetch_array($result))
    … …  
    188188;';
    189189      // echo '<pre>'.$query.'</pre>';
    190       mysql_query($query);
     190      pwg_query($query);
    191191      // inserts all found pictures
    192192      $query = '
    … …  
    225225;';
    226226      // echo '<pre>'.$query.'</pre>';
    227       mysql_query($query);
     227      pwg_query($query);
    228228      // update of images table by joining with temporary table
    229229      $query = '
    … …  
    236236;';
    237237      echo '<pre>'.$query.'</pre>';
    238       mysql_query($query);
     238      pwg_query($query);
    239239    }
    240240  }
    … …  
    259259  WHERE dir IS NOT NULL
    260260;';
    261   $result = mysql_query($query);
     261  $result = pwg_query($query);
    262262  $cat_dirs = array();
    263263  while ($row = mysql_fetch_array($result))
    … …  
    292292  $query.= '
    293293;';
    294   $result = mysql_query($query);
     294  $result = pwg_query($query);
    295295  while ($row = mysql_fetch_array($result))
    296296  {
    … …  
    303303  WHERE id = 1
    304304';
    305   $row = mysql_fetch_array(mysql_query($query));
     305  $row = mysql_fetch_array(pwg_query($query));
    306306  $basedir = $row['galleries_url'];
    307307 
    … …  
    329329  $query.= '
    330330;';
    331   $result = mysql_query($query);
     331  $result = pwg_query($query);
    332332  while ($row = mysql_fetch_array($result))
    333333  {

  • trunk/admin/infos_images.php

    r579 r587  
    5656        $query.= ' WHERE id = '.$_POST['associate'];
    5757        $query.= ';';
    58         if (mysql_num_rows(mysql_query($query)) == 0)
     58        if (mysql_num_rows(pwg_query($query)) == 0)
    5959          array_push($errors, $lang['cat_unknown_id']);
    6060      }
    … …  
    6767    $query.= ' WHERE category_id = '.$page['cat'];
    6868    $query.= ';';
    69     $result = mysql_query($query);
     69    $result = pwg_query($query);
    7070    while ($row = mysql_fetch_array($result))
    7171    {
    … …  
    109109        $query.= ' WHERE id = '.$row['id'];
    110110        $query.= ';';
    111         mysql_query($query);
     111        pwg_query($query);
    112112      }
    113113      // add link to another category
    … …  
    118118        $query.= ' ('.$row['id'].','.$_POST['associate'].')';
    119119        $query.= ';';
    120         mysql_query($query);
     120        pwg_query($query);
    121121        $associate = true;
    122122      }
    … …  
    131131      $query = 'SELECT image_id FROM '.IMAGE_CATEGORY_TABLE;
    132132      $query.= ' WHERE category_id = '.$page['cat'];
    133       $result = mysql_query($query);
     133      $result = pwg_query($query);
    134134      while ($row = mysql_fetch_array($result))
    135135      {
    … …  
    146146        $query.= ' WHERE id = '.$row['image_id'];
    147147        $query.= ';';
    148         mysql_query($query);
     148        pwg_query($query);
    149149      }
    150150    }
    … …  
    156156        $query = 'SELECT image_id FROM '.IMAGE_CATEGORY_TABLE;
    157157        $query.= ' WHERE category_id = '.$page['cat'];
    158         $result = mysql_query($query);
     158        $result = pwg_query($query);
    159159        while ($row = mysql_fetch_array($result))
    160160        {
    … …  
    170170          $query.= ' WHERE id = '.$row['image_id'];
    171171          $query.= ';';
    172           mysql_query($query);
     172          pwg_query($query);
    173173        }
    174174      }
    … …  
    184184      $query.= ' WHERE category_id = '.$page['cat'];
    185185      $query.= ';';
    186       $result = mysql_query($query);
     186      $result = pwg_query($query);
    187187      while ($row = mysql_fetch_array($result))
    188188      {
    … …  
    223223        $query.= ' WHERE id = '.$row['id'];
    224224        $query.= ';';
    225         mysql_query($query);
     225        pwg_query($query);
    226226      }
    227227    }
    … …  
    317317  LIMIT '.$page['start'].','.$conf['info_nb_elements_page'].'
    318318;';
    319   $result = mysql_query($query);
     319  $result = pwg_query($query);
    320320  while ($row = mysql_fetch_array($result))
    321321  {
    … …  
    346346  $query = 'SELECT COUNT(id) AS nb_total_categories';
    347347  $query.= ' FROM '.CATEGORIES_TABLE.';';
    348   $row = mysql_fetch_array(mysql_query($query));
     348  $row = mysql_fetch_array(pwg_query($query));
    349349  if ($row['nb_total_categories'] < $conf['max_LOV_categories'])
    350350  {

  • trunk/admin/picture_modify.php

    r579 r587  
    8383  $query.= ' WHERE id = '.$_GET['image_id'];
    8484  $query.= ';';
    85   mysql_query($query);
     85  pwg_query($query);
    8686  // make the picture representative of a category ?
    8787  $query = '
    … …  
    9191    AND image_id = '.$_GET['image_id'].'
    9292;';
    93   $result = mysql_query($query);
     93  $result = pwg_query($query);
    9494  while ($row = mysql_fetch_array($result))
    9595  {
    … …  
    103103      $query.= ' WHERE id = '.$row['category_id'];
    104104      $query.= ';';
    105       mysql_query($query);
     105      pwg_query($query);
    106106    }
    107107    // if the user ask this picture to be not any more the representative,
    … …  
    115115  WHERE id = '.$row['category_id'].'
    116116;';
    117       mysql_query($query);
     117      pwg_query($query);
    118118    }
    119119  }
    … …  
    134134  WHERE id = '.$_POST['associate'].'
    135135;';
    136       if (mysql_num_rows(mysql_query($query)) == 0)
     136      if (mysql_num_rows(pwg_query($query)) == 0)
    137137        array_push($errors, $lang['cat_unknown_id']);
    138138    }
    … …  
    148148  ('.$_POST['associate'].','.$_GET['image_id'].')
    149149;';
    150     mysql_query($query);
     150    pwg_query($query);
    151151    $associate_or_dissociate = true;
    152152    update_category($_POST['associate']);
    … …  
    159159  WHERE image_id = '.$_GET['image_id'].'
    160160;';
    161   $result = mysql_query($query);
     161  $result = pwg_query($query);
    162162  while ($row = mysql_fetch_array($result))
    163163  {
    … …  
    169169  AND category_id = '.$row['category_id'].'
    170170;';
    171       mysql_query($query);
     171      pwg_query($query);
    172172      $associate_or_dissociate = true;
    173173      update_category($row['category_id']);
    … …  
    186186  WHERE id = '.$_GET['image_id'].'
    187187;';
    188 $row = mysql_fetch_array(mysql_query($query));
     188$row = mysql_fetch_array(pwg_query($query));
    189189
    190190if (empty($row['name']))
    … …  
    217217    AND category_id = id
    218218;';
    219 $result = mysql_query($query);
     219$result = pwg_query($query);
    220220$categories = '';
    221221while ($cat_row = mysql_fetch_array($result))
    … …  
    287287$query = 'SELECT COUNT(id) AS nb_total_categories';
    288288$query.= ' FROM '.CATEGORIES_TABLE.';';
    289 $row = mysql_fetch_array(mysql_query($query));
     289$row = mysql_fetch_array(pwg_query($query));
    290290if ($row['nb_total_categories'] < $conf['max_LOV_categories'])
    291291{

  • trunk/admin/remote_site.php

    r538 r587  
    103103    AND dir IS NOT NULL
    104104;';
    105   $result = mysql_query($query);
     105  $result = pwg_query($query);
    106106  while ($row = mysql_fetch_array($result))
    107107  {
    … …  
    156156  $query.= '
    157157;';
    158   mysql_query($query);
     158  pwg_query($query);
    159159}
    160160
    … …  
    234234  WHERE id = '.$id_uppercat.'
    235235;';
    236     $row = mysql_fetch_array(mysql_query($query));
     236    $row = mysql_fetch_array(pwg_query($query));
    237237   
    238238    $uppercats = $row['uppercats'];
    … …  
    325325    $query.= '
    326326;';
    327     mysql_query($query);
     327    pwg_query($query);
    328328  }
    329329
    … …  
    368368  WHERE storage_category_id = '.$category_id.'
    369369;';
    370   $result = mysql_query($query);
     370  $result = pwg_query($query);
    371371  $to_delete = array();
    372372  while ($row = mysql_fetch_array($result))
    … …  
    391391  WHERE storage_category_id = '.$category_id.'
    392392;';
    393   $result = mysql_query($query);
     393  $result = pwg_query($query);
    394394  while ($row = mysql_fetch_array($result))
    395395  {
    … …  
    447447  WHERE storage_category_id = '.$category_id.'
    448448;';
    449     $result = mysql_query($query);
     449    $result = pwg_query($query);
    450450    while ($row = mysql_fetch_array($result))
    451451    {
    … …  
    460460    AND image_id IN ('.implode(',', $ids).')
    461461;';
    462     mysql_query($query);
     462    pwg_query($query);
    463463
    464464    $query = '
    … …  
    478478    $query.= '
    479479;';
    480     mysql_query($query);
     480    pwg_query($query);
    481481  }
    482482}
    … …  
    537537  WHERE galleries_url = \''.$page['galleries_url'].'\'
    538538;';
    539     $row = mysql_fetch_array(mysql_query($query));
     539    $row = mysql_fetch_array(pwg_query($query));
    540540    if ($row['count'] > 0)
    541541    {
    … …  
    571571  (\''.$page['galleries_url'].'\')
    572572;';
    573     mysql_query($query);
     573    pwg_query($query);
    574574
    575575    $template->assign_block_vars(
    … …  
    597597  WHERE id = '.$page['site'].'
    598598;';
    599     list($galleries_url) = mysql_fetch_array(mysql_query($query));
     599    list($galleries_url) = mysql_fetch_array(pwg_query($query));
    600600  }
    601601
    … …  
    647647  WHERE galleries_url = \''.addslashes($url).'\'
    648648;';
    649       $result = mysql_query($query);
     649      $result = pwg_query($query);
    650650      if (mysql_num_rows($result) == 0)
    651651      {
    … …  
    657657  (\''.$url.'\')
    658658;';
    659         mysql_query($query);
     659        pwg_query($query);
    660660        $site_id = mysql_insert_id();
    661661      }
    … …  
    699699  WHERE galleries_url = \''.addslashes($url).'\'
    700700;';
    701     list($count) = mysql_fetch_array(mysql_query($query));
     701    list($count) = mysql_fetch_array(pwg_query($query));
    702702    if ($count == 0)
    703703    {
    … …  
    716716  WHERE id != 1
    717717;';
    718 $result = mysql_query($query);
     718$result = pwg_query($query);
    719719while ($row = mysql_fetch_array($result))
    720720{

  • trunk/admin/search.php

    r393 r587  
    7575    WHERE username LIKE '" . str_replace("\'", "''", $username_search) . "'
    7676    ORDER BY username";
    77   if ( !($result = mysql_query($sql)) )
     77  if ( !($result = pwg_query($sql)) )
    7878  {
    7979    die('Could not obtain search results');

  • trunk/admin/stats.php

    r566 r587  
    5353  FROM phpwg_history
    5454  GROUP BY DATE_FORMAT(date,'%Y-%m') DESC;";
    55 $result = mysql_query( $query );
     55$result = pwg_query( $query );
    5656$i=0;
    5757while ( $row = mysql_fetch_array( $result ) )
    … …  
    6767        AND FILE = 'picture'
    6868        GROUP BY FILE;";
    69   $pictures = mysql_fetch_array(mysql_query( $query ));
     69  $pictures = mysql_fetch_array(pwg_query( $query ));
    7070 
    7171  // Number of different visitors
    … …  
    7474    WHERE DATE_FORMAT(date,'%Y-%m') = '$current_month'
    7575        GROUP BY login, IP;";
    76   $user_results = mysql_query( $query );
     76  $user_results = pwg_query( $query );
    7777  $nb_visitors = 0;
    7878  $auth_users = array();
    … …  
    113113  $query.= ' ORDER BY date DESC';
    114114  $query.= ';';
    115   $result = mysql_query( $query );
     115  $result = pwg_query( $query );
    116116  $nb_pages_seen = mysql_num_rows( $result );
    117117  $day['nb_pages_seen'] = $nb_pages_seen;

  • trunk/admin/update.php

    r581 r587  
    5454  ORDER BY id_uppercat,rank,name
    5555;';
    56   $result = mysql_query($query);
     56  $result = pwg_query($query);
    5757  while ($row = mysql_fetch_array($result))
    5858  {
    … …  
    6767  WHERE id = '.$row['id'].'
    6868;';
    69     mysql_query($query);
     69    pwg_query($query);
    7070  }
    7171}
    … …  
    8585    $query.= ' WHERE id = '.$id_uppercat;
    8686    $query.= ';';
    87     $row = mysql_fetch_array( mysql_query( $query));
     87    $row = mysql_fetch_array( pwg_query( $query));
    8888    $uppercats = $row['uppercats'];
    8989    $name      = $row['name'];
    … …  
    9999  WHERE id IN ('.$uppercats.')
    100100;';
    101     $result = mysql_query( $query);
     101    $result = pwg_query( $query);
    102102    while ($row = mysql_fetch_array($result))
    103103    {
    … …  
    144144  $query.= '
    145145;';
    146   $result = mysql_query($query);
     146  $result = pwg_query($query);
    147147  while ($row = mysql_fetch_array($result))
    148148  {
    … …  
    209209    $query.= '
    210210;';
    211     mysql_query($query);
     211    pwg_query($query);
    212212
    213213    $counts['new_categories']+= count($inserts);
    … …  
    236236    $query.= '
    237237;';
    238     mysql_query($query);
     238    pwg_query($query);
    239239  }
    240240
    … …  
    257257  $query.= '
    258258;';
    259   $result = mysql_query($query);
     259  $result = pwg_query($query);
    260260  while ($row = mysql_fetch_array($result))
    261261  {
    … …  
    292292  WHERE storage_category_id = '.$category_id.'
    293293;';
    294   $result = mysql_query($query);
     294  $result = pwg_query($query);
    295295  while ($row = mysql_fetch_array($result))
    296296  {
    … …  
    314314                     , $conf['picture_ext'])).')
    315315;';
    316   $result = mysql_query($query);
     316  $result = pwg_query($query);
    317317  while ($row = mysql_fetch_array($result))
    318318  {
    … …  
    340340   WHERE storage_category_id = '.$category_id.'
    341341;';
    342   $result = mysql_query($query);
     342  $result = pwg_query($query);
    343343  while ($row = mysql_fetch_array($result))
    344344  {
    … …  
    356356    AND validated = \'false\'
    357357;';
    358   $result = mysql_query($query);
     358  $result = pwg_query($query);
    359359  while ($row = mysql_fetch_array($result))
    360360  {
    … …  
    505505;';
    506506
    507     mysql_query($query);
     507    pwg_query($query);
    508508
    509509    // what are the ids of the pictures in the $category_id ?
    … …  
    515515  WHERE storage_category_id = '.$category_id.'
    516516;';
    517     $result = mysql_query($query);
     517    $result = pwg_query($query);
    518518    while ($row = mysql_fetch_array($result))
    519519    {
    … …  
    528528    AND image_id IN ('.implode(',', $ids).')
    529529;';
    530     mysql_query($query);
     530    pwg_query($query);
    531531
    532532    foreach ($ids as $num => $image_id)
    … …  
    539539  '.implode(',', $ids).'
    540540;';
    541     mysql_query($query);
     541    pwg_query($query);
    542542  }
    543543  return $output;

  • trunk/admin/user_list.php

    r393 r587  
    6868  $query.= ' WHERE id = '.$_GET['delete'];
    6969  $query.= ';';
    70   $row = mysql_fetch_array( mysql_query( $query ) );
     70  $row = mysql_fetch_array( pwg_query( $query ) );
    7171  // confirm user deletion ?
    7272  if ( !isset( $_GET['confirm'] ) )
    … …  
    9292      $query.= ' WHERE id = '.$_GET['delete'];
    9393      $query.= ';';
    94       $row2 = mysql_fetch_array( mysql_query( $query ) );
     94      $row2 = mysql_fetch_array( pwg_query( $query ) );
    9595      if ( $row2['nb_result'] > 0 )
    9696      {
    … …  
    138138  $query.= ' ORDER BY status ASC, username ASC';
    139139  $query.= ';';
    140   $result = mysql_query( $query );
     140  $result = pwg_query( $query );
    141141
    142142  $current_status = '';
    … …  
    239239    $query.= ' FROM '.USERS_TABLE;
    240240    $query.= ';';
    241     $result = mysql_query( $query );
     241    $result = pwg_query( $query );
    242242    while ( $row = mysql_fetch_array( $result ) )
    243243    {

  • trunk/admin/user_modify.php

    r364 r587  
    4545$query.= ' where id = '.$_GET['user_id'];
    4646$query.= ';';
    47 $row = mysql_fetch_array( mysql_query( $query ) );
     47$row = mysql_fetch_array( pwg_query( $query ) );
    4848$page['username'] = $row['username'];
    4949$page['status'] = $row['status'];
    … …  
    9191  $query.= ' ORDER BY id ASC';
    9292  $query.= ';';
    93   $result = mysql_query( $query );
     93  $result = pwg_query( $query );
    9494  while ( $row = mysql_fetch_array( $result ) )
    9595  {
    … …  
    101101      $query.= ' AND group_id ='.$row['id'];
    102102      $query.= ';';
    103       mysql_query( $query );
     103      pwg_query( $query );
    104104    }
    105105  }
    … …  
    109109  $query.= ' ('.$_GET['user_id'].','.$_POST['associate'].')';
    110110  $query.= ';';
    111   mysql_query( $query );
     111  pwg_query( $query );
    112112  // synchronize category informations for this user
    113113  synchronize_user( $_GET['user_id'] );
    … …  
    180180  $query.= ' AND user_id = '.$_GET['user_id'];
    181181  $query.= ';';
    182   $result = mysql_query( $query );
     182  $result = pwg_query( $query );
    183183  $user_groups = array();
    184184  if ( mysql_num_rows( $result ) > 0 )
    … …  
    205205  $query.= ' ORDER BY id ASC';
    206206  $query.= ';';
    207   $result = mysql_query( $query );
     207  $result = pwg_query( $query );
    208208  while ( $row = mysql_fetch_array( $result ) )
    209209  {

  • trunk/admin/user_perm.php

    r393 r587  
    122122  $query.= ' WHERE user_id = '.$_GET['user_id'];
    123123  $query.= ';';
    124   mysql_query( $query );
     124  pwg_query( $query );
    125125  // selecting all private categories
    126126  $query = 'SELECT id';
    … …  
    128128  $query.= " WHERE status = 'private'";
    129129  $query.= ';';
    130   $result = mysql_query( $query );
     130  $result = pwg_query( $query );
    131131  while ( $row = mysql_fetch_array( $result ) )
    132132  {
    … …  
    138138      $query.= ' ('.$_GET['user_id'].','.$row['id'].')';
    139139      $query.= ';';
    140       mysql_query ( $query );
     140      pwg_query ( $query );
    141141    }
    142142  }
    … …  
    158158$query.= ' FROM '.PREFIX_TABLE.'groups';
    159159$query.= ';';
    160 $result = mysql_query( $query );
     160$result = pwg_query( $query );
    161161$groups = array();
    162162while ( $row = mysql_fetch_array( $result ) )
    … …  
    169169$query.= ' WHERE user_id = '.$_GET['user_id'];
    170170$query.= ';';
    171 $result = mysql_query( $query );
     171$result = pwg_query( $query );
    172172$usergroups = array();
    173173while ( $row = mysql_fetch_array( $result ) )
    … …  
    180180$query.= " WHERE status = 'private'";
    181181$query.= ';';
    182 $result = mysql_query( $query );
     182$result = pwg_query( $query );
    183183while ( $row = mysql_fetch_array( $result ) )
    184184{
    … …  
    198198  $query.= ' AND cat_id = '.$row['id'];
    199199  $query.= ';';
    200   $subresult = mysql_query( $query );
     200  $subresult = pwg_query( $query );
    201201  $authorized_groups = array();
    202202  while ( $subrow = mysql_fetch_array( $subresult ) )

  • trunk/admin/user_search.php

    r539 r587  
    4646  $query.= ' WHERE user_id = '.$_GET['user_id'];
    4747  $query.= ';';
    48   mysql_query( $query );
     48  pwg_query( $query );
    4949  // selecting all private categories
    5050  $query = 'SELECT id FROM '.CATEGORIES_TABLE;
    5151  $query.= " WHERE status = 'private'";
    5252  $query.= ';';
    53   $result = mysql_query( $query );
     53  $result = pwg_query( $query );
    5454  while ( $row = mysql_fetch_array( $result ) )
    5555  {
    … …  
    6161      $query.= ' ('.$_GET['user_id'].','.$row['id'].')';
    6262      $query.= ';';
    63       mysql_query ( $query );
     63      pwg_query ( $query );
    6464    }
    6565  }
    … …  
    9797  $query = 'SELECT id FROM '.CATEGORIES_TABLE;
    9898  $query.= " WHERE status = 'private';";
    99   $result = mysql_query( $query );
     99  $result = pwg_query( $query );
    100100  while ( $row = mysql_fetch_array( $result ) )
    101101  {

  • trunk/admin/waiting.php

    r520 r587  
    3535  $query = 'SELECT * FROM '.WAITING_TABLE;
    3636  $query.= " WHERE validated = 'false';";
    37   $result = mysql_query( $query );
     37  $result = pwg_query( $query );
    3838  while ( $row = mysql_fetch_array( $result ) )
    3939  {
    … …  
    4949        $query.= ' WHERE id = '.$row['id'];
    5050        $query.= ';';
    51         mysql_query( $query );
     51        pwg_query( $query );
    5252        // linking logically the picture to its storage category
    5353        $query = 'INSERT INTO';
    … …  
    6060        $query.= ' WHERE id = '.$row['id'];
    6161        $query.= ';';
    62         mysql_query( $query );
     62        pwg_query( $query );
    6363        // deletion of the associated files
    6464        $dir = get_complete_dir( $row['storage_category_id'] );
    … …  
    103103$query.= ' ORDER BY storage_category_id';
    104104$query.= ';';
    105 $result = mysql_query( $query );
     105$result = pwg_query( $query );
    106106$i = 0;
    107107while ( $row = mysql_fetch_array( $result ) )

  • trunk/comments.php

    r579 r587  
    5454  WHERE id IN ('.implode(',', $_POST['comment_id']).')
    5555;';
    56   mysql_query($query);
     56  pwg_query($query);
    5757}
    5858// comments validation
    … …  
    6464  WHERE id IN ('.implode(',', $_POST['comment_id']).')
    6565;';
    66   mysql_query($query);
     66  pwg_query($query);
    6767}
    6868// +-----------------------------------------------------------------------+
    … …  
    129129  ORDER BY ic.image_id DESC
    130130;';
    131 $result = mysql_query($query);
     131$result = pwg_query($query);
    132132if ($user['status'] == 'admin')
    133133{
    … …  
    145145  WHERE id = '.$row['image_id'].'
    146146;';
    147   $subresult = mysql_query($query);
     147  $subresult = pwg_query($query);
    148148  $subrow = mysql_fetch_array($subresult);
    149149
    … …  
    196196  ORDER BY date DESC
    197197;';
    198   $handleresult = mysql_query($query);
     198  $handleresult = pwg_query($query);
    199199  while ($subrow = mysql_fetch_array($handleresult))
    200200  {

  • trunk/identification.php

    r555 r587  
    4040  WHERE username = \''.$_POST['username'].'\'
    4141;';
    42   $row = mysql_fetch_array(mysql_query($query));
     42  $row = mysql_fetch_array(pwg_query($query));
    4343  if ($row['password'] == md5($_POST['password']))
    4444  {

  • 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

  • trunk/picture.php

    r579 r587  
    3838}
    3939//---------------------------------------- incrementation of the number of hits
    40 $query = 'UPDATE '.IMAGES_TABLE.' SET hit=hit+1';
    41 $query.= ' WHERE id='.$_GET['image_id'];
    42 $query.= ';';
    43 @mysql_query( $query );
     40$query = '
     41UPDATE '.IMAGES_TABLE.'
     42  SET hit = hit+1
     43  WHERE id = '.$_GET['image_id'].'
     44;';
     45@pwg_query( $query );
    4446//-------------------------------------------------------------- initialization
    4547initialize_category( 'picture' );
    … …  
    5254  '.$conf['order_by'].'
    5355;';
    54 $result = mysql_query( $query );
     56$result = pwg_query( $query );
    5557$page['num'] = 0;
    5658$belongs = false;
    … …  
    112114$query.= ';';
    113115
    114 $result = mysql_query( $query );
     116$result = pwg_query( $query );
    115117$indexes = array('prev', 'current', 'next');
    116118
    … …  
    226228    AND element_id = '.$_GET['image_id'].'
    227229;';
    228   mysql_query($query);
     230  pwg_query($query);
    229231  $query = '
    230232INSERT INTO '.RATE_TABLE.'
    … …  
    233235  ('.$user['id'].','.$_GET['image_id'].','.$_GET['rate'].')
    234236;';
    235   mysql_query($query);
     237  pwg_query($query);
    236238
    237239  // update of images.average_rate field
    … …  
    241243  WHERE element_id = '.$_GET['image_id'].'
    242244;';
    243   $row = mysql_fetch_array(mysql_query($query));
     245  $row = mysql_fetch_array(pwg_query($query));
    244246  $query = '
    245247UPDATE '.IMAGES_TABLE.'
    … …  
    247249  WHERE id = '.$_GET['image_id'].'
    248250;';
    249   mysql_query($query);
     251  pwg_query($query);
    250252}
    251253//--------------------------------------------------------- favorite management
    … …  
    256258  $query.= ' AND image_id = '.$picture['current']['id'];
    257259  $query.= ';';
    258   $result = mysql_query( $query );
     260  $result = pwg_query( $query );
    259261 
    260262  if ( $_GET['add_fav'] == 1 )
    … …  
    264266    $query.= ' ('.$picture['current']['id'].','.$user['id'].')';
    265267    $query.= ';';
    266     $result = mysql_query( $query );
     268    $result = pwg_query( $query );
    267269  }
    268270  if ( !$_GET['add_fav'] and $page['cat'] == 'fav' )
    … …  
    302304    $query.= " WHERE username = '".$author."'";
    303305    $query.= ';';
    304     $row = mysql_fetch_array( mysql_query( $query ) );
     306    $row = mysql_fetch_array( pwg_query( $query ) );
    305307    if ( $row['user_exists'] == 1 )
    306308    {
    … …  
    320322    $query.= " AND author = '".$author."'";
    321323    $query.= ';';
    322     if ( mysql_num_rows( mysql_query( $query ) ) == 0
     324    if ( mysql_num_rows( pwg_query( $query ) ) == 0
    323325         or $conf['anti-flood_time'] == 0 )
    324326    {
    … …  
    337339      }
    338340      $query.= ');';
    339       mysql_query( $query );
     341      pwg_query( $query );
    340342      // information message
    341343      $message = $lang['comment_added'];
    … …  
    371373  $query.= ' WHERE id = '.$_GET['del'];
    372374  $query.= ';';
    373   mysql_query( $query );
     375  pwg_query( $query );
    374376}
    375377
    … …  
    503505  $query.= ' FROM '.FAVORITES_TABLE.' WHERE image_id = '.$_GET['image_id'];
    504506  $query.= ' AND user_id = '.$user['id'].';';
    505   $result = mysql_query( $query );
     507  $result = pwg_query( $query );
    506508  $row = mysql_fetch_array( $result );
    507509  if (!$row['nb_fav'])
    … …  
    713715  WHERE element_id = '.$picture['current']['id'].'
    714716;';
    715   $row = mysql_fetch_array(mysql_query($query));
     717  $row = mysql_fetch_array(pwg_query($query));
    716718  if ($row['count'] == 0)
    717719  {
    … …  
    746748$query.= '
    747749;';
    748 $result = mysql_query($query);
     750$result = pwg_query($query);
    749751$categories = '';
    750752while ($row = mysql_fetch_array($result))
    … …  
    871873    AND element_id = '.$_GET['image_id'].'
    872874;';
    873   $result = mysql_query($query);
     875  $result = pwg_query($query);
    874876  if (mysql_num_rows($result) > 0)
    875877  {
    … …  
    922924  $query.= " AND validated = 'true'";
    923925  $query.= ';';
    924   $row = mysql_fetch_array( mysql_query( $query ) );
     926  $row = mysql_fetch_array( pwg_query( $query ) );
    925927 
    926928  // navigation bar creation
    … …  
    951953  $query.= ' ORDER BY date ASC';
    952954  $query.= ' LIMIT '.$page['start'].', '.$conf['nb_comment_page'].';';
    953   $result = mysql_query( $query );
     955  $result = pwg_query( $query );
    954956               
    955957  while ( $row = mysql_fetch_array( $result ) )

  • trunk/profile.php

    r527 r587  
    8888    $query.= ' WHERE id = '.$user['id'];
    8989    $query.= ';';
    90     mysql_query( $query );
     90    pwg_query( $query );
    9191
    9292    if ( isset( $_POST['use_new_pwd'] ) )
    … …  
    9696      $query.= ' WHERE id = '.$user['id'];
    9797      $query.= ';';
    98       mysql_query( $query );
     98      pwg_query( $query );
    9999    }
    100100    if ( isset( $_POST['create_cookie'] ) )
    … …  
    107107      $query.= " WHERE id = '".$page['session_id']."'";
    108108      $query.= ';';
    109       mysql_query( $query );
     109      pwg_query( $query );
    110110    }
    111111    // redirection

  • trunk/upload.php

    r585 r587  
    107107  else
    108108  {
    109         @chmod( $temp_name, 0644);
     109    @chmod( $temp_name, 0644);
    110110  }
    111111  return $result;
    … …  
    213213    $query.= ",'".$_POST['mail_address']."',".time().",'".$xml_infos."')";
    214214    $query.= ';';
    215     mysql_query( $query );
     215    pwg_query( $query );
    216216    $page['waiting_id'] = mysql_insert_id();
    217217    // mail notification for administrators
    … …  
    231231  $query.= ' where id = '.$_GET['waiting_id'];
    232232  $query.= ';';
    233   $result= mysql_query( $query );
     233  $result= pwg_query( $query );
    234234  $row = mysql_fetch_array( $result );
    235235  $file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") );
    … …  
    250250    $query.= ' where id = '.$_GET['waiting_id'];
    251251    $query.= ';';
    252     mysql_query( $query );
     252    pwg_query( $query );
    253253    $page['upload_successful'] = true;
    254254  }
Note: See TracChangeset for help on using the changeset viewer.