diff options
| author | mistic100 <mistic@piwigo.org> | 2011-06-19 17:00:33 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2011-06-19 17:00:33 +0000 |
| commit | 0f3c1ea03f795bbdec23faf831e425f597ba0023 (patch) | |
| tree | 1c97c5cdf02976645611ecb44a7a391b387c5c8f /admin/configuration.php | |
| parent | b2133084d857bc3afbf830bfa65d4a807f7e6270 (diff) | |
feature:2317 move order config to Admin->Config->Options
change regex test, now compatible with strings like "file COLLATE 'utf8_general_ci' ASC"
git-svn-id: http://piwigo.org/svn/trunk@11433 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/configuration.php')
| -rw-r--r-- | admin/configuration.php | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/admin/configuration.php b/admin/configuration.php index 5a5f97eee..76a4123a2 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -103,8 +103,10 @@ $display_info_checkboxes = array( ); $order_options = array( - ' ORDER BY date_available DESC, file ASC, id ASC' => 'date_available DESC, file ASC, id ASC', - ' ORDER BY file DESC, date_available DESC' => 'file DESC, date_available DESC', + ' ORDER BY date_available DESC, file ASC, id ASC' => 'Post date DESC, File name ASC', + ' ORDER BY date_available ASC, file ASC, id ASC' => 'Post date ASC, File name ASC', + ' ORDER BY file DESC, date_available DESC, id ASC' => 'File name DESC, Post date DESC', + ' ORDER BY file ASC, date_available DESC, id ASC' => 'File name ASC, Post date DESC', 'custom' => l10n('Custom'), ); @@ -117,19 +119,20 @@ if (isset($_POST['submit'])) { case 'main' : { - $order_regex = '#^(( *)(id|file|name|date_available|date_creation|hit|average_rate|comment|author|filesize|width|height|high_filesize|high_width|high_height) (ASC|DESC),{1}){1,}$#'; + $order_regex = '#^(([ \w\']{2,}) (ASC|DESC),{1}){1,}$#'; // process 'order_by_perso' string if ($_POST['order_by'] == 'custom' AND !empty($_POST['order_by_perso'])) { + $_POST['order_by_perso'] = stripslashes(trim($_POST['order_by_perso'])); $_POST['order_by'] = str_ireplace( - array('order by ', 'asc', 'desc'), - array(null, 'ASC', 'DESC'), - trim($_POST['order_by_perso']) + array('order by ', 'asc', 'desc', '"'), + array(null, 'ASC', 'DESC', '\''), + $_POST['order_by_perso'] ); if (preg_match($order_regex, $_POST['order_by'].',')) { - $_POST['order_by'] = ' ORDER BY '.$_POST['order_by']; + $_POST['order_by'] = ' ORDER BY '.addslashes($_POST['order_by']); } else { @@ -147,15 +150,16 @@ if (isset($_POST['submit'])) } else if ($_POST['order_by_inside_category'] == 'custom' AND !empty($_POST['order_by_inside_category_perso'])) { + $_POST['order_by_inside_category_perso'] = stripslashes(trim($_POST['order_by_inside_category_perso'])); $_POST['order_by_inside_category'] = str_ireplace( - array('order by ', 'asc', 'desc'), - array(null, 'ASC', 'DESC'), - trim($_POST['order_by_inside_category_perso']) + array('order by ', 'asc', 'desc', '"'), + array(null, 'ASC', 'DESC', '\''), + $_POST['order_by_inside_category_perso'] ); if (preg_match($order_regex, $_POST['order_by_inside_category'].',')) { - $_POST['order_by_inside_category'] = ' ORDER BY '.$_POST['order_by_inside_category']; + $_POST['order_by_inside_category'] = ' ORDER BY '.addslashes($_POST['order_by_inside_category']); } else { |