aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/category_cats.inc.php14
-rw-r--r--include/dblayer/functions_mysql.inc.php70
-rw-r--r--include/dblayer/functions_mysqli.inc.php70
-rw-r--r--include/functions.inc.php131
-rw-r--r--include/functions_tag.inc.php12
-rw-r--r--include/section_init.inc.php26
6 files changed, 192 insertions, 131 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index bb048297f..839a86c8f 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -133,14 +133,13 @@ SELECT representative_picture_id
if ($conf['display_fromto'])
{
- $dates_of_category = array();
if (count($category_ids) > 0)
{
$query = '
SELECT
category_id,
- MIN(date_creation) AS date_creation_min,
- MAX(date_creation) AS date_creation_max
+ MIN(date_creation) AS `from`,
+ MAX(date_creation) AS `to`
FROM '.IMAGE_CATEGORY_TABLE.'
INNER JOIN '.IMAGES_TABLE.' ON image_id = id
WHERE category_id IN ('.implode(',', $category_ids).')
@@ -155,14 +154,7 @@ SELECT
).'
GROUP BY category_id
;';
- $result = pwg_query($query);
- while ($row = pwg_db_fetch_assoc($result))
- {
- $dates_of_category[ $row['category_id'] ] = array(
- 'from' => $row['date_creation_min'],
- 'to' => $row['date_creation_max'],
- );
- }
+ $dates_of_category = query2array($query, 'category_id');
}
}
diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php
index c90a5504d..a1853b223 100644
--- a/include/dblayer/functions_mysql.inc.php
+++ b/include/dblayer/functions_mysql.inc.php
@@ -760,4 +760,74 @@ function my_error($header, $die)
echo("</pre>");
}
+/**
+ * Builds an data array from a SQL query.
+ * Depending on $key_name and $value_name it can return :
+ *
+ * - an array of arrays of all fields (key=null, value=null)
+ * array(
+ * array('id'=>1, 'name'=>'DSC8956', ...),
+ * array('id'=>2, 'name'=>'DSC8957', ...),
+ * ...
+ * )
+ *
+ * - an array of a single field (key=null, value='...')
+ * array('DSC8956', 'DSC8957', ...)
+ *
+ * - an associative array of array of all fields (key='...', value=null)
+ * array(
+ * 'DSC8956' => array('id'=>1, 'name'=>'DSC8956', ...),
+ * 'DSC8957' => array('id'=>2, 'name'=>'DSC8957', ...),
+ * ...
+ * )
+ *
+ * - an associative array of a single field (key='...', value='...')
+ * array(
+ * 'DSC8956' => 1,
+ * 'DSC8957' => 2,
+ * ...
+ * )
+ *
+ * @since 2.6
+ *
+ * @param string $query
+ * @param string $key_name
+ * @param string $value_name
+ * @return array
+ */
+function query2array($query, $key_name=null, $value_name=null)
+{
+ $result = pwg_query($query);
+ $data = array();
+
+ if (isset($key_name))
+ {
+ if (isset($value_name))
+ {
+ while ($row = pwg_db_fetch_assoc($result))
+ $data[ $row[$key_name] ] = $row[$value_name];
+ }
+ else
+ {
+ while ($row = pwg_db_fetch_assoc($result))
+ $data[ $row[$key_name] ] = $row;
+ }
+ }
+ else
+ {
+ if (isset($value_name))
+ {
+ while ($row = pwg_db_fetch_assoc($result))
+ $data[] = $row[$value_name];
+ }
+ else
+ {
+ while ($row = pwg_db_fetch_assoc($result))
+ $data[] = $row;
+ }
+ }
+
+ return $data;
+}
+
?> \ No newline at end of file
diff --git a/include/dblayer/functions_mysqli.inc.php b/include/dblayer/functions_mysqli.inc.php
index 41ada251d..31bf9abf3 100644
--- a/include/dblayer/functions_mysqli.inc.php
+++ b/include/dblayer/functions_mysqli.inc.php
@@ -799,4 +799,74 @@ function my_error($header, $die)
echo("</pre>");
}
+/**
+ * Builds an data array from a SQL query.
+ * Depending on $key_name and $value_name it can return :
+ *
+ * - an array of arrays of all fields (key=null, value=null)
+ * array(
+ * array('id'=>1, 'name'=>'DSC8956', ...),
+ * array('id'=>2, 'name'=>'DSC8957', ...),
+ * ...
+ * )
+ *
+ * - an array of a single field (key=null, value='...')
+ * array('DSC8956', 'DSC8957', ...)
+ *
+ * - an associative array of array of all fields (key='...', value=null)
+ * array(
+ * 'DSC8956' => array('id'=>1, 'name'=>'DSC8956', ...),
+ * 'DSC8957' => array('id'=>2, 'name'=>'DSC8957', ...),
+ * ...
+ * )
+ *
+ * - an associative array of a single field (key='...', value='...')
+ * array(
+ * 'DSC8956' => 1,
+ * 'DSC8957' => 2,
+ * ...
+ * )
+ *
+ * @since 2.6
+ *
+ * @param string $query
+ * @param string $key_name
+ * @param string $value_name
+ * @return array
+ */
+function query2array($query, $key_name=null, $value_name=null)
+{
+ $result = pwg_query($query);
+ $data = array();
+
+ if (isset($key_name))
+ {
+ if (isset($value_name))
+ {
+ while ($row = $result->fetch_assoc())
+ $data[ $row[$key_name] ] = $row[$value_name];
+ }
+ else
+ {
+ while ($row = $result->fetch_assoc())
+ $data[ $row[$key_name] ] = $row;
+ }
+ }
+ else
+ {
+ if (isset($value_name))
+ {
+ while ($row = $result->fetch_assoc())
+ $data[] = $row[$value_name];
+ }
+ else
+ {
+ while ($row = $result->fetch_assoc())
+ $data[] = $row;
+ }
+ }
+
+ return $data;
+}
+
?> \ No newline at end of file
diff --git a/include/functions.inc.php b/include/functions.inc.php
index acb68ac58..d163a2725 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1,4 +1,4 @@
-<?php
+<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
@@ -481,16 +481,16 @@ function dateDiff($date1, $date2)
{
return $date1->diff($date2);
}
-
+
$diff = new stdClass();
-
+
//Make sure $date1 is ealier
$diff->invert = $date2 < $date1;
if ($diff->invert)
{
list($date1, $date2) = array($date2, $date1);
}
-
+
//Calculate R values
$R = ($date1 <= $date2 ? '+' : '-');
$r = ($date1 <= $date2 ? '' : '-');
@@ -524,14 +524,14 @@ function dateDiff($date1, $date2)
//Reset date and record increments
$date1->modify('-1 '.$period);
}
-
+
list($diff->y, $diff->m, $diff->d, $diff->h) = array_values($periods);
//Minutes, seconds
$diff->s = round(abs($date1->format('U') - $date2->format('U')));
$diff->i = floor($diff->s/60);
$diff->s = $diff->s - $diff->i*60;
-
+
return $diff;
}
@@ -569,12 +569,12 @@ function str2DateTime($original, $format=null)
$ymdhms[] = $tok;
$tok = strtok('- :/');
}
-
+
if (count($ymdhms)<3) return false;
if (!isset($ymdhms[3])) $ymdhms[3] = 0;
if (!isset($ymdhms[4])) $ymdhms[4] = 0;
if (!isset($ymdhms[5])) $ymdhms[5] = 0;
-
+
$date = new DateTime();
$date->setDate($ymdhms[0], $ymdhms[1], $ymdhms[2]);
$date->setTime($ymdhms[3], $ymdhms[4], $ymdhms[5]);
@@ -595,7 +595,7 @@ function str2DateTime($original, $format=null)
function format_date($original, $show_time=false, $show_day_name=true, $format=null)
{
global $lang;
-
+
$date = str2DateTime($original, $format);
if (!$date)
@@ -608,11 +608,11 @@ function format_date($original, $show_time=false, $show_day_name=true, $format=n
{
$print.= $lang['day'][ $date->format('w') ].' ';
}
-
+
$print.= $date->format('j');
$print.= ' '.$lang['month'][ $date->format('n') ];
$print.= ' '.$date->format('Y');
-
+
if ($show_time)
{
$temp = $date->format('H:i');
@@ -643,10 +643,10 @@ function time_since($original, $stop='minute', $format=null, $with_text=true, $w
{
return l10n('N/A');
}
-
+
$now = new DateTime();
$diff = dateDiff($now, $date);
-
+
$chunks = array(
'year' => $diff->y,
'month' => $diff->m,
@@ -656,16 +656,16 @@ function time_since($original, $stop='minute', $format=null, $with_text=true, $w
'minute' => $diff->i,
'second' => $diff->s,
);
-
+
// DateInterval does not contain the number of weeks
if ($with_week)
{
$chunks['week'] = (int)floor($chunks['day']/7);
$chunks['day'] = $chunks['day'] - $chunks['week']*7;
}
-
+
$j = array_search($stop, array_keys($chunks));
-
+
$print = ''; $i=0;
foreach ($chunks as $name => $value)
{
@@ -679,9 +679,9 @@ function time_since($original, $stop='minute', $format=null, $with_text=true, $w
}
$i++;
}
-
+
$print = trim($print);
-
+
if ($with_text)
{
if ($diff->invert)
@@ -933,7 +933,7 @@ SELECT element_id
FROM '.CADDIE_TABLE.'
WHERE user_id = '.$user['id'].'
;';
- $in_caddie = array_from_query($query, 'element_id');
+ $in_caddie = query2array($query, null, 'element_id');
$caddiables = array_diff($elements_id, $in_caddie);
@@ -1042,7 +1042,7 @@ function get_l10n_args($key, $args='')
/**
* returns a string formated with l10n elements.
* it is usefull to "prepare" a text and translate it later
- * @see get_l10n_args()
+ * @see get_l10n_args()
*
* @param array $key_args one l10n_args element or array of l10n_args elements
* @param string $sep used when translated elements are concatened
@@ -1152,7 +1152,7 @@ SELECT param, value
}
$conf[ $row['param'] ] = $val;
}
-
+
trigger_action('load_conf', $condition);
}
@@ -1165,13 +1165,11 @@ SELECT param, value
function conf_update_param($param, $value)
{
$query = '
-SELECT
- param,
- value
+SELECT param
FROM '.CONFIG_TABLE.'
WHERE param = \''.$param.'\'
;';
- $params = array_from_query($query, 'param');
+ $params = query2array($query, null, 'param');
if (count($params) == 0)
{
@@ -1203,7 +1201,7 @@ UPDATE '.CONFIG_TABLE.'
function conf_delete_param($params)
{
global $conf;
-
+
if (!is_array($params))
{
$params = array($params);
@@ -1212,13 +1210,13 @@ function conf_delete_param($params)
{
return;
}
-
+
$query = '
DELETE FROM '.CONFIG_TABLE.'
WHERE param IN(\''. implode('\',\'', $params) .'\')
;';
pwg_query($query);
-
+
foreach ($params as $param)
{
unset($conf[$param]);
@@ -1244,69 +1242,6 @@ function prepend_append_array_items($array, $prepend_str, $append_str)
}
/**
- * Builds an data array from a SQL query.
- * Depending on $key_name and $value_name it can return :
- *
- * - an array of arrays of all fields (key=null, value=null)
- * array(
- * array('id'=>1, 'name'=>'DSC8956', ...),
- * array('id'=>2, 'name'=>'DSC8957', ...),
- * ...
- * )
- *
- * - an array of a single field (key=null, value='...')
- * array('DSC8956', 'DSC8957', ...)
- *
- * - an associative array of array of all fields (key='...', value=null)
- * array(
- * 'DSC8956' => array('id'=>1, 'name'=>'DSC8956', ...),
- * 'DSC8957' => array('id'=>2, 'name'=>'DSC8957', ...),
- * ...
- * )
- *
- * - an associative array of a single field (key='...', value='...')
- * array(
- * 'DSC8956' => 1,
- * 'DSC8957' => 2,
- * ...
- * )
- *
- * @since 2.6
- *
- * @param string $query
- * @param string $key_name
- * @param string $value_name
- * @return array
- */
-function query2array($query, $key_name=null, $value_name=null)
-{
- $result = pwg_query($query);
- $data = array();
-
- while ($row = pwg_db_fetch_assoc($result))
- {
- if (isset($value_name))
- {
- $value = $row[ $value_name ];
- }
- else
- {
- $value = $row;
- }
- if (isset($key_name))
- {
- $data[ $row[$key_name] ] = $value;
- }
- else
- {
- $data[] = $value;
- }
- }
-
- return $data;
-}
-
-/**
* creates an simple hashmap based on a SQL query.
* choose one to be the key, another one to be the value.
* @deprecated 2.6
@@ -1368,7 +1303,7 @@ function array_from_query($query, $fieldname=false)
{
while ($row = pwg_db_fetch_assoc($result))
{
- $array[] = $row;
+ $array[] = $row;
}
}
else
@@ -1493,7 +1428,7 @@ function get_parent_language($lang_id=null)
function load_language($filename, $dirname = '', $options = array())
{
global $user, $language_files;
-
+
if ( !empty($dirname) and !empty($filename) )
{
if ( empty($language_files[$dirname]) or !in_array($filename,$language_files[$dirname]) )
@@ -1573,7 +1508,7 @@ function load_language($filename, $dirname = '', $options = array())
global $lang, $lang_info;
if ( !isset($lang) ) $lang=array();
if ( !isset($lang_info) ) $lang_info=array();
-
+
$parent_language = !empty($load_lang_info['parent']) ? $load_lang_info['parent'] : (
!empty($lang_info['parent']) ? $lang_info['parent'] : null );
if (!empty($parent_language) and $parent_language != $selected_language)
@@ -2065,7 +2000,7 @@ SELECT COUNT(DISTINCT(com.id))
AND ', $where);
list($user['nb_available_comments']) = pwg_db_fetch_row(pwg_query($query));
- single_update(USER_CACHE_TABLE,
+ single_update(USER_CACHE_TABLE,
array('nb_available_comments'=>$user['nb_available_comments']),
array('user_id'=>$user['id'])
);
@@ -2086,15 +2021,15 @@ SELECT COUNT(DISTINCT(com.id))
function safe_version_compare($a, $b, $op=null)
{
$replace_chars = create_function('$m', 'return ord(strtolower($m[1]));');
-
+
// add dot before groups of letters (version_compare does the same thing)
$a = preg_replace('#([0-9]+)([a-z]+)#i', '$1.$2', $a);
$b = preg_replace('#([0-9]+)([a-z]+)#i', '$1.$2', $b);
-
+
// apply ord() to any single letter
$a = preg_replace_callback('#\b([a-z]{1})\b#i', $replace_chars, $a);
$b = preg_replace_callback('#\b([a-z]{1})\b#i', $replace_chars, $b);
-
+
if (empty($op))
{
return version_compare($a, $b);
diff --git a/include/functions_tag.inc.php b/include/functions_tag.inc.php
index 6e047c502..8744cb5fb 100644
--- a/include/functions_tag.inc.php
+++ b/include/functions_tag.inc.php
@@ -70,7 +70,7 @@ SELECT tag_id, COUNT(DISTINCT(it.image_id)) AS counter
).'
GROUP BY tag_id
;';
- $tag_counters = simple_hash_from_query($query, 'tag_id', 'counter');
+ $tag_counters = query2array($query, 'tag_id', 'counter');
if ( empty($tag_counters) )
{
@@ -233,7 +233,7 @@ SELECT id
}
$query .= "\n".(empty($order_by) ? $conf['order_by'] : $order_by);
- return array_from_query($query, 'id');
+ return query2array($query, null, 'id');
}
/**
@@ -320,13 +320,7 @@ SELECT *
WHERE '. implode( '
OR ', $where_clauses);
- $result = pwg_query($query);
- $tags = array();
- while ($row = pwg_db_fetch_assoc($result))
- {
- $tags[] = $row;
- }
- return $tags;
+ return query2array($query);
}
?> \ No newline at end of file
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 61d8bf5e3..1e35ab587 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -92,7 +92,7 @@ if (script_basename() == 'picture')
{
// url compatibility with versions below 1.6
if ( isset($_GET['image_id'])
- and isset($_GET['cat'])
+ and isset($_GET['cat'])
and is_numeric($_GET['cat']) )
{
$url = make_picture_url( array(
@@ -102,7 +102,7 @@ if (script_basename() == 'picture')
) );
redirect($url);
}
-
+
$token = $tokens[$next_token];
$next_token++;
if ( is_numeric($token) )
@@ -242,7 +242,7 @@ if ('categories' == $page['section'])
if (isset($page['category']))
{
$page = array_merge(
- $page,
+ $page,
array(
'comment' => trigger_event(
'render_category_description',
@@ -292,8 +292,8 @@ SELECT id
),
"\n AND"
);
-
- $subcat_ids = array_from_query($query, 'id');
+
+ $subcat_ids = query2array($query,null, 'id');
$subcat_ids[] = $page['category']['id'];
$where_sql = 'category_id IN ('.implode(',',$subcat_ids).')';
// remove categories from forbidden because just checked above
@@ -325,7 +325,7 @@ SELECT DISTINCT(image_id)
'.$conf['order_by'].'
;';
- $page['items'] = array_from_query($query, 'image_id');
+ $page['items'] = query2array($query,null, 'image_id');
}
}
// special sections
@@ -416,7 +416,7 @@ SELECT image_id
$page = array_merge(
$page,
array(
- 'items' => array_from_query($query, 'image_id'),
+ 'items' => query2array($query,null, 'image_id'),
)
);
@@ -463,7 +463,7 @@ SELECT DISTINCT(id)
array(
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.l10n('Recent photos').'</a>',
- 'items' => array_from_query($query, 'id'),
+ 'items' => query2array($query,null, 'id'),
)
);
}
@@ -486,7 +486,7 @@ SELECT DISTINCT(id)
{
$page['super_order_by'] = true;
$conf['order_by'] = ' ORDER BY hit DESC, id DESC';
-
+
$query = '
SELECT DISTINCT(id)
FROM '.IMAGES_TABLE.'
@@ -502,7 +502,7 @@ SELECT DISTINCT(id)
array(
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$conf['top_number'].' '.l10n('Most visited').'</a>',
- 'items' => array_from_query($query, 'id'),
+ 'items' => query2array($query,null, 'id'),
)
);
}
@@ -528,7 +528,7 @@ SELECT DISTINCT(id)
array(
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$conf['top_number'].' '.l10n('Best rated').'</a>',
- 'items' => array_from_query($query, 'id'),
+ 'items' => query2array($query,null, 'id'),
)
);
}
@@ -551,7 +551,7 @@ SELECT DISTINCT(id)
array(
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.l10n('Random photos').'</a>',
- 'items' => array_from_query($query, 'id'),
+ 'items' => query2array($query,null, 'id'),
)
);
}
@@ -632,7 +632,7 @@ if ( 'categories'==$page['section'] and isset($page['category']) )
if ($need_redirect)
{
$redirect_url = script_basename()=='picture' ? duplicate_picture_url() : duplicate_index_url();
-
+
if (!headers_sent())
{ // this is a permanent redirection
set_status_header(301);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:34:05 +0000