mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 12:49:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Feature 1241 resolved. replace mysql_fetch_array by mysql_fetch_assoc for small php code improvements

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@4265 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2009-11-15 12:26:09 +00:00
parent dda7f4571b
commit 1040cae210
51 changed files with 136 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/cat_modify.php
View file

@ -193,7 +193,7 @@ SELECT *
FROM '.CATEGORIES_TABLE.'
WHERE id = '.$_GET['cat_id'].'
;';
$category = mysql_fetch_array( pwg_query( $query ) );
$category = mysql_fetch_assoc( pwg_query( $query ) );
// nullable fields
foreach (array('comment','dir','site_id', 'id_uppercat') as $nullable)
{
@ -373,7 +373,7 @@ SELECT id,tn_ext,path
FROM '.IMAGES_TABLE.'
WHERE id = '.$category['representative_picture_id'].'
;';
$row = mysql_fetch_array(pwg_query($query));
$row = mysql_fetch_assoc(pwg_query($query));
$src = get_thumbnail_url($row);
$url = get_root_url().'admin.php?page=picture_modify';
$url.= '&image_id='.$category['representative_picture_id'];

10
admin/cat_perm.php
View file

@ -45,7 +45,7 @@ SELECT status
FROM '.CATEGORIES_TABLE.'
WHERE id = '.$_GET['cat'].'
;';
list($status) = mysql_fetch_array(pwg_query($query));
list($status) = mysql_fetch_row(pwg_query($query));
if ('private' == $status)
{
@ -62,7 +62,7 @@ SELECT id
LIMIT 0,1
;';
list($page['cat']) = mysql_fetch_array(pwg_query($query));
list($page['cat']) = mysql_fetch_row(pwg_query($query));
}
// +-----------------------------------------------------------------------+
@ -110,7 +110,7 @@ SELECT group_id, cat_id
AND group_id IN ('.implode(',', $_POST['grant_groups']).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($granteds[$row['cat_id']], $row['group_id']);
}
@ -169,7 +169,7 @@ SELECT user_id, cat_id
AND user_id IN ('.implode(',', $_POST['grant_users']).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($granteds[$row['cat_id']], $row['user_id']);
}
@ -274,7 +274,7 @@ SELECT user_id, group_id
WHERE group_id IN ('.implode(',', $group_granted_ids).')
';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (!isset($granted_groups[$row['group_id']]))
{

2
admin/configuration.php
View file

@ -138,7 +138,7 @@ if (isset($_POST['submit']) and !is_adviser())
{
//echo '<pre>'; print_r($_POST); echo '</pre>';
$result = pwg_query('SELECT param FROM '.CONFIG_TABLE);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (isset($_POST[$row['param']]))
{

2
admin/element_set.php
View file

@ -192,7 +192,7 @@ elseif ('recent'== $_GET['cat'])
$page['title'] = l10n('recent_pics_cat');
$query = 'SELECT MAX(date_available) AS date
FROM '.IMAGES_TABLE;
if ($row=mysql_fetch_array( pwg_query($query) ) )
if ($row = mysql_fetch_assoc( pwg_query($query) ) )
{
$query = 'SELECT id
FROM '.IMAGES_TABLE.'

2
admin/element_set_global.php
View file

@ -245,7 +245,7 @@ SELECT id
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$data = array();
$data['id'] = $row['id'];

2
admin/element_set_ranks.php
View file

@ -115,7 +115,7 @@ SELECT uppercats
FROM '.CATEGORIES_TABLE.'
WHERE id = '.$page['category_id'].'
;';
$category = mysql_fetch_array(pwg_query($query));
$category = mysql_fetch_assoc(pwg_query($query));
// Navigation path
$navigation = get_cat_display_name_cache(

2
admin/element_set_unit.php
View file

@ -56,7 +56,7 @@ SELECT id, date_creation
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$data = array();

2
admin/group_list.php
View file

@ -175,7 +175,7 @@ $del_url = $admin_url.'group_list&amp;delete=';
$members_url = $admin_url.'user_list&amp;group=';
$toggle_is_default_url = $admin_url.'group_list&amp;toggle_is_default=';
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$query = '
SELECT COUNT(*)

6
admin/group_perm.php
View file

@ -79,7 +79,7 @@ SELECT id
AND status = \'private\'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($private_uppercats, $row['id']);
}
@ -96,7 +96,7 @@ SELECT cat_id
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($authorized_ids, $row['cat_id']);
}
@ -157,7 +157,7 @@ display_select_cat_wrapper($query_true,array(),'category_option_true');
$result = pwg_query($query_true);
$authorized_ids = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($authorized_ids, $row['id']);
}

6
admin/history.php
View file

@ -257,7 +257,7 @@ SELECT '.$conf['user_fields']['id'].' AS id
$result = pwg_query($query);
$username_of = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$username_of[$row['id']] = $row['username'];
}
@ -305,7 +305,7 @@ SELECT
$tn_ext_of_image = array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$label_of_image[ $row['id'] ] = $row['label'];
@ -341,7 +341,7 @@ SELECT
$name_of_tag = array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$name_of_tag[ $row['id'] ] = $row['name'];
}

2
admin/include/c13y_internal.class.php
View file

@ -126,7 +126,7 @@ class c13y_internal
$status = array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$status[$row['id']] = $row['status'];
}

44
admin/include/functions.php
View file

@ -36,7 +36,7 @@ SELECT id
;';
$result = pwg_query($query);
$category_ids = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($category_ids, $row['id']);
}
@ -77,7 +77,7 @@ SELECT id
;';
$result = pwg_query($query);
$element_ids = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($element_ids, $row['id']);
}
@ -544,7 +544,7 @@ SHOW FULL COLUMNS FROM '.$tablename;
$result = pwg_query($query);
$columns = array();
$all_fields = array_merge($dbfields['primary'], $dbfields['update']);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (in_array($row['Field'], $all_fields))
{
@ -630,7 +630,7 @@ SELECT id, if(id_uppercat is null,\'\',id_uppercat) AS id_uppercat, uppercats, r
$current_uppercat = '';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if ($row['id_uppercat'] != $current_uppercat)
{
@ -776,7 +776,7 @@ SELECT uppercats
WHERE id IN ('.implode(',', $cat_ids).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$uppercats = array_merge($uppercats,
explode(',', $row['uppercats']));
@ -803,7 +803,7 @@ SELECT image_id
ORDER BY RAND()
LIMIT 0,1
;';
list($representative) = mysql_fetch_array(pwg_query($query));
list($representative) = mysql_fetch_row(pwg_query($query));
array_push(
$datas,
@ -863,7 +863,7 @@ SELECT id, uppercats, site_id
'.wordwrap(implode(', ', $cat_ids), 80, "\n").')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($categories, $row);
}
@ -1139,7 +1139,7 @@ SELECT element_id,
$datas = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$datas,
@ -1206,7 +1206,7 @@ SELECT id, id_uppercat, status, uppercats
WHERE id IN ('.implode(',', $category_ids).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$categories[$row['id']] =
array(
@ -1355,7 +1355,7 @@ SELECT MAX(rank)
FROM '.CATEGORIES_TABLE.'
WHERE id_uppercat '.(is_numeric($parent_id) ? '= '.$parent_id : 'IS NULL').'
;';
list($current_rank) = mysql_fetch_array(pwg_query($query));
list($current_rank) = mysql_fetch_row(pwg_query($query));
$insert = array(
'name' => $category_name,
@ -1371,21 +1371,21 @@ SELECT id, uppercats, global_rank, visible, status
FROM '.CATEGORIES_TABLE.'
WHERE id = '.$parent_id.'
;';
$parent = mysql_fetch_array(pwg_query($query));
$parent = mysql_fetch_assoc(pwg_query($query));
$insert{'id_uppercat'} = $parent{'id'};
$insert{'global_rank'} = $parent{'global_rank'}.'.'.$insert{'rank'};
$insert['id_uppercat'] = $parent['id'];
$insert['global_rank'] = $parent['global_rank'].'.'.$insert['rank'];
// at creation, must a category be visible or not ? Warning : if the
// parent category is invisible, the category is automatically create
// invisible. (invisible = locked)
if ('false' == $parent['visible'])
{
$insert{'visible'} = 'false';
$insert['visible'] = 'false';
}
else
{
$insert{'visible'} = boolean_to_string($conf['newcat_default_visible']);
$insert['visible'] = boolean_to_string($conf['newcat_default_visible']);
}
// at creation, must a category be public or private ? Warning : if the
@ -1393,18 +1393,18 @@ SELECT id, uppercats, global_rank, visible, status
// private.
if ('private' == $parent['status'])
{
$insert{'status'} = 'private';
$insert['status'] = 'private';
}
else
{
$insert{'status'} = $conf['newcat_default_status'];
$insert['status'] = $conf['newcat_default_status'];
}
}
else
{
$insert{'visible'} = boolean_to_string($conf['newcat_default_visible']);
$insert{'status'} = $conf['newcat_default_status'];
$insert{'global_rank'} = $insert{'rank'};
$insert['visible'] = boolean_to_string($conf['newcat_default_visible']);
$insert['status'] = $conf['newcat_default_status'];
$insert['global_rank'] = $insert['rank'];
}
// we have then to add the virtual category
@ -1609,7 +1609,7 @@ function do_maintenance_all_tables()
// List all tables
$query = 'SHOW TABLES LIKE \''.$prefixeTable.'%\'';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($all_tables, $row[0]);
}
@ -1625,7 +1625,7 @@ function do_maintenance_all_tables()
$query = 'DESC '.$table_name.';';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if ($row['Key'] == 'PRI')
{

4
admin/include/functions_metadata.php
View file

@ -259,7 +259,7 @@ SELECT id
$query.= '
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($cat_ids, $row['id']);
}
@ -284,7 +284,7 @@ SELECT id, path
$query.= '
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$files[$row['id']] = $row['path'];
}

2
admin/include/functions_notification_by_mail.inc.php
View file

@ -167,7 +167,7 @@ order by';
$result = pwg_query($query);
if (!empty($result))
{
while ($nbm_user = mysql_fetch_array($result))
while ($nbm_user = mysql_fetch_assoc($result))
{
array_push($data_users, $nbm_user);
}

4
admin/include/functions_permalinks.php
View file

@ -52,7 +52,7 @@ SELECT c.id
$result = pwg_query($query);
$cat_id = null;
if ( mysql_num_rows($result) )
list( $cat_id ) = mysql_fetch_array($result);
list( $cat_id ) = mysql_fetch_row($result);
return $cat_id;
}
@ -74,7 +74,7 @@ SELECT permalink
$result = pwg_query($query);
if ( mysql_num_rows($result) )
{
list($permalink) = mysql_fetch_array($result);
list($permalink) = mysql_fetch_row($result);
}
if ( !isset($permalink) )
{// no permalink; nothing to do

4
admin/notification_by_mail.php
View file

@ -150,7 +150,7 @@ order by
$inserts = array();
$check_key_list = array();
while ($nbm_user = mysql_fetch_array($result))
while ($nbm_user = mysql_fetch_assoc($result))
{
// Calculate key
$nbm_user['check_key'] = find_available_check_key();
@ -512,7 +512,7 @@ switch ($page['mode'])
$updated_param_count = 0;
// Update param
$result = pwg_query('select param, value from '.CONFIG_TABLE.' where param like \'nbm\\_%\'');
while ($nbm_user = mysql_fetch_array($result))
while ($nbm_user = mysql_fetch_assoc($result))
{
if (isset($_POST[$nbm_user['param']]))
{

6
admin/picture_modify.php
View file

@ -175,7 +175,7 @@ SELECT *
FROM '.IMAGES_TABLE.'
WHERE id = '.$_GET['image_id'].'
;';
$row = mysql_fetch_array(pwg_query($query));
$row = mysql_fetch_assoc(pwg_query($query));
$storage_category_id = null;
if (!empty($row['storage_category_id']))
@ -324,7 +324,7 @@ SELECT category_id, uppercats
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$name =
get_cat_display_name_cache(
@ -417,7 +417,7 @@ if (isset($storage_category_id))
{
array_push($associateds, $storage_category_id);
}
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($associateds, $row['id']);
}

4
admin/rating.php
View file

@ -94,7 +94,7 @@ SELECT '.$conf['user_fields']['username'].' as username, '.$conf['user_fields'][
FROM '.USERS_TABLE.'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$users[$row['id']]=$row['username'];
}
@ -214,7 +214,7 @@ ORDER BY date DESC;';
'rates' => array()
);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$url_del = PHPWG_ROOT_PATH.'admin.php'.

6
admin/site_manager.php
View file

@ -98,7 +98,7 @@ SELECT COUNT(id) AS count
FROM '.SITES_TABLE.'
WHERE galleries_url = \''.$url.'\'
;';
$row = mysql_fetch_array(pwg_query($query));
$row = mysql_fetch_assoc(pwg_query($query));
if ($row['count'] > 0)
{
array_push($page['errors'],
@ -167,7 +167,7 @@ SELECT galleries_url
FROM '.SITES_TABLE.'
WHERE id = '.$page['site'].'
;';
list($galleries_url) = mysql_fetch_array(pwg_query($query));
list($galleries_url) = mysql_fetch_row(pwg_query($query));
switch($_GET['action'])
{
case 'generate' :
@ -236,7 +236,7 @@ SELECT *
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$is_remote = url_is_remote($row['galleries_url']);
$base_url = PHPWG_ROOT_PATH.'admin.php';

14
admin/site_update.php
View file

@ -185,7 +185,7 @@ SELECT id, uppercats, global_rank, status, visible
SELECT id
FROM '.CATEGORIES_TABLE;
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$next_rank[$row['id']] = 1;
}
@ -196,7 +196,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
FROM '.CATEGORIES_TABLE.'
GROUP BY id_uppercat';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
// for the id_uppercat NULL, we write 'NULL' and not the empty string
if (!isset($row['id_uppercat']) or $row['id_uppercat'] == '')
@ -210,7 +210,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
$query = '
SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
FROM '.CATEGORIES_TABLE;
list($next_id) = mysql_fetch_array(pwg_query($query));
list($next_id) = mysql_fetch_row(pwg_query($query));
// retrieve sub-directories fulldirs from the site reader
$fs_fulldirs = $site_reader->get_full_directories($basedir);
@ -386,7 +386,7 @@ SELECT file,storage_category_id
'.wordwrap(implode(', ', $cat_ids), 80, "\n").')
AND validated = \'false\'';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$db_unvalidated,
@ -402,7 +402,7 @@ SELECT file,storage_category_id
$query = '
SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id
FROM '.IMAGES_TABLE;
list($next_element_id) = mysql_fetch_array(pwg_query($query));
list($next_element_id) = mysql_fetch_row(pwg_query($query));
$start = get_moment();
@ -555,7 +555,7 @@ SELECT id,file,storage_category_id,infos
$waiting_to_delete = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$data = array();
@ -564,7 +564,7 @@ SELECT id
FROM '.IMAGES_TABLE.'
WHERE storage_category_id = '.$row['storage_category_id'].'
AND file = \''.$row['file'].'\'';
list($data['id']) = mysql_fetch_array(pwg_query($query));
list($data['id']) = mysql_fetch_row(pwg_query($query));
foreach ($fields['update'] as $field)
{

4
admin/stats.php
View file

@ -95,7 +95,7 @@ SELECT
$result = pwg_query($query);
$output = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($output, $row);
}
@ -133,7 +133,7 @@ $max_id = 0;
$is_first = true;
$first_time_key = null;
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$time_keys = array(
substr($row['date'], 0, 4), //yyyy

4
admin/tags.php
View file

@ -49,7 +49,7 @@ SELECT id, name
WHERE id IN ('.$_POST['edit_list'].')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$current_name_of[ $row['id'] ] = $row['name'];
}
@ -220,7 +220,7 @@ SELECT id, name
WHERE id IN ('.implode(',', $_POST['tags']).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$name_of[ $row['id'] ] = $row['name'];
}

4
admin/upload.php
View file

@ -100,7 +100,7 @@ SELECT id, storage_category_id, file, tn_ext
WHERE id IN ('.implode(',', $to_reject).')
;';
$result = pwg_query($query);
while($row = mysql_fetch_array($result))
while($row = mysql_fetch_assoc($result))
{
$dir = get_complete_dir($row['storage_category_id']);
unlink($dir.$row['file']);
@ -153,7 +153,7 @@ $query.= " WHERE validated = 'false'";
$query.= ' ORDER BY storage_category_id';
$query.= ';';
$result = pwg_query( $query );
while ( $row = mysql_fetch_array( $result ) )
while ( $row = mysql_fetch_assoc( $result ) )
{
if ( !isset( $cat_names[$row['storage_category_id']] ) )
{

6
admin/user_list.php
View file

@ -115,7 +115,7 @@ SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id,
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$user = $row;
$user['groups'] = array();
@ -139,7 +139,7 @@ SELECT user_id, group_id
WHERE user_id IN ('.implode(',', $user_ids).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$users[$user_nums[$row['user_id']]]['groups'],
@ -492,7 +492,7 @@ SELECT id, name
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$groups[$row['id']] = $row['name'];
}

8
admin/user_perm.php
View file

@ -78,7 +78,7 @@ SELECT id
AND status = \'private\'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($private_uppercats, $row['id']);
}
@ -95,7 +95,7 @@ SELECT cat_id
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($authorized_ids, $row['cat_id']);
}
@ -158,7 +158,7 @@ $result = pwg_query($query);
if (mysql_num_rows($result) > 0)
{
$cats = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($cats, $row);
array_push($group_authorized, $row['cat_id']);
@ -191,7 +191,7 @@ display_select_cat_wrapper($query_true,array(),'category_option_true');
$result = pwg_query($query_true);
$authorized_ids = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($authorized_ids, $row['id']);
}

6
include/calendar_monthly.class.php
View file

@ -231,7 +231,7 @@ function build_global_calendar(&$tpl_var)
$result = pwg_query($query);
$items=array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$y = substr($row['period'], 0, 4);
$m = (int)substr($row['period'], 4, 2);
@ -283,7 +283,7 @@ function build_year_calendar(&$tpl_var)
$result = pwg_query($query);
$items=array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$m = (int)substr($row['period'], 0, 2);
$d = substr($row['period'], 2, 2);
@ -333,7 +333,7 @@ function build_month_calendar(&$tpl_var)
$items=array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$d = (int)$row['period'];
$items[$d] = array('nb_images'=>$row['count']);

2
include/category_cats.inc.php
View file

@ -178,7 +178,7 @@ SELECT
GROUP BY category_id
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$dates_of_category[ $row['category_id'] ] = array(
'from' => $row['date_creation_min'],

12
include/functions.inc.php
View file

@ -44,7 +44,7 @@ function get_enums($table, $field)
// retrieving the properties of the table. Each line represents a field :
// columns are 'Field', 'Type'
$result = pwg_query('desc '.$table);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
// we are only interested in the the field given in parameter for the
// function
@ -935,7 +935,7 @@ function array_from_query($query, $fieldname)
$array = array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($array, $row[$fieldname]);
}
@ -1121,7 +1121,7 @@ SELECT '.$conf['user_fields']['email'].'
FROM '.USERS_TABLE.'
WHERE '.$conf['user_fields']['id'].' = '.$conf['webmaster_id'].'
;';
list($email) = mysql_fetch_array(pwg_query($query));
list($email) = mysql_fetch_row(pwg_query($query));
return $email;
}
@ -1147,7 +1147,7 @@ SELECT param, value
fatal_error('No configuration data');
}
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$conf[ $row['param'] ] = isset($row['value']) ? $row['value'] : '';
@ -1192,7 +1192,7 @@ function simple_hash_from_query($query, $keyname, $valuename)
$array = array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$array[ $row[$keyname] ] = $row[$valuename];
}
@ -1584,7 +1584,7 @@ function get_icon($date, $is_child_date = false)
{
// Use MySql date in order to standardize all recent "actions/queries"
list($cache['get_icon']['sql_recent_date']) =
mysql_fetch_array(pwg_query('select SUBDATE(
mysql_fetch_row(pwg_query('select SUBDATE(
CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)'));
}

8
include/functions_category.inc.php
View file

@ -240,7 +240,7 @@ function get_local_dir( $category_id )
$query = 'SELECT uppercats';
$query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$category_id;
$query.= ';';
$row = mysql_fetch_array( pwg_query( $query ) );
$row = mysql_fetch_assoc( pwg_query( $query ) );
$uppercats = $row['uppercats'];
}
@ -251,7 +251,7 @@ function get_local_dir( $category_id )
$query.= ' FROM '.CATEGORIES_TABLE.' WHERE id IN ('.$uppercats.')';
$query.= ';';
$result = pwg_query( $query );
while( $row = mysql_fetch_array( $result ) )
while( $row = mysql_fetch_assoc( $result ) )
{
$database_dirs[$row['id']] = $row['dir'];
}
@ -275,7 +275,7 @@ SELECT galleries_url
WHERE s.id = c.site_id
AND c.id = '.$category_id.'
;';
$row = mysql_fetch_array(pwg_query($query));
$row = mysql_fetch_assoc(pwg_query($query));
return $row['galleries_url'];
}
@ -384,7 +384,7 @@ SELECT DISTINCT(id)
$result = pwg_query($query);
$subcats = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($subcats, $row['id']);
}

6
include/functions_mail.inc.php
View file

@ -351,7 +351,7 @@ order by
$datas = pwg_query($query);
if (!empty($datas))
{
while ($admin = mysql_fetch_array($datas))
while ($admin = mysql_fetch_assoc($datas))
{
if (!empty($admin['mail_address']))
{
@ -450,7 +450,7 @@ WHERE
if (mysql_num_rows($result) > 0)
{
$list = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$row['template_theme'] = $row['template'];
list($row['template'], $row['theme']) = explode('/', $row['template_theme']);
@ -479,7 +479,7 @@ WHERE
if (mysql_num_rows($result) > 0)
{
$Bcc = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (!empty($row['mail_address']))
{

4
include/functions_notification.inc.php
View file

@ -145,7 +145,7 @@ function custom_notification_query($action, $type, $start, $end)
}
$query = 'SELECT count(distinct '.$field_id.') as CountId
'.$query;
list($count) = mysql_fetch_array(pwg_query($query));
list($count) = mysql_fetch_row(pwg_query($query));
return $count;
break;
@ -178,7 +178,7 @@ function custom_notification_query($action, $type, $start, $end)
$infos = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($infos, $row);
}

2
include/functions_plugins.inc.php
View file

@ -238,7 +238,7 @@ SELECT * FROM '.PLUGINS_TABLE;
$result = pwg_query($query);
$plugins = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($plugins, $row);
}

2
include/functions_search.inc.php
View file

@ -458,7 +458,7 @@ SELECT i.id,
$by_weights=array();
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{ // weight is important when sorting images by relevance
if ($row['weight'])
{

20
include/functions_user.inc.php
View file

@ -58,7 +58,7 @@ from '.USERS_TABLE.'
where upper('.$conf['user_fields']['email'].') = upper(\''.$mail_address.'\')
'.(is_numeric($user_id) ? 'and '.$conf['user_fields']['id'].' != \''.$user_id.'\'' : '').'
;';
list($count) = mysql_fetch_array(pwg_query($query));
list($count) = mysql_fetch_row(pwg_query($query));
if ($count != 0)
{
return l10n('reg_err_mail_address_dbl');
@ -110,7 +110,7 @@ function register_user($login, $password, $mail_address,
SELECT MAX('.$conf['user_fields']['id'].') + 1
FROM '.USERS_TABLE.'
;';
list($next_id) = mysql_fetch_array(pwg_query($query));
list($next_id) = mysql_fetch_row(pwg_query($query));
$insert =
array(
@ -134,7 +134,7 @@ SELECT id
$result = pwg_query($query);
$inserts = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push
(
@ -249,7 +249,7 @@ SELECT ';
FROM '.USERS_TABLE.'
WHERE '.$conf['user_fields']['id'].' = \''.$user_id.'\'';
$row = mysql_fetch_array(pwg_query($query));
$row = mysql_fetch_assoc(pwg_query($query));
while (true)
{
@ -269,7 +269,7 @@ SELECT ui.*, uc.*
}
}
$row = array_merge($row, mysql_fetch_array($result));
$row = array_merge($row, mysql_fetch_assoc($result));
foreach ($row as $key => $value)
{
@ -324,7 +324,7 @@ SELECT COUNT(DISTINCT(image_id)) as total
FROM '.IMAGE_CATEGORY_TABLE.'
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_array(pwg_query($query));
list($userdata['nb_total_images']) = mysql_fetch_row(pwg_query($query));
// now we update user cache categories
@ -428,7 +428,7 @@ SELECT DISTINCT f.image_id
;';
$result = pwg_query($query);
$authorizeds = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($authorizeds, $row['image_id']);
}
@ -440,7 +440,7 @@ SELECT image_id
;';
$result = pwg_query($query);
$favorites = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($favorites, $row['image_id']);
}
@ -481,7 +481,7 @@ SELECT id
WHERE status = \'private\'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($private_array, $row['id']);
}
@ -523,7 +523,7 @@ SELECT id
WHERE visible = \'false\'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($forbidden_array, $row['id']);
}

4
include/picture_comment.inc.php
View file

@ -93,7 +93,7 @@ if ($page['show_comments'])
SELECT COUNT(*) AS nb_comments
FROM '.COMMENTS_TABLE.'
WHERE image_id='.$page['image_id']." AND validated = 'true'";
$row = mysql_fetch_array( pwg_query( $query ) );
$row = mysql_fetch_assoc( pwg_query( $query ) );
// navigation bar creation
if (!isset($page['start']))
@ -140,7 +140,7 @@ $validated_clause.'
;';
$result = pwg_query( $query );
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (!empty($row['author']))
{

4
include/picture_rate.inc.php
View file

@ -37,7 +37,7 @@ SELECT COUNT(rate) AS count
FROM '.RATE_TABLE.'
WHERE element_id = '.$picture['current']['id'].'
;';
$row = mysql_fetch_array(pwg_query($query));
$row = mysql_fetch_assoc(pwg_query($query));
}
else
{ // avg rate null -> no rate -> no need to query db
@ -69,7 +69,7 @@ SELECT COUNT(rate) AS count
$result = pwg_query($query);
if (mysql_num_rows($result) > 0)
{
$row = mysql_fetch_array($result);
$row = mysql_fetch_assoc($result);
$user_rate = $row['rate'];
}
}

2
install/db/12-database.php
View file

@ -66,7 +66,7 @@ $result = pwg_query($query);
$datas = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$datas,

2
install/db/18-database.php
View file

@ -47,7 +47,7 @@ $result = pwg_query($query);
$datas = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$datas,

2
install/db/19-database.php
View file

@ -68,7 +68,7 @@ SELECT id, keywords
WHERE keywords IS NOT NULL
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
foreach(preg_split('/[,]+/', $row['keywords']) as $keyword)
{

2
install/db/20-database.php
View file

@ -47,7 +47,7 @@ SELECT category_id, image_id
$result = pwg_query($query);
$datas = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$datas,

4
install/db/65-database.php
View file

@ -165,7 +165,7 @@ SELECT language FROM '.USER_INFOS_TABLE.'
$all_tables = array();
$query = 'SHOW TABLES LIKE "'.$prefixeTable.'%"';
$result = pwg_query($query);
while ( $row=mysql_fetch_array($result) )
while ( $row=mysql_fetch_assoc($result) )
{
array_push($all_tables, $row[0]);
}
@ -176,7 +176,7 @@ SELECT language FROM '.USER_INFOS_TABLE.'
$query = 'SHOW FULL COLUMNS FROM '.$table;
$result = pwg_query($query);
$field_definitions=array();
while ( $row=mysql_fetch_array($result) )
while ( $row=mysql_fetch_assoc($result) )
{
if ( !isset($row['Collation']) or $row['Collation']=='NULL' )
continue;

2
install/db/8-database.php
View file

@ -60,7 +60,7 @@ $conf = $conf_save;
// +-Do I already have them in DB ?----------------------------------------+
$query = 'SELECT param FROM '.PREFIX_TABLE.'config';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
unset( $params[ $row['param'] ] );
}

2
install/db/9-database.php
View file

@ -47,7 +47,7 @@ $result = pwg_query($query);
$datas = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push(
$datas,

2
install/upgrade_1.3.0.php
View file

@ -84,7 +84,7 @@ SELECT id, id_uppercat
FROM '.CATEGORIES_TABLE.'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (!isset($row['id_uppercat']) or $row['id_uppercat'] == '')
{

8
install/upgrade_1.3.1.php
View file

@ -42,7 +42,7 @@ $query = '
SELECT prefix_thumbnail, mail_webmaster
FROM '.PREFIX_TABLE.'config
;';
$save = mysql_fetch_array(pwg_query($query));
$save = mysql_fetch_assoc(pwg_query($query));
$queries = array(
"
@ -344,7 +344,7 @@ SHOW INDEX
FROM '.PREFIX_TABLE.$table.'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if ($row['Key_name'] != 'PRIMARY')
{
@ -536,7 +536,7 @@ SELECT DISTINCT(storage_category_id) AS unique_storage_category_id
FROM '.IMAGES_TABLE.'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($cat_ids, $row['unique_storage_category_id']);
}
@ -561,7 +561,7 @@ SELECT id
WHERE status = \'private\'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($cat_ids, $row['id']);
}

4
install/upgrade_1.4.0.php
View file

@ -42,7 +42,7 @@ SELECT value
FROM '.CONFIG_TABLE.'
WHERE param = \'prefix_thumbnail\'
;';
list($prefix_thumbnail) = mysql_fetch_array(pwg_query($query));
list($prefix_thumbnail) = mysql_fetch_row(pwg_query($query));
// delete obsolete configuration
$query = '
@ -194,7 +194,7 @@ $datas = array();
list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$row['user_id'] = $row['id'];
$row['registration_date'] = $dbnow;

6
install/upgrade_1.5.0.php
View file

@ -79,7 +79,7 @@ SELECT id, keywords
WHERE keywords IS NOT NULL
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
foreach(preg_split('/[,]+/', $row['keywords']) as $keyword)
{
@ -351,7 +351,7 @@ $conf = $conf_save;
// Do I already have them in DB ?
$query = 'SELECT param FROM '.PREFIX_TABLE.'config';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
unset( $params[ $row['param'] ] );
}
@ -452,7 +452,7 @@ DESC '.PREFIX_TABLE.'users
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
if (!in_array($row['Field'], $to_keep))
{

2
password.php
View file

@ -79,7 +79,7 @@ WHERE '
$error_on_mail = false;
$datas = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
$new_password = generate_key(6);

6
picture.php
View file

@ -57,7 +57,7 @@ SELECT id, file, level
str_replace(array('_','%'), array('/_','/%'), $page['image_file'] ).
'.%" ESCAPE "/" LIMIT 1';
}
if ( ! ( $row = mysql_fetch_array(pwg_query($query)) ) )
if ( ! ( $row = mysql_fetch_assoc(pwg_query($query)) ) )
{// element does not exist
page_not_found( 'The requested image does not exist',
duplicate_index_url()
@ -387,7 +387,7 @@ SELECT category_id,uppercats,commentable,global_rank
;';
$result = pwg_query($query);
$related_categories = array();
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($related_categories, $row);
}
@ -767,7 +767,7 @@ SELECT COUNT(*) AS nb_fav
AND user_id = '.$user['id'].'
;';
$result = pwg_query($query);
$row = mysql_fetch_array($result);
$row = mysql_fetch_assoc($result);
if ($row['nb_fav'] == 0)
{

2
search_rules.php
View file

@ -135,7 +135,7 @@ SELECT id, uppercats, global_rank
$categories = array();
if (!empty($result))
{
while ($row = mysql_fetch_array($result))
while ($row = mysql_fetch_assoc($result))
{
array_push($categories, $row);
}

2
upload.php
View file

@ -288,7 +288,7 @@ if ( isset( $_POST['submit'] ) and isset( $_GET['waiting_id'] ) )
$query.= ' where id = '.$_GET['waiting_id'];
$query.= ';';
$result= pwg_query( $query );
$row = mysql_fetch_array( $result );
$row = mysql_fetch_assoc( $result );
$file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") );
$extension = get_extension( $_FILES['picture']['name'] );