-
- | lang[$lang . '_CONFIG'] ?> |
-
-
- | lang[$lang . '_URL'] ?> |
-  |
-
+?>
+ lang[$lang . '_WIDTH'] ?> |
+ lang[$lang . '_HEIGHT'] ?> |
+ lang['DISPLAY_ON_POSTING'] ?> |
+
+ lang[$lang . '_ORDER'] ?> |
+
+
+ lang['ADD'] ?> |
+
+
+ $img_row)
+ {
+ $row_class = (($row % 2) == 0) ? 'row1' : 'row2';
+?>
+
+  |
+ [] |
-
- | lang[$lang . '_CODE'] ?> |
- |
-
-
- | lang[$lang . '_EMOTION'] ?> |
- |
-
+ |
+ |
-
- | lang[$lang . '_WIDTH'] ?> |
- |
-
-
- | lang[$lang . '_HEIGHT'] ?> |
- |
-
-
- | lang['DISPLAY_ON_POSTING'] ?> |
- /> |
-
-
- | lang[$lang . '_ORDER'] ?> |
- |
-
-
- | "> |
+ |
+ /> |
+
+ |
+
+
+ |
+
+
+ |
@@ -283,100 +271,135 @@ function update_image_dimensions()
case 'create':
case 'modify':
- $image_id = intval($_POST['id']);
- $img = stripslashes($_POST['img']);
- $image_order = intval($_POST['order']);
- $image_width = intval($_POST['width']);
- $image_height = intval($_POST['height']);
+ // Get items to create/modify
+ $images = (isset($_POST['image'])) ? array_keys($_POST['image']) : array();
+
+ // Now really get the items
+ $image_id = (isset($_POST['id'])) ? array_map('intval', $_POST['id']) : array();
+ $image_order = (isset($_POST['order'])) ? array_map('intval', $_POST['order']) : array();
+ $image_width = (isset($_POST['width'])) ? array_map('intval', $_POST['width']) : array();
+ $image_height = (isset($_POST['height'])) ? array_map('intval', $_POST['height']) : array();
+ $image_add = (isset($_POST['add_img'])) ? array_map('intval', $_POST['add_img']) : array();
+ $image_emotion = request_var('emotion', '');
+ $image_code = request_var('code', '');
+ $image_display_on_posting = (isset($_POST['display_on_posting'])) ? array_map('intval', $_POST['display_on_posting']) : array();
- if ($image_width == 0 || $image_height == 0)
+ foreach ($images as $image)
{
- $img_size = @getimagesize($phpbb_root_path . $img_path . '/' . $img);
- $smile_width = $img_size[0];
- $smile_height = $img_size[1];
- }
-
- $img_sql = array(
- $fields . '_url' => $img,
- $fields . '_width' => $image_width,
- $fields . '_height' => $image_height,
- $fields . '_order' => $image_order,
- 'display_on_posting'=> (!empty($_POST['display_on_posting'])) ? 1 : 0
- );
- if ($mode == 'emoticons')
- {
- $img_sql = array_merge($img_sql, array(
- 'emoticon' => stripslashes($_POST['emotion']),
- 'code' => htmlspecialchars(stripslashes($_POST['code']))
- ));
- }
-
- if ($action == 'modify')
- {
- $result = $db->sql_query('SELECT ' . $fields . '_order
- FROM ' . $table . '
- WHERE ' . $fields . "_id = $image_id");
- $order_old = $db->sql_fetchfield($fields . '_order', 0, $result);
-
- if ($order_old == $image_order)
+ if (($mode == 'emoticons' && ($image_emotion[$image] == '' || $image_code[$image] == '')) ||
+ ($action == 'create' && !isset($image_add[$image])))
{
- $no_update = TRUE;
- }
-
- if ($order_old > $image_order)
- {
- $sign = '+';
- $where = $fields . "_order >= $image_order AND " . $fields . "_order < $order_old";
}
else
{
- $sign = '-';
- $where = $fields . "_order > $order_old AND " . $fields . "_order < $image_order";
- $sql[$fields . '_order'] = $image_order - 1;
+ if ($image_width[$image] == 0 || $image_height[$image] == 0)
+ {
+ $img_size = @getimagesize($phpbb_root_path . $img_path . '/' . $image);
+ $image_width[$image] = $img_size[0];
+ $image_height[$image] = $img_size[1];
+ }
+
+ $img_sql = array(
+ $fields . '_url' => $image,
+ $fields . '_width' => $image_width[$image],
+ $fields . '_height' => $image_height[$image],
+ 'display_on_posting'=> (isset($image_display_on_posting[$image])) ? 1 : 0,
+ );
+
+ if ($mode == 'emoticons')
+ {
+ $img_sql = array_merge($img_sql, array(
+ 'emoticon' => $image_emotion[$image],
+ 'code' => $image_code[$image])
+ );
+ }
+
+ if (!empty($image_order[$image]))
+ {
+ $img_sql = array_merge($img_sql, array(
+ $fields . '_order' => $image_order[$image] . '.5')
+ );
+ }
+
+ if ($action == 'modify')
+ {
+ $sql = "UPDATE $table
+ SET " . $db->sql_build_array('UPDATE', $img_sql) . "
+ WHERE {$fields}_id = " . $image_id[$image];
+ $db->sql_query($sql);
+ }
+ else
+ {
+ $sql = "INSERT INTO $table " . $db->sql_build_array('INSERT', $img_sql);
+ $db->sql_query($sql);
+ }
+
+ $update = FALSE;
+
+ if ($action == 'modify' && !empty($image_order[$image]))
+ {
+ $update = TRUE;
+
+ $result = $db->sql_query("SELECT {$fields}_order
+ FROM $table
+ WHERE {$fields}_id = " . $image_id[$image]);
+ $order_old = $db->sql_fetchfield($fields . '_order', 0, $result);
+
+ if ($order_old == $image_order[$image])
+ {
+ $update = FALSE;
+ }
+
+ if ($order_old > $image_order[$image])
+ {
+ $sign = '+';
+ $where = $fields . '_order >= ' . $image_order[$image] . " AND {$fields}_order < $order_old";
+ }
+ else if ($order_old < $image_order[$image])
+ {
+ $sign = '-';
+ $where = "{$fields}_order > $order_old AND {$fields}_order < " . $image_order[$image];
+ $sql[$fields . '_order'] = $image_order[$image] - 1;
+ }
+ }
+
+ if ($update)
+ {
+ $sql = "UPDATE $table
+ SET {$fields}_order = {$fields}_order $sign 1
+ WHERE $where";
+ $db->sql_query($sql);
+ }
+
}
}
- else
- {
- $sign = '+';
- $where = $fields . "_order > $image_order";
- }
-
- if (empty($no_update))
- {
- $sql = 'UPDATE ' . $table . '
- SET ' . $fields . '_order = ' . $fields . "_order $sign 1
- WHERE $where";
- $db->sql_query($sql);
- }
+
+ $cache->destroy('icons');
if ($action == 'modify')
{
- $db->sql_query('UPDATE ' . $table . '
- SET ' . $db->sql_build_array('UPDATE', $img_sql) . "
- WHERE " . $fields . "_id = $image_id");
- $cache->destroy('icons');
-
trigger_error($user->lang[$lang . '_EDITED']);
}
else
{
- $db->sql_query('INSERT INTO ' . $table . ' ' . $db->sql_build_array('INSERT', $img_sql));
- $cache->destroy('icons');
-
trigger_error($user->lang[$lang . '_ADDED']);
}
+
break;
case 'import':
- if (!empty($_POST['pak']))
+ $pak = request_var('pak', '');
+ $current = request_var('current', '');
+
+ if ($pak != '')
{
$order = 0;
// The user has already selected a smilies_pak file
- if ($_POST['current'] == 'delete')
+ if ($current == 'delete')
{
- $db->sql_query('TRUNCATE ' . $table);
+ $db->sql_query("TRUNCATE $table");
switch ($mode)
{
@@ -397,23 +420,19 @@ function update_image_dimensions()
$cur_img = array();
$field_sql = ($mode == 'emoticons') ? 'code' : 'icons_url';
- $result = $db->sql_query('SELECT ' . $field_sql . '
- FROM ' . $table);
- if ($row = $db->sql_fetchrow($result))
+ $result = $db->sql_query("SELECT $field_sql FROM $table");
+
+ while ($row = $db->sql_fetchrow($result))
{
- do
- {
- ++$order;
- $cur_img[$row[$field_sql]] = 1;
- }
- while ($row = $db->sql_fetchrow($result));
+ ++$order;
+ $cur_img[$row[$field_sql]] = 1;
}
$db->sql_freeresult($result);
}
- if (!($pak_ary = @file($phpbb_root_path . $img_path . '/'. stripslashes($_POST['pak']))))
+ if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak)))
{
- trigger_error('Could not read smiley pak file', E_USER_ERROR);
+ trigger_error('Could not read pak file', E_USER_ERROR);
}
foreach ($pak_ary as $pak_entry)
@@ -421,7 +440,7 @@ function update_image_dimensions()
$data = array();
if (preg_match_all("#'(.*?)', #", $pak_entry, $data))
{
- if ((sizeof($data[1]) == 5 && $mode == 'icons') ||
+ if ((sizeof($data[1]) != 3 && $mode == 'icons') ||
(sizeof($data[1]) != 5 && $mode == 'emoticons'))
{
trigger_error($user->lang['WRONG_PAK_TYPE']);
@@ -436,15 +455,15 @@ function update_image_dimensions()
$code = htmlentities(stripslashes($data[1][4]));
}
- if ($_POST['current'] == 'replace' &&
+ if ($current == 'replace' &&
(($mode == 'emoticons' && !empty($cur_img[$code])) ||
($mode == 'icons' && !empty($cur_img[$img]))))
{
$replace_sql = ($mode == 'emoticons') ? $code : $img;
$sql = array(
$fields . '_url' => $img,
- $fields . '_height' => intval($height),
- $fields . '_width' => intval($width),
+ $fields . '_height' => (int) $height,
+ $fields . '_width' => (int) $width,
);
if ($mode == 'emoticons')
{
@@ -462,10 +481,11 @@ function update_image_dimensions()
$sql = array(
$fields . '_url' => $img,
- $fields . '_height' => intval($height),
- $fields . '_width' => intval($width),
- $fields . '_order' => intval($order),
+ $fields . '_height' => (int) $height,
+ $fields . '_width' => (int) $width,
+ $fields . '_order' => (int) $order,
);
+
if ($mode == 'emoticons')
{
$sql = array_merge($sql, array(
@@ -480,22 +500,15 @@ function update_image_dimensions()
}
$cache->destroy('icons');
-
trigger_error($user->lang[$lang . '_IMPORT_SUCCESS']);
}
else
{
- $paklist = filelist($phpbb_root_path . $img_path, '', 'pak');
-
$pak_options = '';
- if (count($paklist))
- {
- foreach ($paklist as $pak)
- {
- $pak = substr($pak['path'], 1) . (($pak['path'] != '') ? '/' : '') . $pak['file'];
- $pak_options .= '';
- }
+ foreach ($_paks as $pak)
+ {
+ $pak_options .= '';
}
adm_page_header($user->lang[$lang]);
@@ -505,19 +518,20 @@ function update_image_dimensions()
lang[$lang .'_EXPLAIN'] ?>
-