diff --git a/core/acp/albums_module.php b/core/acp/albums_module.php index 9e50b9749..b1650161a 100644 --- a/core/acp/albums_module.php +++ b/core/acp/albums_module.php @@ -121,7 +121,7 @@ function main($id, $mode) 'type_action' => $request->variable('type_action', ''), 'album_status' => $request->variable('album_status', (int) \phpbbgallery\core\block::ALBUM_OPEN), 'album_parents' => '', - 'album_name' => utf8_normalize_nfc($request->variable('album_name', '', true)), + 'album_name' => utf8_encode_ucr(utf8_normalize_nfc($request->variable('album_name', '', true))), 'album_desc' => utf8_normalize_nfc($request->variable('album_desc', '', true)), 'album_desc_uid' => '', 'album_desc_options' => 7, @@ -374,7 +374,7 @@ function main($id, $mode) 'parent_id' => $this->parent_id, 'album_type' => (int) \phpbbgallery\core\block::TYPE_UPLOAD, 'album_status' => (int) \phpbbgallery\core\block::ALBUM_OPEN, - 'album_name' => utf8_normalize_nfc($request->variable('album_name', '', true)), + 'album_name' => utf8_encode_ucr(utf8_normalize_nfc($request->variable('album_name', '', true))), 'album_desc' => '', 'album_image' => '', 'album_watermark' => true, diff --git a/core/acp/config_module.php b/core/acp/config_module.php index 3a2b8d5b3..3c67f3c91 100644 --- a/core/acp/config_module.php +++ b/core/acp/config_module.php @@ -14,6 +14,13 @@ class config_module { + /** @var \phpbb\language\language */ + public $language; + public $new_config; + public $tpl_name; + public $page_title; + public $u_action; + /** * This function is called, when the main() function is called. * You can use this function to add your language files, check for a valid mode, unset config options and more. @@ -37,7 +44,7 @@ public function main($id, $mode) $this->language = $phpbb_container->get('language'); $this->language->add_lang(array('gallery', 'gallery_acp'), 'phpbbgallery/core'); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = $request->is_set_post('submit'); $form_key = 'acp_time'; add_form_key($form_key); @@ -52,7 +59,7 @@ public function main($id, $mode) // Init gallery configs class $phpbb_gallery_configs = new \phpbbgallery\core\config($config); $this->new_config = $phpbb_gallery_configs->get_all(); - $cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc($request->variable('config', array('' => ''), true)) : $this->new_config; + $cfg_array = $request->is_set_post('config') ? utf8_normalize_nfc($request->variable('config', array('' => ''), true)) : $this->new_config; $error = array(); // We validate the complete config if whished diff --git a/core/acp/gallery_logs_module.php b/core/acp/gallery_logs_module.php index 49fa79ca0..47105c9c5 100644 --- a/core/acp/gallery_logs_module.php +++ b/core/acp/gallery_logs_module.php @@ -18,6 +18,10 @@ class gallery_logs_module { var $u_action; + /** @var \phpbb\language\language */ + var $language; + var $tpl_name; + var $page_title; function main($id, $mode) { diff --git a/core/acp/main_module.php b/core/acp/main_module.php index b237648ba..008c03d95 100644 --- a/core/acp/main_module.php +++ b/core/acp/main_module.php @@ -18,6 +18,10 @@ class main_module { var $u_action; + /** @var \phpbb\language\language */ + var $language; + var $tpl_name; + var $page_title; function main($id, $mode) { @@ -235,6 +239,10 @@ function overview() { trigger_error($this->language->lang('NO_AUTH_OPERATION') . adm_back_link($this->u_action), E_USER_WARNING); } + if (!check_form_key('acp_gallery')) + { + trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + } $username = $request->variable('username', '', true); $user_id = 0; @@ -437,7 +445,7 @@ function overview() if (!empty($image_ids)) { - phpbb_gallery_image_rating::delete_ratings($image_ids, true); + $phpbb_container->get('phpbbgallery.core.rating')->delete_ratings($image_ids, true); } trigger_error($this->language->lang('RESET_RATING_COMPLETED') . adm_back_link($this->u_action)); @@ -562,6 +570,11 @@ function overview() $dir_sizes = $db->sql_fetchrow($result); $db->sql_freeresult($result); + $gallery_version = $phpbb_container + ->get('ext.manager') + ->create_extension_metadata_manager('phpbbgallery/core') + ->get_metadata('version'); + $template->assign_vars(array( 'S_GALLERY_OVERVIEW' => true, 'ACP_GALLERY_TITLE' => $this->language->lang('ACP_GALLERY_OVERVIEW'), @@ -574,7 +587,7 @@ function overview() 'GUPLOAD_DIR_SIZE' => get_formatted_filesize($dir_sizes['stat']), 'MEDIUM_DIR_SIZE' => get_formatted_filesize($dir_sizes['stat_medium']), 'CACHE_DIR_SIZE' => get_formatted_filesize($dir_sizes['stat_cache']), - 'GALLERY_VERSION' => $config['phpbb_gallery_version'], + 'GALLERY_VERSION' => $gallery_version, 'U_FIND_USERNAME' => $gallery_url->append_sid('phpbb', 'memberlist', 'mode=searchuser&form=action_create_pega_form&field=username&select_single=true'), 'S_SELECT_ALBUM' => $phpbb_ext_gallery_core_album->get_albumbox(false, 'reset_album_id', false, false, false, (int) \phpbbgallery\core\block::PUBLIC_ALBUM, (int) \phpbbgallery\core\block::TYPE_UPLOAD), diff --git a/core/acp/permissions_module.php b/core/acp/permissions_module.php index dd42e27bd..926d619eb 100644 --- a/core/acp/permissions_module.php +++ b/core/acp/permissions_module.php @@ -49,7 +49,7 @@ public function main($id, $mode) $this->tpl_name = 'gallery_permissions'; $this->page_title = $this->language->lang('ALBUM_AUTH_TITLE'); add_form_key('acp_gallery'); - $submit = (isset($_POST['submit_edit_options'])) ? true : ((isset($_POST['submit_add_options'])) ? true : false); + $submit = $request->is_set_post('submit_edit_options') || $request->is_set_post('submit_add_options'); $action = $request->variable('action', ''); /** @@ -164,8 +164,8 @@ private function permissions_v_mask() $this->language->add_lang('acp/permissions'); - $submit = (isset($_POST['submit'])) ? true : false; - $delete = (isset($_POST['delete'])) ? true : false; + $submit = $request->is_set_post('submit'); + $delete = $request->is_set_post('delete'); $album_id = $request->variable('album_id', array(0)); $group_id = $request->variable('group_id', array(0)); $user_id = $request->variable('user_id', array(0)); @@ -179,6 +179,11 @@ private function permissions_v_mask() // Delete permissions if ($delete) { + if (!check_form_key('acp_gallery')) + { + trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + } + // Delete group permissions if (!empty($group_id)) { @@ -679,7 +684,7 @@ private function permissions_set() $phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth'); // Send constants to the template - $submit = (isset($_POST['submit'])) ? true : false; + $submit = $request->is_set_post('submit'); $album_id = $request->variable('album_id', array(0)); $group_id = $request->variable('group_id', array(0)); $user_id = $request->variable('user_id', array(0)); @@ -1018,7 +1023,7 @@ private function copy_album_permissions() $phpbb_ext_gallery_core_album = $phpbb_container->get('phpbbgallery.core.album'); $this->language = $phpbb_container->get('language'); - $submit = isset($_POST['submit']) ? true : false; + $submit = $request->is_set_post('submit'); if ($submit) { diff --git a/core/adm/style/gallery_main.html b/core/adm/style/gallery_main.html index 98324db40..054497106 100644 --- a/core/adm/style/gallery_main.html +++ b/core/adm/style/gallery_main.html @@ -155,7 +155,7 @@

{ACP_GALLERY_TITLE}

-
+ {S_FORM_TOKEN}
[ {L_FIND_USERNAME} ]
diff --git a/core/album/display.php b/core/album/display.php index d5e4ac9d9..1d781258a 100644 --- a/core/album/display.php +++ b/core/album/display.php @@ -205,7 +205,8 @@ public function get_parents($album_data) if ($album_data['parent_id'] > 0) { - if ($album_data['album_parents'] == '') + $cached_parents = json_decode($album_data['album_parents'], true); + if (!is_array($cached_parents)) { $sql = 'SELECT album_id, album_name, album_type FROM ' . $this->table_albums . ' @@ -222,7 +223,7 @@ public function get_parents($album_data) } $this->db->sql_freeresult($result); - $album_data['album_parents'] = serialize($album_parents); + $album_data['album_parents'] = json_encode($album_parents, JSON_UNESCAPED_UNICODE); $sql = 'UPDATE ' . $this->table_albums . " SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "' @@ -231,7 +232,7 @@ public function get_parents($album_data) } else { - $album_parents = @unserialize($album_data['album_parents']); + $album_parents = $cached_parents; } } @@ -390,7 +391,7 @@ public function display_albums($root_data = '', $display_moderators = true, $ret ), ), - 'WHERE' => 'a.parent_id = 0 AND ' . $sql_where, + 'WHERE' => implode(' AND ', array('a.parent_id = 0', $sql_where)), ); $sql = $this->db->sql_build_query('SELECT', $sql_array); $result = $this->db->sql_query($sql); diff --git a/core/auth/auth.php b/core/auth/auth.php index 950b5e6dd..00bb81513 100644 --- a/core/auth/auth.php +++ b/core/auth/auth.php @@ -376,7 +376,7 @@ protected function restrict_pegas($user_id) $zebra = null; - $albums = array();//@todo $this->cache->obtain_album_list(); + $albums = $this->cache->get_albums(); foreach ($albums as $album) { if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id)) diff --git a/core/block.bkp b/core/block.bkp deleted file mode 100644 index a58f4cd26..000000000 --- a/core/block.bkp +++ /dev/null @@ -1,660 +0,0 @@ -set_mode(($mode) ? $mode : (self::MODE_RECENT + self::MODE_RANDOM + self::MODE_COMMENT)); - $this->set_display(($display_options) ? $display_options : (self::DISPLAY_ALBUMNAME + self::DISPLAY_IMAGENAME + self::DISPLAY_IMAGETIME + self::DISPLAY_IMAGEVIEWS + self::DISPLAY_USERNAME + self::DISPLAY_IP)); - $this->set_num(($nums) ? $nums : array(1, 4, 5, 0)); - $this->set_toggle((is_bool($toggle_comments)) ? $toggle_comments : false); - $this->set_pegas((is_bool($display_pegas)) ? $display_pegas : true); - - /*if (!phpbb_gallery::$loaded) - { - phpbb_gallery::init(); - } */ - /* - global $user; - $user->add_lang_ext('phpbbgallery/core', array('gallery_acp', 'gallery')); - - if (!function_exists('generate_text_for_display')) - { - phpbb_gallery_url::_include('message_parser', 'phpbb'); - } - } - */ - /** - * block constructor. - * @param \phpbb\user $user - * @param \phpbb\db\driver\driver_interface $db - * @param auth\auth $gallery_auth - * @param config $gallery_config - * @param image\image $gallery_image - * @param $images_table - * @param $albums_table - * @param $contests_table - */ - public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\controller\helper $controller_helper, - \phpbbgallery\core\auth\auth $gallery_auth, \phpbbgallery\core\config $gallery_config, \phpbbgallery\core\image\image $gallery_image, - $images_table, $albums_table, $contests_table) - { - // phpBB core - $this->user = $user; - $this->db = $db; - $this->template = $template; - $this->controller_helper = $controller_helper; - // phpBB Gallery Core - $this->gallery_auth = $gallery_auth; - $this->gallery_config = $gallery_config; - $this->gallery_image = $gallery_image; - // Variables (tables and shit) - $this->images_table = $images_table; - $this->albums_table = $albums_table; - $this->contests_table = $contests_table; - } - - /** - * The name of the outer template loop for the imageblock and comments - * You need to call this on your second code block, - * when you want to view the module two times with different settings on the same page. - * @param $image_block - * @param string $comment_block - */ - public function set_template_block_name($image_block, $comment_block = 'commentrow') - { - $this->template_block_images = $image_block; - $this->template_block_comments = $comment_block; - } - - /** - * @param array $modes Array of strings: 'none', 'recent', 'random', 'comment' - */ - public function set_modes($modes = array()) - { - // Reset the mode - $this->mode = self::MODE_NONE; - - $allowed_modes = array('recent', 'random', 'comment'); - foreach ($allowed_modes as $mode) - { - if (in_array($mode, $modes) && !($this->mode & constant("self::MODE_" . strtoupper($mode)))) - { - $this->mode += constant("self::MODE_" . strtoupper($mode)); - } - } - } - - /** - * @param int $new_mode Integer between 0 and 7 (including bounds) - */ - public function set_mode($new_mode = self::MODE_NONE) - { - if (is_int($new_mode) && ($new_mode >= 0) && ($new_mode <= 7)) - { - $this->mode = $new_mode; - } - } - - public function get_mode() - { - return $this->mode; - } - - /** - * @param array $options Array of strings: - * 'none', 'albumname', 'comments', 'imagename', 'imagetime', 'imageviews', 'username', 'ratings', 'ip' - */ - public function set_display_options($options = array()) - { - // Reset the mode - $this->display = self::DISPLAY_NONE; - - $allowed_options = array('albumname', 'comments', 'imagename', 'imagetime', 'imageviews', 'username', 'ratings', 'ip'); - foreach ($allowed_options as $option) - { - if (in_array($option, $options) && !($this->display & constant("self::DISPLAY_" . strtoupper($option)))) - { - $this->display += constant("self::DISPLAY_" . strtoupper($option)); - } - } - } - - /** - * @param int $new_display - * @internal param int $new_mode Integer between 0 and 255 (including bounds) - */ - public function set_display($new_display = self::DISPLAY_NONE) - { - if (is_int($new_display) && ($new_display >= 0) && ($new_display <= 255)) - { - $this->display = $new_display; - } - } - - public function get_display() - { - return $this->display; - } - - public function set_nums($nums = array()) - { - $allowed_nums = array('rows', 'columns', 'comments', 'contests'); - foreach ($allowed_nums as $num) - { - if (isset($nums[$num]) && is_int($nums[$num])) - { - $variable_name = 'num_' . $num; - $this->$variable_name = $nums[$num]; - } - } - - $this->num_sql_limit = $this->num_rows * $this->num_columns; - } - - /** - * @param array $nums Array of int for: - * # of rows, # of columns, # of comments, # of contests - */ - public function set_num($nums) - { - if (sizeof($nums) == 4) - { - $this->num_rows = (int) $nums[0]; - $this->num_columns = (int) $nums[1]; - $this->num_comments = (int) $nums[2]; - $this->num_contests = (int) $nums[3]; - $this->num_sql_limit = $this->num_rows * $this->num_columns; - } - } - - /** - * Option to toggle or display the comments by default. - */ - - public function set_toggle($new_toggle) - { - if (is_bool($new_toggle) || ($new_toggle == 0) || ($new_toggle == 1)) - { - $this->toggle_comments = (bool) $new_toggle; - } - } - - /** - * Array of albums the images and comments are pulled from. - * Empty array means all albums. - */ - - public function add_albums($album_id) - { - if (is_array($album_id)) - { - $this->albums = array_unique(array_merge($this->albums, array_map('intval', $album_id))); - } - else if (is_int($album_id) && !in_array($album_id, $this->albums)) - { - $this->albums[] = $album_id; - } - } - public function set_pegas($new_pegas) - { - if (is_bool($new_pegas) || ($new_pegas == 0) || ($new_pegas == 1)) - { - $this->include_pegas = (bool) $new_pegas; - } - } - - public function clear_albums() - { - $this->albums = array(); - } - - public function get_albums() - { - return $this->albums; - } - public function get_pegas() - { - return $this->include_pegas; - } - - /** - * Array of users the images and comments are pulled from. - * Empty array means all users. - */ - - public function add_users($user_id) - { - if (is_array($user_id)) - { - $this->users = array_unique(array_merge($this->users, array_map('intval', $user_id))); - } - else if (is_int($user_id) && !in_array($user_id, $this->users)) - { - $this->users[] = $user_id; - } - } - - public function clear_users() - { - $this->users = array(); - } - - public function get_users() - { - return $this->users; - } - - /** - * Wrapper-function for the total display - */ - public function display() - { - $this->get_album_permissions(); - $this->get_image_ids(); - $this->get_image_data(); - $this->display_images(); - $this->display_comments(); - } - - private function get_album_permissions() - { - $albums_is_empty = !empty($this->albums); - - $this->auth_moderate = $this->gallery_auth->acl_album_ids('m_status', 'array', !$albums_is_empty, $this->get_pegas()); - if ($albums_is_empty) - { - $this->auth_moderate = array_intersect($this->auth_moderate, $this->albums); - } - $this->auth_view = array_diff($this->gallery_auth->acl_album_ids('i_view', 'array', !$albums_is_empty, $this->get_pegas()), $this->auth_moderate); - if ($albums_is_empty) - { - $this->auth_view = array_intersect($this->auth_view, $this->albums); - } - if ($this->gallery_config->get('allow_comments') && ($this->mode & self::MODE_COMMENT) && $this->num_comments) - { - $this->auth_comments = $this->gallery_auth->acl_album_ids('c_read', 'array', !$albums_is_empty, $this->get_pegas()); - if ($albums_is_empty) - { - $this->auth_comments = array_intersect($this->auth_comments, $this->albums); - } - } - - $this->sql_where_auth = '('; - $this->sql_where_auth .= ((!empty($this->auth_view)) ? '(' . $this->db->sql_in_set('image_album_id', $this->auth_view) . ' AND image_status <> ' . $this->gallery_image->get_image_status_unapproved() . ((!empty($this->users)) ? ' AND image_contest = ' . $this->gallery_image->get_no_contest() : '') . ')' : ''); - $this->sql_where_auth .= ((!empty($this->auth_moderate)) ? ((!empty($this->auth_view)) ? ' OR ' : '') . '(' . $this->db->sql_in_set('image_album_id', $this->auth_moderate, false, true) . ')' : ''); - - if ($this->sql_where_auth == '(') - { - // User does not have permissions for any album, so we just return with 1=0 so there is no result: - $this->sql_where_auth = '0 = 1'; - return; - } - $this->sql_where_auth .= (!empty($this->users)) ? ') AND ' . $this->db->sql_in_set('image_user_id', $this->users) : ')'; - } - - /** - * - */ - private function get_image_ids() - { - $this->images = $this->recent_images = $this->random_images = $this->contest_images = array(); - // First step: grab all the IDs we are going to display ... - if ($this->mode & self::MODE_RECENT) - { - $sql = 'SELECT image_id - FROM ' . $this->images_table . ' - WHERE ' . $this->sql_where_auth . ' - AND image_status <> ' . $this->gallery_image->get_status_orphan() . ' - ORDER BY image_time DESC'; - $result = $this->db->sql_query_limit($sql, $this->num_sql_limit); - - while ($row = $this->db->sql_fetchrow($result)) - { - $this->images[] = $row['image_id']; - $this->recent_images[] = $row['image_id']; - } - $this->db->sql_freeresult($result); - } - if ($this->mode & self::MODE_RANDOM) - { - switch ($this->db->get_sql_layer()) - { - case 'postgres': - $random_sql = 'RANDOM()'; - break; - case 'mssql': - case 'mssql_odbc': - $random_sql = 'NEWID()'; - break; - default: - $random_sql = 'RAND()'; - break; - } - - $sql = 'SELECT image_id - FROM ' . $this->images_table . ' - WHERE ' . $this->sql_where_auth . ' - AND image_status <> ' . $this->gallery_image->get_status_orphan() . ' - ORDER BY ' . $random_sql; - $result = $this->db->sql_query_limit($sql, $this->num_sql_limit); - - while ($row = $this->db->sql_fetchrow($result)) - { - $this->images[] = $row['image_id']; - $this->random_images[] = $row['image_id']; - } - $this->db->sql_freeresult($result); - } - if ($this->num_contests) - { - $sql_array = array( - 'SELECT' => 'c.*, a.album_name', - 'FROM' => array($this->contests_table => 'c'), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array($this->albums_table => 'a'), - 'ON' => 'a.album_id = c.contest_album_id', - ), - ), - - 'WHERE' => $this->db->sql_in_set('c.contest_album_id', array_unique(array_merge($this->auth_view, $this->auth_moderate)), false, true) . ' AND c.contest_marked = ' . $this->gallery_image->get_no_contest(), - 'ORDER_BY' => 'c.contest_start + c.contest_end DESC', - ); - $sql = $this->db->sql_build_query('SELECT', $sql_array); - $result = $this->db->sql_query_limit($sql, $this->num_contests); - - while ($row = $this->db->sql_fetchrow($result)) - { - $this->images[] = $row['contest_first']; - $this->images[] = $row['contest_second']; - $this->images[] = $row['contest_third']; - $this->contest_images[$row['contest_id']] = array( - 'album_id' => $row['contest_album_id'], - 'album_name' => $row['album_name'], - 'images' => array($row['contest_first'], $row['contest_second'], $row['contest_third']) - ); - } - $this->db->sql_freeresult($result); - } - $this->images = array_unique($this->images); - } - - private function get_image_data() - { - if (!empty($this->images)) - { - $sql_array = array( - 'SELECT' => 'i.*, a.album_name, a.album_status, a.album_id, a.album_user_id', - 'FROM' => array($this->images_table => 'i'), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array($this->albums_table => 'a'), - 'ON' => 'i.image_album_id = a.album_id', - ), - ), - - 'WHERE' => $this->db->sql_in_set('i.image_id', $this->images, false, true), - 'ORDER_BY' => 'i.image_time DESC', - ); - $sql = $this->db->sql_build_query('SELECT', $sql_array); - $result = $this->db->sql_query($sql); - - while ($row = $this->db->sql_fetchrow($result)) - { - $this->images_data[$row['image_id']] = $row; - } - $this->db->sql_freeresult($result); - } - } - - /** - * Put the images into the template. - */ - private function display_images() - { - if (!empty($this->recent_images)) - { - $this->template->assign_block_vars($this->template_block_images, array( - 'U_BLOCK' => $this->controller_helper->route('phpbbgallery_core_search_recent'), - 'BLOCK_NAME' => $this->user->lang('RECENT_IMAGES'), - )); - foreach ($this->recent_images as $image) - { - phpbb_gallery_image::assign_block($this->template_block_images . '.imagerow.image', $this->images_data[$image], $this->images_data[$image]['album_status'], $this->get_display(), $this->images_data[$image]['album_user_id']); - } - } - - if (!empty($this->random_images)) - { - $num = 0; - $this->template->assign_block_vars($this->template_block_images, array( - 'U_BLOCK' => phpbb_gallery_url::append_sid('search', 'search_id=random'), - 'BLOCK_NAME' => $this->user->lang['RANDOM_IMAGES'], - 'S_COL_WIDTH' => (100 / $this->num_columns) . '%', - 'S_COLS' => $this->num_columns, - )); - foreach ($this->random_images as $image) - { - if (($num % $this->num_columns) == 0) - { - $this->template->assign_block_vars($this->template_block_images . '.imagerow', array()); - } - phpbb_gallery_image::assign_block($this->template_block_images . '.imagerow.image', $this->images_data[$image], $this->images_data[$image]['album_status'], $this->get_display(), $this->images_data[$image]['album_user_id']); - $num++; - } - while (($num % $this->num_columns) > 0) - { - $this->template->assign_block_vars($this->template_block_images . '.imagerow.no_image', array()); - $num++; - } - } - - if (!empty($this->contest_images)) - { - foreach ($this->contest_images as $contest => $contest_data) - { - $num = 0; - $this->template->assign_block_vars($this->template_block_images, array( - 'U_BLOCK' => phpbb_gallery_url::append_sid('album', 'album_id=' . $contest_data['album_id'] . '&sk=ra&sd=d'), - 'BLOCK_NAME' => sprintf($user->lang['CONTEST_WINNERS_OF'], $contest_data['album_name']), - 'S_CONTEST_BLOCK' => true, - 'S_COL_WIDTH' => '33%', - 'S_COLS' => 3, - )); - foreach ($contest_data['images'] as $image) - { - if (($num % phpbb_gallery_contest::NUM_IMAGES) == 0) - { - $this->template->assign_block_vars($this->template_block_images . '.imagerow', array()); - } - if (!empty($this->images_data[$image])) - { - phpbb_gallery_image::assign_block($this->template_block_images . '.imagerow.image', $this->images_data[$image], $this->images_data[$image]['album_status'], $this->get_display(), $this->images_data[$image]['album_user_id']); - $num++; - } - } - while (($num % phpbb_gallery_contest::NUM_IMAGES) > 0) - { - $this->template->assign_block_vars($this->template_block_images . '.imagerow.no_image', array()); - $num++; - } - } - } - - $this->template->assign_vars(array( - 'S_THUMBNAIL_SIZE' => phpbb_gallery_config::get('thumbnail_height') + 20 + ((phpbb_gallery_config::get('thumbnail_infoline')) ? phpbb_gallery_constants::THUMBNAIL_INFO_HEIGHT : 0), - )); - } - - /** - * Query the comments and put them into the template. - */ - private function display_comments() - { - if (empty($this->auth_comments)) - { - return; - } - - global $auth, $db, $template, $user; - $user->add_lang('viewtopic'); - - $sql_array = array( - 'SELECT' => 'c.*, i.*', - 'FROM' => array(GALLERY_COMMENTS_TABLE => 'c'), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(GALLERY_IMAGES_TABLE => 'i'), - 'ON' => 'c.comment_image_id = i.image_id', - ), - ), - - 'WHERE' => $this->sql_where_auth . ' AND ' . $db->sql_in_set('i.image_album_id', $this->auth_comments, false, true), - 'ORDER_BY' => 'c.comment_id DESC', - ); - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query_limit($sql, $this->num_comments); - - while ($row = $db->sql_fetchrow($result)) - { - $image_id = (int) $row['image_id']; - $album_id = (int) $row['image_album_id']; - - $template->assign_block_vars($this->template_block_comments, array( - 'U_COMMENT' => phpbb_gallery_url::append_sid('image_page', "album_id=$album_id&image_id=$image_id") . '#comment_' . $row['comment_id'], - 'COMMENT_ID' => $row['comment_id'], - 'TIME' => $user->format_date($row['comment_time']), - 'TEXT' => generate_text_for_display($row['comment'], $row['comment_uid'], $row['comment_bitfield'], 7), - 'U_DELETE' => (phpbb_gallery::$auth->acl_check('m_comments', $album_id) || (phpbb_gallery::$auth->acl_check('c_delete', $album_id) && ($row['comment_user_id'] == $user->data['user_id']) && $user->data['is_registered'])) ? phpbb_gallery_url::append_sid('comment', "album_id=$album_id&image_id=$image_id&mode=delete&comment_id=" . $row['comment_id']) : '', - 'U_QUOTE' => (phpbb_gallery::$auth->acl_check('c_post', $album_id)) ? phpbb_gallery_url::append_sid('comment', "album_id=$album_id&image_id=$image_id&mode=add&comment_id=" . $row['comment_id']) : '', - 'U_EDIT' => (phpbb_gallery::$auth->acl_check('m_comments', $album_id) || (phpbb_gallery::$auth->acl_check('c_edit', $album_id) && ($row['comment_user_id'] == $user->data['user_id']) && $user->data['is_registered'])) ? phpbb_gallery_url::append_sid('comment', "album_id=$album_id&image_id=$image_id&mode=edit&comment_id=" . $row['comment_id']) : '', - 'U_WHOIS' => ($auth->acl_get('a_')) ? phpbb_gallery_url::append_sid('mcp', 'mode=whois&ip=' . $row['comment_user_ip']) : '', - - 'UC_THUMBNAIL' => phpbb_gallery_image::generate_link('thumbnail', phpbb_gallery_config::get('link_thumbnail'), $row['image_id'], $row['image_name'], $row['image_album_id']), - 'UC_IMAGE_NAME' => phpbb_gallery_image::generate_link('image_name', phpbb_gallery_config::get('link_image_name'), $row['image_id'], $row['image_name'], $row['image_album_id']), - 'IMAGE_AUTHOR' => get_username_string('full', $row['image_user_id'], $row['image_username'], $row['image_user_colour']), - 'IMAGE_TIME' => $user->format_date($row['image_time']), - - 'POST_AUTHOR_FULL' => get_username_string('full', $row['comment_user_id'], $row['comment_username'], $row['comment_user_colour']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $row['comment_user_id'], $row['comment_username'], $row['comment_user_colour']), - 'POST_AUTHOR' => get_username_string('username', $row['comment_user_id'], $row['comment_username'], $row['comment_user_colour']), - 'U_POST_AUTHOR' => get_username_string('profile', $row['comment_user_id'], $row['comment_username'], $row['comment_user_colour']), - )); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_COMMENTS' => true, - - 'DELETE_IMG' => $user->img('icon_post_delete', 'DELETE_COMMENT'), - 'EDIT_IMG' => $user->img('icon_post_edit', 'EDIT_COMMENT'), - 'QUOTE_IMG' => $user->img('icon_post_quote', 'QUOTE_COMMENT'), - 'INFO_IMG' => $user->img('icon_post_info', 'IP'), - 'MINI_POST_IMG' => $user->img('icon_post_target', 'COMMENT'), - 'PROFILE_IMG' => $user->img('icon_user_profile', 'READ_PROFILE'), - 'COLLAPSE_COMMENTS' => $this->toggle_comments, - )); - } -} diff --git a/core/comment.php b/core/comment.php index a6583798e..910231e81 100644 --- a/core/comment.php +++ b/core/comment.php @@ -92,7 +92,9 @@ public function is_allowed($album_data, $image_data) */ public function is_able($album_data, $image_data) { - return $this->is_allowed($album_data, $image_data); //&& phpbb_ext_gallery_core_contest::is_step('comment', $album_data); + // Contest albums only accept comments once the contest has ended + return $this->is_allowed($album_data, $image_data) && + (empty($album_data['contest_id']) || (time() > ($album_data['contest_start'] + $album_data['contest_end']))); } /** @@ -111,7 +113,7 @@ public function add($data, $comment_username = '') $data = $data + array( 'comment_user_id' => $this->user->data['user_id'], - 'comment_username' => ($this->user->data['user_id'] != ANONYMOUS) ? $this->user->data['username'] : $comment_username, + 'comment_username' => ($this->user->data['user_id'] != ANONYMOUS) ? $this->user->data['username'] : utf8_encode_ucr($comment_username), 'comment_user_colour' => $this->user->data['user_colour'], 'comment_user_ip' => $this->user->ip, 'comment_time' => time(), diff --git a/core/composer.json b/core/composer.json index 452e2aa38..d349decfd 100644 --- a/core/composer.json +++ b/core/composer.json @@ -26,7 +26,7 @@ } ], "require": { - "php": ">=7.1" + "php": ">=7.2" }, "extra": { "display-name": "phpBB Gallery", diff --git a/core/contest.php b/core/contest.php index 9f759f292..f620d9d22 100644 --- a/core/contest.php +++ b/core/contest.php @@ -151,9 +151,9 @@ public function end($album_id, $contest_id, $end_time) $sql = 'UPDATE ' . $this->contest_table . ' SET contest_marked = ' . $this->NO_CONTEST . ", - contest_first = $first, - contest_second = $second, - contest_third = $third + contest_first = " . (int) $first . ", + contest_second = " . (int) $second . ", + contest_third = " . (int) $third . " WHERE contest_id = " . (int) $contest_id; $this->db->sql_query($sql); diff --git a/core/controller/album.php b/core/controller/album.php index b050f140f..444e5aea9 100644 --- a/core/controller/album.php +++ b/core/controller/album.php @@ -392,7 +392,7 @@ protected function display_images($album_id, $album_data, $start, $limit) $this->template->assign_block_vars('imageblock.image', array( 'IMAGE_ID' => (int) $image_data['image_id'], 'U_IMAGE' => $action_image, - 'UC_IMAGE_NAME' => $show_imagename ? htmlspecialchars_decode($image_data['image_name'], ENT_COMPAT) : false, + 'UC_IMAGE_NAME' => $show_imagename ? $image_data['image_name'] : false, 'U_ALBUM' => $show_album ? $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])) : false, 'ALBUM_NAME' => $show_album ? $album_data['album_name'] : false, 'IMAGE_VIEWS' => $show_views ? (int) $image_data['image_view_count'] : -1, diff --git a/core/controller/comment.php b/core/controller/comment.php index 6312818bb..91e689924 100644 --- a/core/controller/comment.php +++ b/core/controller/comment.php @@ -186,6 +186,11 @@ public function add($image_id, $comment_id) { $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); } + // Locked image or album, comments disabled, or contest still running + if (!$this->comment->is_able($album_data, $image_data)) + { + $this->misc->not_authorised($image_backlink, $album_loginlink); + } add_form_key('gallery'); $this->language->add_lang('posting'); @@ -267,7 +272,7 @@ public function add($image_id, $comment_id) } $comment_plain = $this->request->variable('message', '', true); - $comment_username = $this->request->variable('username', '', true); + $comment_username = utf8_normalize_nfc($this->request->variable('username', '', true)); if ($comment_username_req) { @@ -287,7 +292,7 @@ public function add($image_id, $comment_id) $submit = false; } } - if (($comment_plain == '') && !$s_user_rated) + if ($comment_plain == '') { $error .= (($error) ? '
' : '') . $this->language->lang('MISSING_COMMENT'); } @@ -317,7 +322,7 @@ public function add($image_id, $comment_id) 'comment' => $message_parser->message, 'comment_uid' => $message_parser->bbcode_uid, 'comment_bitfield' => $message_parser->bbcode_bitfield, - 'comment_signature' => ($this->auth->acl_get('u_sig') && isset($_POST['attach_sig'])), + 'comment_signature' => ($this->auth->acl_get('u_sig') && $this->request->is_set_post('attach_sig')), ); if ((!$error) && ($sql_ary['comment'] != '')) { @@ -344,7 +349,7 @@ public function add($image_id, $comment_id) { $s_captcha_hidden_fields = ($captcha->is_solved()) ? build_hidden_fields($captcha->get_hidden_fields()) : ''; } - $sig_checked = ($this->auth->acl_get('u_sig') && isset($_POST['attach_sig'])); + $sig_checked = ($this->auth->acl_get('u_sig') && $this->request->is_set_post('attach_sig')); } else { @@ -420,7 +425,26 @@ public function edit($image_id, $comment_id) $submit = $this->request->variable('submit', false); $error = $message = ''; - // load Image Data + $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); + $login_link = append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext . '?mode=login'); + if ($comment_id == 0) + { + $this->misc->not_authorised($image_backlink, $login_link); + } + + $sql = 'SELECT * + FROM ' . $this->table_comments . ' + WHERE comment_id = ' . (int) $comment_id; + $result = $this->db->sql_query($sql); + $comment_data = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + if (!$comment_data) + { + $this->misc->not_authorised($image_backlink, $login_link); + } + + // Derive the image and album used for permission checks from the comment. + $image_id = (int) $comment_data['comment_image_id']; $image_data = $this->image->get_image_data($image_id); $album_id = (int) $image_data['image_album_id']; $album_data = $this->loader->get($album_id); @@ -429,24 +453,11 @@ public function edit($image_id, $comment_id) $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); $album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id)); - $image_loginlink = $this->url->append_sid('relative', 'image_page', "album_id=$album_id&image_id=$image_id"); - $album_loginlink = append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext . '?mode=login'); - if ($comment_id != 0) - { - $sql = 'SELECT * - FROM ' . $this->table_comments . ' - WHERE comment_id = ' . (int) $comment_id; - $result = $this->db->sql_query($sql); - $comment_data = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); - $image_id = (int) $comment_data['comment_image_id']; - } - else - { - $this->misc->not_authorised($image_backlink, $image_loginlink); - } + $image_loginlink = $login_link; + $album_loginlink = $login_link; + $this->gallery_auth->load_user_permissions($this->user->data['user_id']); - if (!$this->gallery_auth->acl_check('c_edit', $album_id, $album_data['album_user_id']) /*&& $mode == 'add'*/) + if (!$this->gallery_auth->acl_check('c_edit', $album_id, $album_data['album_user_id'])) { if (!$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id'])) { @@ -457,6 +468,11 @@ public function edit($image_id, $comment_id) { $this->misc->not_authorised($image_backlink, $image_loginlink); } + // Moderators may still edit comments where posting is closed + if (!$this->comment->is_able($album_data, $image_data) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id'])) + { + $this->misc->not_authorised($image_backlink, $image_loginlink); + } $this->language->add_lang('posting'); @@ -522,7 +538,7 @@ public function edit($image_id, $comment_id) if ($comment_username_req) { - $comment_username = $this->request->variable('username', ''); + $comment_username = utf8_normalize_nfc($this->request->variable('username', '', true)); if ($comment_username == '') { $error .= (($error) ? '
' : '') . $this->language->lang('MISSING_USERNAME'); @@ -535,7 +551,7 @@ public function edit($image_id, $comment_id) } $sql_ary = array( - 'comment_username' => $comment_username, + 'comment_username' => utf8_encode_ucr($comment_username), ); } @@ -567,7 +583,7 @@ public function edit($image_id, $comment_id) 'comment_uid' => $message_parser->bbcode_uid, 'comment_bitfield' => $message_parser->bbcode_bitfield, 'comment_edit_count' => $comment_data['comment_edit_count'] + 1, - 'comment_signature' => ($this->auth->acl_get('u_sig') && isset($_POST['attach_sig'])), + 'comment_signature' => ($this->auth->acl_get('u_sig') && $this->request->is_set_post('attach_sig')), )); if (!$error) @@ -634,7 +650,26 @@ public function delete($image_id, $comment_id) $submit = $this->request->variable('submit', false); $error = $message = ''; - // load Image Data + $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); + $login_link = append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext . '?mode=login'); + if ($comment_id == 0) + { + $this->misc->not_authorised($image_backlink, $login_link); + } + + $sql = 'SELECT * + FROM ' . $this->table_comments . ' + WHERE comment_id = ' . (int) $comment_id; + $result = $this->db->sql_query($sql); + $comment_data = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + if (!$comment_data) + { + $this->misc->not_authorised($image_backlink, $login_link); + } + + // Derive the image and album used for permission checks from the comment. + $image_id = (int) $comment_data['comment_image_id']; $image_data = $this->image->get_image_data($image_id); $album_id = (int) $image_data['image_album_id']; $album_data = $this->loader->get($album_id); @@ -643,24 +678,11 @@ public function delete($image_id, $comment_id) $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); $album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id)); - $image_loginlink = $this->url->append_sid('relative', 'image_page', "album_id=$album_id&image_id=$image_id"); - $album_loginlink = append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext . '?mode=login'); - if ($comment_id != 0) - { - $sql = 'SELECT * - FROM ' . $this->table_comments . ' - WHERE comment_id = ' . (int) $comment_id; - $result = $this->db->sql_query($sql); - $comment_data = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); - $image_id = (int) $comment_data['comment_image_id']; - } - else - { - $this->misc->not_authorised($image_backlink, $image_loginlink); - } + $image_loginlink = $login_link; + $album_loginlink = $login_link; + $this->gallery_auth->load_user_permissions($this->user->data['user_id']); - if (!$this->gallery_auth->acl_check('c_edit', $album_id, $album_data['album_user_id']) /*&& $mode == 'add'*/) + if (!$this->gallery_auth->acl_check('c_edit', $album_id, $album_data['album_user_id'])) { if (!$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id'])) { @@ -671,6 +693,11 @@ public function delete($image_id, $comment_id) { $this->misc->not_authorised($image_backlink, $image_loginlink); } + // Moderators may still delete comments where posting is closed + if (!$this->comment->is_able($album_data, $image_data) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id'])) + { + $this->misc->not_authorised($image_backlink, $image_loginlink); + } $this->language->add_lang('posting'); @@ -737,7 +764,7 @@ public function delete($image_id, $comment_id) } else { - if (isset($_POST['cancel'])) + if ($this->request->is_set_post('cancel')) { $message = $this->language->lang('DELETED_COMMENT_NOT') . '
'; $submit = true; @@ -782,7 +809,11 @@ public function rate($image_id) $this->language->add_lang(array('gallery'), 'phpbbgallery/core'); add_form_key('gallery'); - $submit = $this->request->variable('submit', false); + $rate_submitted = $this->request->is_set_post('rating'); + if ($rate_submitted && !check_form_key('gallery')) + { + trigger_error('FORM_INVALID'); + } $error = $message = ''; // load Image Data $image_data = $this->image->get_image_data($image_id); @@ -842,7 +873,7 @@ public function rate($image_id) // User just rated the image, so we store it $rate_point = $this->request->variable('rating', 0); - if ($rating->rating_enabled && $rate_point > 0) + if ($rate_submitted && $rating->rating_enabled && $rate_point > 0) { $rating->submit_rating(); $s_user_rated = true; diff --git a/core/controller/image.php b/core/controller/image.php index 3d894851f..304ab16e6 100644 --- a/core/controller/image.php +++ b/core/controller/image.php @@ -270,7 +270,7 @@ public function base($image_id, $page = 0) else { $user_id = (int) $this->user->data['user_id']; - $image_status_check = ' AND (image_status = ' . (int) \phpbbgallery\core\block::STATUS_APPROVED . ' OR image_user_id = ' . $user_id . ')'; + $image_status_check = '(image_status = ' . (int) \phpbbgallery\core\block::STATUS_APPROVED . ' OR image_user_id = ' . $user_id . ')'; } if (!$this->user->data['is_bot'] && isset($this->user->data['session_page']) && (strpos($this->user->data['session_page'], '&image_id=' . $image_id) === false || isset($this->user->data['session_created']))) @@ -321,15 +321,6 @@ public function base($image_id, $page = 0) $sort_key = $this->request->variable('sk', ($album_data['album_sort_key']) ? $album_data['album_sort_key'] : $this->config['phpbb_gallery_default_sort_key']); $sort_dir = $this->request->variable('sd', ($album_data['album_sort_dir']) ? $album_data['album_sort_dir'] : $this->config['phpbb_gallery_default_sort_dir']); - if (in_array($sort_key, array('r', 'ra'))) - { - $sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'ASC' : 'DESC'); - } - else - { - $sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - } - $limit_days = array(); $sort_by_text = array( 't' => $this->language->lang('TIME'), @@ -358,17 +349,42 @@ public function base($image_id, $page = 0) $sort_by_text['lc'] = $this->language->lang('NEW_COMMENT'); $sort_by_sql['lc'] = 'image_last_comment'; } + if (!isset($sort_by_sql[$sort_key])) + { + $sort_key = 't'; + } + if (!in_array($sort_dir, array('a', 'd'), true)) + { + $sort_dir = 'd'; + } + if (in_array($sort_key, array('r', 'ra'), true)) + { + $sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'ASC' : 'DESC'); + } + else + { + $sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); + } gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); $sql_sort_order .= $sql_help_sort; // Let's see if there is previous image - $sql = 'SELECT * - FROM ' . $this->table_images . ' - WHERE image_album_id = ' . (int) $album_id . ' - AND image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' - ' . $image_status_check . ' - ORDER BY ' . $sql_sort_order . $sql_help_sort; + $sql_conditions = array( + 'image_album_id = ' . (int) $album_id, + 'image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN, + ); + if ($image_status_check) + { + $sql_conditions[] = $image_status_check; + } + $sql_array = array( + 'SELECT' => '*', + 'FROM' => array($this->table_images => 'i'), + 'WHERE' => implode(' AND ', $sql_conditions), + 'ORDER_BY' => $sql_sort_order, + ); + $sql = $this->db->sql_build_query('SELECT', $sql_array); $result = $this->db->sql_query($sql); $images_array = []; while ($row = $this->db->sql_fetchrow($result)) @@ -401,8 +417,8 @@ public function base($image_id, $page = 0) $this->db->sql_freeresult($result); $this->template->assign_vars(array( - 'UC_NEXT_IMAGE' => ($next ? ($this->gallery_config->get('disp_nextprev_thumbnail') ? '' . htmlspecialchars_decode($next['image_name'], ENT_COMPAT) . '' : '' . htmlspecialchars_decode($next['image_name'], ENT_COMPAT) . ' »»') : ''), - 'UC_PREV_IMAGE' => ($prev ? ($this->gallery_config->get('disp_nextprev_thumbnail') ? '' . htmlspecialchars_decode($prev['image_name'], ENT_COMPAT) . '' : '«« ' . htmlspecialchars_decode($prev['image_name'], ENT_COMPAT) . '') : ''), + 'UC_NEXT_IMAGE' => ($next ? ($this->gallery_config->get('disp_nextprev_thumbnail') ? '' . $next['image_name'] . '' : '' . $next['image_name'] . ' »»') : ''), + 'UC_PREV_IMAGE' => ($prev ? ($this->gallery_config->get('disp_nextprev_thumbnail') ? '' . $prev['image_name'] . '' : '«« ' . $prev['image_name'] . '') : ''), 'U_VIEW_ALBUM' => $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id)), 'UC_IMAGE' => $this->helper->route('phpbbgallery_core_image_file_medium', array('image_id' => (int) $image_id)), //'UC_IMAGE_ACTION' => $this->gallery_config->get('link_imagepage') == 'none' ? '' : $this->gallery_config->get('link_imagepage') == 'image' ? $this->helper->route('phpbbgallery_core_image_file_source', array('image_id' => $image_id)) : $next && $this->gallery_config->get('link_imagepage') == 'next' ? $this->helper->route('phpbbgallery_core_image', array('image_id' => $next['image_id'])) : '', @@ -413,7 +429,7 @@ public function base($image_id, $page = 0) 'U_STATUS' => ($s_allowed_status) ? $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id)) : '', 'CONTEST_RANK' => ($this->data['image_contest_rank']) ? $this->language->lang('CONTEST_RESULT_' . $this->data['image_contest_rank']) : '', - 'IMAGE_NAME' => htmlspecialchars_decode($this->data['image_name'], ENT_COMPAT), + 'IMAGE_NAME' => $this->data['image_name'], 'IMAGE_DESC' => $image_desc, 'IMAGE_BBCODE' => ($this->config['allow_bbcode']) ? '[image]' . (int) $image_id . '[/image]' : '', 'IMAGE_IMGURL_BBCODE' => ($this->config['phpbb_gallery_disp_image_url']) ? '[url=' . $this->url->get_uri($this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id))) . '][img]' . $this->url->get_uri($this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $image_id))) . '[/img][/url]' : '', @@ -484,8 +500,8 @@ public function base($image_id, $page = 0) 'POSTER_WARNINGS' => $user_data['warnings'] ?? 0, 'POSTER_AGE' => $user_data['age'] ?? '', - 'POSTER_ONLINE_IMG' => ($user_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? '' : ($user_data['online'] ? $this->user->img('icon_user_online', 'ONLINE') : $this->user->img('icon_user_offline', 'OFFLINE')), - 'S_POSTER_ONLINE' => ($user_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? false : $user_data['online'], + 'POSTER_ONLINE_IMG' => ($user_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? '' : (($user_data['online'] ?? false) ? $this->user->img('icon_user_online', 'ONLINE') : $this->user->img('icon_user_offline', 'OFFLINE')), + 'S_POSTER_ONLINE' => ($user_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? false : ($user_data['online'] ?? false), //'U_POSTER_PROFILE' => $user_data['profile'] ?? '', 'U_POSTER_SEARCH' => $user_data['search'] ?? '', @@ -730,8 +746,8 @@ protected function display_comments($image_id, $image_data, $album_id, $album_da // 'MINI_POST_IMG' => $this->user->img('icon_post_target', 'POST'), // 'ICQ_STATUS_IMG' => isset($user_data['icq_status_img']) ? $user_data['icq_status_img'] : '', - 'POSTER_ONLINE_IMG' => ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? '' : ($user_deleted ? '' : ($user_data['online'] ? $this->user->img('icon_user_online', 'ONLINE') : $this->user->img('icon_user_offline', 'OFFLINE'))), - 'S_POSTER_ONLINE' => ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? false : ($user_deleted ? '' : $user_data['online']), + 'POSTER_ONLINE_IMG' => ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? '' : ($user_deleted ? '' : (($user_data['online'] ?? false) ? $this->user->img('icon_user_online', 'ONLINE') : $this->user->img('icon_user_offline', 'OFFLINE'))), + 'S_POSTER_ONLINE' => ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? false : ($user_deleted ? '' : ($user_data['online'] ?? false)), 'S_CUSTOM_FIELDS' => (isset($cp_row['row']) && count($cp_row['row'])) ? true : false, ); @@ -825,7 +841,7 @@ public function edit($image_id) $owner_id = $image_data['image_user_id']; $album_loginlink = './ucp.php?mode=login'; $this->gallery_auth->load_user_permissions($this->user->data['user_id']); - if (!$this->gallery_auth->acl_check('i_edit', $album_id, $album_data['album_user_id']) || ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_ORPHAN)) + if ((int) $owner_id !== (int) $this->user->data['user_id'] || !$this->gallery_auth->acl_check('i_edit', $album_id, $album_data['album_user_id']) || ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_ORPHAN)) { if (!$this->gallery_auth->acl_check('m_edit', $album_id, $album_data['album_user_id'])) { @@ -842,7 +858,7 @@ public function edit($image_id) $image_desc = $this->request->variable('message', array(''), true); $image_desc = $image_desc[0]; $image_name = $this->request->variable('image_name', array(''), true); - $image_name = $image_name[0]; + $image_name = utf8_encode_ucr(utf8_normalize_nfc($image_name[0])); if (strlen($image_desc) > $this->gallery_config->get('description_length')) { trigger_error($this->language->lang('DESC_TOO_LONG')); @@ -1067,7 +1083,7 @@ public function delete($image_id) $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); $album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $image_data['image_album_id'])); $this->gallery_auth->load_user_permissions($this->user->data['user_id']); - if (!$this->gallery_auth->acl_check('i_delete', $album_id, $album_data['album_user_id']) || ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_ORPHAN)) + if ((int) $image_data['image_user_id'] !== (int) $this->user->data['user_id'] || !$this->gallery_auth->acl_check('i_delete', $album_id, $album_data['album_user_id']) || ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_ORPHAN)) { if (!$this->gallery_auth->acl_check('m_delete', $album_id, $album_data['album_user_id'])) { @@ -1083,7 +1099,7 @@ public function delete($image_id) if (confirm_box(true)) { $this->image->handle_counter($image_id, false); - $this->moderate->delete_images(array($image_id), array($image_id => $image_data['image_filename'])); + $this->moderate->delete_images(array($image_id), array($image_id => $image_data['image_filename']), $album_id); $this->album->update_info($album_id); $message = $this->language->lang('DELETED_IMAGE') . '
'; @@ -1100,7 +1116,7 @@ public function delete($image_id) } else { - if (isset($_POST['cancel'])) + if ($this->request->is_set_post('cancel')) { $message = $this->language->lang('DELETED_IMAGE_NOT') . '
'; $message .= '
' . sprintf($this->language->lang('CLICK_RETURN_IMAGE'), '', ''); diff --git a/core/controller/index.php b/core/controller/index.php index 1912cdd46..df5a0ea2b 100644 --- a/core/controller/index.php +++ b/core/controller/index.php @@ -310,11 +310,29 @@ protected function assign_dropdown_links($base_route) $show_random = (bool) ($show_options & self::RRC_MODE_RANDOM_IMAGES); $show_recent = (bool) ($show_options & self::RRC_MODE_RECENT_IMAGES); + $newest_pega = ''; + if ($this->gallery_config->get('num_pegas')) + { + $newest_pega_username = utf8_htmlspecialchars(html_entity_decode((string) $this->gallery_config->get('newest_pega_username'), ENT_QUOTES, 'UTF-8')); + $newest_pega_user_colour = (string) $this->gallery_config->get('newest_pega_user_colour'); + if (!preg_match('/^[0-9a-f]{6}$/i', $newest_pega_user_colour)) + { + $newest_pega_user_colour = ''; + } + + $newest_pega = sprintf( + $this->language->lang('NEWEST_PGALLERY'), + '' . + get_username_string('no_profile', (int) $this->gallery_config->get('newest_pega_user_id'), $newest_pega_username, $newest_pega_user_colour) . + '' + ); + } + $this->template->assign_vars(array( 'TOTAL_IMAGES' => ($this->gallery_config->get('disp_statistic')) ? $this->language->lang('TOTAL_IMAGES_SPRINTF', $this->gallery_config->get('num_images')) : '', 'TOTAL_COMMENTS' => ($this->gallery_config->get('allow_comments')) ? $this->language->lang('TOTAL_COMMENTS_SPRINTF', $this->gallery_config->get('num_comments')) : '', 'TOTAL_PGALLERIES' => ($this->gallery_auth->acl_check('a_list', \phpbbgallery\core\auth\auth::PERSONAL_ALBUM)) ? $this->language->lang('TOTAL_PEGAS_SPRINTF', $this->gallery_config->get('num_pegas')) : '', - 'NEWEST_PGALLERIES' => ($this->gallery_config->get('num_pegas')) ? sprintf($this->language->lang('NEWEST_PGALLERY'), 'gallery_config->get('newest_pega_user_colour') ? 'class="username-coloured" style="color: #' . $this->gallery_config->get('newest_pega_user_colour') . ';"' : 'class="username"') . '>' . $this->gallery_config->get('newest_pega_username') . '') : '', + 'NEWEST_PGALLERIES' => $newest_pega, )); $this->template->assign_vars(array( diff --git a/core/controller/moderate.php b/core/controller/moderate.php index d201c2f49..2e87718a1 100644 --- a/core/controller/moderate.php +++ b/core/controller/moderate.php @@ -133,6 +133,63 @@ public function __construct(\phpbb\config\config $config, \phpbb\request\request $this->php_ext = $php_ext; } + /** + * Require a moderator permission on a concrete album. + * + * @param string $permission + * @param int $album_id + * @return array + */ + protected function require_album_permission($permission, $album_id) + { + $album_id = (int) $album_id; + $album_data = $this->album->get_info($album_id); + if (!$album_data || !$this->gallery_auth->acl_check($permission, $album_id, $album_data['album_user_id'])) + { + $back_link = $this->helper->route('phpbbgallery_core_moderate'); + $login_link = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login'); + $this->misc->not_authorised($back_link, $login_link, 'LOGIN_EXPLAIN_UPLOAD'); + } + + return $album_data; + } + + /** + * Resolve client-supplied image IDs to their real albums and authorize each album. + * + * @param array|int $image_ids + * @param string $permission + * @param int $route_album_id + * @return array Album ID => image IDs + */ + protected function get_authorized_image_groups($image_ids, $permission, $route_album_id = 0) + { + $groups = array(); + foreach (array_unique(array_map('intval', (array) $image_ids)) as $image_id) + { + $image_data = $this->image->get_image_data($image_id); + if (!$image_data || (int) $image_data['image_status'] === (int) \phpbbgallery\core\block::STATUS_ORPHAN) + { + continue; + } + + $source_album_id = (int) $image_data['image_album_id']; + if ($route_album_id && $source_album_id !== (int) $route_album_id) + { + $this->require_album_permission($permission, $source_album_id); + continue; + } + if (!isset($groups[$source_album_id])) + { + $this->require_album_permission($permission, $source_album_id); + $groups[$source_album_id] = array(); + } + $groups[$source_album_id][] = $image_id; + } + + return $groups; + } + /** * Index Controller * Route: gallery/moderate @@ -195,6 +252,7 @@ public function queue_approve($page, $album_id) { $approve_ary = $this->request->variable('approval', array('' => array(0))); $action_ary = $this->request->variable('action', array('' => 0)); + $action = ''; $back_link = $this->request->variable('back_link', $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_queue_approve_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_queue_approve')); foreach ($action_ary as $act => $garb) { @@ -222,17 +280,24 @@ public function queue_approve($page, $album_id) $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); } } - if (!empty($approve_ary)) + $submitted_ids = array(); + foreach ($approve_ary as $approve_array) + { + $submitted_ids = array_merge($submitted_ids, $approve_array); + } + $submitted_ids = array_values(array_filter(array_map('intval', $submitted_ids))); + if (!empty($submitted_ids)) { + $image_groups = $this->get_authorized_image_groups($submitted_ids, 'm_status', $album_id); if (confirm_box(true)) { + $count = 0; if ($action == 'approve') { - $count = 0; - foreach ($approve_ary as $album_id => $approve_array) + foreach ($image_groups as $source_album_id => $approve_array) { - $this->image->approve_images($approve_array, $album_id); - $this->album->update_info($album_id); + $this->image->approve_images($approve_array, $source_album_id); + $this->album->update_info($source_album_id); $count = $count + count($approve_array); } @@ -242,17 +307,16 @@ public function queue_approve($page, $album_id) } if ($action == 'disapprove') { - $count = 0; - foreach ($approve_ary as $album_id => $delete_array) + foreach ($image_groups as $source_album_id => $delete_array) { // Let's load info for images, so we can $filenames = $this->image->get_filenames($delete_array); // Let's log the action foreach ($filenames as $name) { - $this->gallery_log->add_log('moderator', 'disapprove', $album_id, 0, array('LOG_GALLERY_DISAPPROVED', $name)); + $this->gallery_log->add_log('moderator', 'disapprove', $source_album_id, 0, array('LOG_GALLERY_DISAPPROVED', $name)); } - $this->moderate->delete_images($delete_array); + $this->moderate->delete_images($delete_array, array(), $source_album_id); $count = $count + count($delete_array); } $message = $this->language->lang('WAITING_DISAPPROVED_IMAGE', $count); @@ -342,8 +406,9 @@ public function action_log($page, $album_id) */ public function reports($page, $album_id, $status) { - $report_ary = $this->request->variable('report', array(0)); + $report_ary = array_values(array_filter(array_map('intval', $this->request->variable('report', array(0))))); $action_ary = $this->request->variable('action', array('' => 0)); + $action = ''; $back_link = $this->request->variable('back_link', $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_reports_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_reports')); foreach ($action_ary as $act => $garb) { @@ -352,13 +417,34 @@ public function reports($page, $album_id, $status) $this->language->add_lang(array('gallery_mcp', 'gallery'), 'phpbbgallery/core'); $this->language->add_lang('mcp'); + $this->gallery_auth->load_user_permissions($this->user->data['user_id']); + $album_backlink = $album_id === 0 ? $this->helper->route('phpbbgallery_core_moderate') : $this->helper->route('phpbbgallery_core_moderate_album', array('album_id' => $album_id)); + $album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login'); + if ($album_id === 0) + { + if (!$this->gallery_auth->acl_check_global('m_report')) + { + $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); + } + $album = array(); + } + else + { + $album = $this->require_album_permission('m_report', $album_id); + } + $report_groups = $this->get_authorized_image_groups($report_ary, 'm_report', $album_id); if (!empty($report_ary)) { if (confirm_box(true)) { - $this->report->close_reports_by_image($report_ary); - $message = $this->language->lang('WAITING_REPORTED_DONE', count($report_ary)); + $count = 0; + foreach ($report_groups as $image_ids) + { + $this->report->close_reports_by_image($image_ids); + $count += count($image_ids); + } + $message = $this->language->lang('WAITING_REPORTED_DONE', $count); $this->url->meta_refresh(3, $back_link); trigger_error($message); } @@ -373,25 +459,6 @@ public function reports($page, $album_id, $status) confirm_box(false, $this->language->lang('REPORTS_A_CLOSE2_CONFIRM'), $s_hidden_fields); } } - $this->gallery_auth->load_user_permissions($this->user->data['user_id']); - $album_backlink = $album_id === 0 ? $this->helper->route('phpbbgallery_core_moderate') : $this->helper->route('phpbbgallery_core_moderate_album', array('album_id' => $album_id)); - $album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login'); - if ($album_id === 0) - { - if (!$this->gallery_auth->acl_check_global('m_report')) - { - $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); - } - } - else - { - $album = $this->album->get_info($album_id); - if (!$this->gallery_auth->acl_check('m_report', $album['album_id'], $album['album_user_id'])) - { - $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); - } - } - $this->template->assign_vars(array( 'U_GALLERY_MODERATE_OVERVIEW' => $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate'), 'U_GALLERY_MODERATE_APPROVE' => $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_queue_approve_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_queue_approve'), @@ -420,13 +487,60 @@ public function album_overview($album_id, $page) $this->language->add_lang(array('gallery_mcp', 'gallery'), 'phpbbgallery/core'); $this->language->add_lang('mcp'); - $actions_array = $this->request->variable('action', array(0)); + $actions_array = array_values(array_filter(array_map('intval', $this->request->variable('action', array(0))))); $action = $this->request->variable('select_action', ''); $back_link = $this->request->variable('back_link', $this->helper->route('phpbbgallery_core_moderate_view', array('album_id' => $album_id))); - $moving_target = $this->request->variable('moving_target', ''); + $moving_target = $this->request->variable('moving_target', 0); + $this->gallery_auth->load_user_permissions($this->user->data['user_id']); + $album = $this->require_album_permission('m_', $album_id); if (!empty($actions_array)) { - if (confirm_box(true) || $moving_target) + $permission_map = array( + 'approve' => 'm_status', + 'unapprove' => 'm_status', + 'lock' => 'm_status', + 'delete' => 'm_delete', + 'move' => 'm_move', + 'report' => 'm_report', + ); + if (!isset($permission_map[$action])) + { + trigger_error('NO_MODE'); + } + $image_groups = $this->get_authorized_image_groups($actions_array, $permission_map[$action], $album_id); + $actions_array = isset($image_groups[$album_id]) ? $image_groups[$album_id] : array(); + if (empty($actions_array)) + { + trigger_error('NO_IMAGES'); + } + if ($action === 'move' && $moving_target) + { + $this->require_album_permission('m_move', $moving_target); + } + + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + foreach ($actions_array as $var) + { + $s_hidden_fields .= ''; + } + if ($moving_target) + { + $s_hidden_fields .= ''; + } + + if ($action === 'move' && !$moving_target) + { + $category_select = $this->album->get_albumbox(false, 'moving_target', $album_id, 'm_move', $album_id); + $this->template->assign_vars(array( + 'S_MOVING_IMAGES' => true, + 'S_ALBUM_SELECT' => $category_select, + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + )); + return $this->helper->render('gallery/mcp_body.html', $this->language->lang('GALLERY')); + } + + if (confirm_box(true)) { $message = ''; switch ($action) @@ -450,13 +564,13 @@ public function album_overview($album_id, $page) break; case 'delete': - $this->moderate->delete_images($actions_array); + $this->moderate->delete_images($actions_array, array(), $album_id); $this->album->update_info($album_id); $message = $this->language->lang('DELETED_IMAGES', count($actions_array)); break; case 'move': - $this->image->move_image($actions_array, $moving_target); + $this->image->move_image($actions_array, $moving_target, $album_id); $this->album->update_info($album_id); $this->album->update_info($moving_target); $message = $this->language->lang('MOVED_IMAGES', count($actions_array)); @@ -476,50 +590,16 @@ public function album_overview($album_id, $page) } else { - $s_hidden_fields = ''; - $s_hidden_fields .= ''; - foreach ($actions_array as $var) - { - $s_hidden_fields .= ''; - } if ($action == 'report') { confirm_box(false, $this->language->lang('REPORT_A_CLOSE2_CONFIRM'), $s_hidden_fields); } - if ($action == 'move') - { - $category_select = $this->album->get_albumbox(false, 'moving_target', $album_id, 'm_move', $album_id); - $this->template->assign_vars(array( - 'S_MOVING_IMAGES' => true, - 'S_ALBUM_SELECT' => $category_select, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - )); - return $this->helper->render('gallery/mcp_body.html', $this->language->lang('GALLERY')); - } else { confirm_box(false, $this->language->lang('QUEUES_A_' . strtoupper($action) . '2_CONFIRM'), $s_hidden_fields); } } } - $this->gallery_auth->load_user_permissions($this->user->data['user_id']); - $album_backlink = $album_id === 0 ? $this->helper->route('phpbbgallery_core_moderate') : $this->helper->route('phpbbgallery_core_moderate_album', array('album_id' => $album_id)); - $album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login'); - if ($album_id === 0) - { - if (!$this->gallery_auth->acl_check_global('m_')) - { - $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); - } - } - else - { - $album = $this->album->get_info($album_id); - if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id'])) - { - $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); - } - } $this->template->assign_vars(array( 'U_GALLERY_MODERATE_OVERVIEW' => $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate'), 'U_GALLERY_MODERATE_APPROVE' => $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_queue_approve_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_queue_approve'), @@ -543,6 +623,14 @@ public function image($image_id) { $this->language->add_lang(array('gallery_mcp', 'gallery'), 'phpbbgallery/core'); $this->language->add_lang('mcp'); + $image_data = $this->image->get_image_data($image_id); + if (!$image_data) + { + trigger_error('NO_IMAGE'); + } + $album_data = $this->album->get_info($image_data['image_album_id']); + $this->gallery_auth->load_user_permissions($this->user->data['user_id']); + $this->require_album_permission('m_', $image_data['image_album_id']); $quick_action = $this->request->variable('action', ''); // If we have quick mode (EDIT, DELETE) just send us to the page we need @@ -550,35 +638,24 @@ public function image($image_id) { case 'images_move': $route = $this->helper->route('phpbbgallery_core_moderate_image_move', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); case 'image_edit': $route = $this->helper->route('phpbbgallery_core_image_edit', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); case 'images_unapprove': $route = $this->helper->route('phpbbgallery_core_moderate_image_unapprove', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); case 'images_approve': $route = $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); case 'images_lock': $route = $this->helper->route('phpbbgallery_core_moderate_image_lock', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); case 'images_delete': $route = $this->helper->route('phpbbgallery_core_image_delete', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); case 'reports_close': + $this->require_album_permission('m_report', $image_data['image_album_id']); if (confirm_box(true)) { $back_link = $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id)); @@ -595,12 +672,8 @@ public function image($image_id) break; case 'reports_open': $route = $this->helper->route('phpbbgallery_core_image_report', array('image_id' => $image_id)); - $redirect = new RedirectResponse($route); - $redirect->send(); - break; + return new RedirectResponse($route); } - $image_data = $this->image->get_image_data($image_id); - $album_data = $this->album->get_info($image_data['image_album_id']); $users_array = $report_data = array(); $open_report = false; $report_data = $this->report->get_data_by_image($image_id); @@ -617,7 +690,6 @@ public function image($image_id) $this->user_loader->load_users(array_keys($users_array)); // Now let's get some ACL $select_select = ''; - $this->gallery_auth->load_user_permissions($this->user->data['user_id']); if ($this->gallery_auth->acl_check('m_status', $album_data['album_id'], $album_data['album_user_id'])) { if ($image_data['image_status'] == 0) @@ -709,8 +781,7 @@ public function approve($image_id) if ($action === 'disapprove') { - $redirect = new RedirectResponse($this->helper->route('phpbbgallery_core_image_delete', ['image_id' => $image_id])); - $redirect->send(); + return new RedirectResponse($this->helper->route('phpbbgallery_core_image_delete', ['image_id' => $image_id])); } $show_notify = true; $this->language->add_lang(array('gallery_mcp', 'gallery'), 'phpbbgallery/core'); @@ -808,17 +879,25 @@ public function move($image_id): \Symfony\Component\HttpFoundation\Response { $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); } - $moving_target = $this->request->variable('moving_target', ''); + $moving_target = $this->request->variable('moving_target', 0); if ($moving_target) { - $target = array($image_id); - $this->image->move_image($target, $moving_target); - $message = sprintf($this->language->lang('IMAGES_MOVED', 1)); - $this->album->update_info($album_id); - $this->album->update_info($moving_target); - meta_refresh($meta_refresh_time, $image_backlink); - trigger_error($message); + $this->require_album_permission('m_move', $moving_target); + $s_hidden_fields = build_hidden_fields(array( + 'moving_target' => $moving_target, + )); + if (confirm_box(true)) + { + $target = array($image_id); + $this->image->move_image($target, $moving_target, $album_id); + $message = sprintf($this->language->lang('IMAGES_MOVED', 1)); + $this->album->update_info($album_id); + $this->album->update_info($moving_target); + meta_refresh($meta_refresh_time, $image_backlink); + trigger_error($message); + } + confirm_box(false, $this->language->lang('QUEUES_A_MOVE2_CONFIRM'), $s_hidden_fields); } else { diff --git a/core/controller/search.php b/core/controller/search.php index fbcc6de2b..b221932e0 100644 --- a/core/controller/search.php +++ b/core/controller/search.php @@ -187,6 +187,14 @@ public function base($page = 1) $sort_by_text['lc'] = $this->language->lang('NEW_COMMENT'); $sort_by_sql['lc'] = 'image_last_comment'; } + if (!isset($sort_by_sql[$sort_key])) + { + $sort_key = 't'; + } + if (!in_array($sort_dir, array('a', 'd'), true)) + { + $sort_dir = 'd'; + } $this->gallery_auth->load_user_permissions($this->user->data['user_id']); $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; @@ -200,6 +208,7 @@ public function base($page = 1) ); if ($keywords || $username || $user_id || $search_id || $submit) { + $user_id_ary = array(); // Let's resolve username to user id ... or array of them. if ($username) { @@ -214,7 +223,6 @@ public function base($page = 1) AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $this->db->sql_query_limit($sql, 100); - $user_id_ary = []; while ($row = $this->db->sql_fetchrow($result)) { $user_id_ary[] = (int) $row['user_id']; @@ -272,14 +280,12 @@ public function base($page = 1) } $sql_where[] = $search_query; - if (empty($search_album)) - { - $sql_where[] = $this->db->sql_in_set('i.image_album_id', $this->gallery_auth->acl_album_ids('i_view')); - } - else - { - $sql_where[] = $this->db->sql_in_set('i.image_album_id', $search_album); - } + $view_album_ids = array_map('intval', $this->gallery_auth->acl_album_ids('i_view')); + $requested_album_ids = array_filter(array_map('intval', $search_album)); + $search_album = empty($requested_album_ids) ? $view_album_ids : array_values(array_intersect($requested_album_ids, $view_album_ids)); + $sql_where[] = $this->db->sql_in_set('i.image_album_id', $search_album, false, true); + $sql_where[] = 'i.image_status <> ' . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED; + $sql_where[] = 'i.image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN; $sql_array['WHERE'] = implode(' and ', array_filter($sql_where)); $sql_array['SELECT'] = 'COUNT(i.image_id) as count'; @@ -293,7 +299,7 @@ public function base($page = 1) { trigger_error('NO_SEARCH_RESULTS'); } - $sql_array['SELECT'] = '*, a.album_name, a.album_status, a.album_user_id, a.album_id'; + $sql_array['SELECT'] = 'i.*, a.album_name, a.album_status, a.album_user_id, a.album_id'; $sql_array['LEFT_JOIN'] = array( array( 'FROM' => array($this->albums_table => 'a'), @@ -301,7 +307,6 @@ public function base($page = 1) ) ); $sql_array['ORDER_BY'] = $sql_order; - $sql_array['GROUP_BY'] = $sort_by_sql[$sort_key] . ', i.image_id, a.album_id'; $sql = $this->db->sql_build_query('SELECT', $sql_array); $result = $this->db->sql_query_limit($sql, $this->gallery_config->get('items_per_page'), $start); diff --git a/core/controller/upload.php b/core/controller/upload.php index 9bd929da5..b958272e9 100644 --- a/core/controller/upload.php +++ b/core/controller/upload.php @@ -170,7 +170,7 @@ public function main($album_id) $this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD'); } } - $page_title = 'Upload to "' . $album_data['album_name'] . '"'; + $page_title = $this->language->lang('UPLOAD_TO_ALBUM', $album_data['album_name']); // Before all if (!$this->check_fs()) @@ -184,6 +184,10 @@ public function main($album_id) // Anons should suffer. if ($this->request->is_ajax() && $this->user->data['is_registered']) { + if (!check_form_key('gallery')) + { + trigger_error('FORM_INVALID'); + } // So we use ajax request to upload (so we are going to copy some functions from other upload // Upload Quota Check // 1. Check album-configuration Quota diff --git a/core/ext.php b/core/ext.php index 43bf60f55..0a02bde56 100644 --- a/core/ext.php +++ b/core/ext.php @@ -74,7 +74,7 @@ function disable_step($old_state) $phpbb_notifications = $this->container->get('notification_manager'); $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.image_for_approval'); $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.image_approved'); - $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.image_not_approve'); + $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.image_not_approved'); $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.new_comment'); $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.new_image'); $phpbb_notifications->disable_notifications('phpbbgallery.core.notification.new_report'); @@ -131,6 +131,7 @@ function purge_step($old_state) $phpbb_notifications = $this->container->get('notification_manager'); $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.image_for_approval'); $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.image_approved'); + $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.image_not_approved'); $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_image'); $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_comment'); $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_report'); diff --git a/core/file/file.php b/core/file/file.php index 7999e46aa..f71930d24 100644 --- a/core/file/file.php +++ b/core/file/file.php @@ -253,8 +253,7 @@ public function write_image($destination, $quality = -1, $destroy_image = false) */ public function header_filename($file) { - $raw = $this->request->server('HTTP_USER_AGENT'); - $user_agent = htmlspecialchars($raw); + $user_agent = $this->request->server('HTTP_USER_AGENT'); // There be dragons here. // Not many follows the RFC... diff --git a/core/image/image.php b/core/image/image.php index 435cbcea7..6fdcd67dd 100644 --- a/core/image/image.php +++ b/core/image/image.php @@ -468,6 +468,38 @@ public function get_image_data($image_id) } } + /** + * Return non-orphan image IDs that actually belong to an album. + * + * @param array|int $image_ids + * @param int $album_id + * @return array + */ + public function get_image_ids_by_album($image_ids, $album_id) + { + $image_ids = array_values(array_unique(array_map('intval', (array) $image_ids))); + $album_id = (int) $album_id; + if (empty($image_ids) || !$album_id) + { + return array(); + } + + $sql = 'SELECT image_id + FROM ' . $this->table_images . ' + WHERE image_album_id = ' . (int) $album_id . ' + AND image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' + AND ' . $this->db->sql_in_set('image_id', $image_ids); + $result = $this->db->sql_query($sql); + $scoped_ids = array(); + while ($row = $this->db->sql_fetchrow($result)) + { + $scoped_ids[] = (int) $row['image_id']; + } + $this->db->sql_freeresult($result); + + return $scoped_ids; + } + /** * Approve image * @param (array) $image_id_ary The image ID array to be approved @@ -476,9 +508,16 @@ public function get_image_data($image_id) */ public function approve_images($image_id_ary, $album_id) { + $image_id_ary = $this->get_image_ids_by_album($image_id_ary, $album_id); + if (empty($image_id_ary)) + { + return; + } + $sql = 'SELECT image_id, image_name, image_user_id FROM ' . $this->table_images . ' WHERE image_status = 0 + AND image_album_id = ' . (int) $album_id . ' AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $result = $this->db->sql_query($sql); $targets = array(); @@ -504,6 +543,7 @@ public function approve_images($image_id_ary, $album_id) $sql = 'UPDATE ' . $this->table_images . ' SET image_status = ' . (int) \phpbbgallery\core\block::STATUS_APPROVED . ' WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' + AND image_album_id = ' . (int) $album_id . ' AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $this->db->sql_query($sql); } @@ -515,17 +555,25 @@ public function approve_images($image_id_ary, $album_id) */ public function unapprove_images($image_id_ary, $album_id) { + $image_id_ary = $this->get_image_ids_by_album($image_id_ary, $album_id); + if (empty($image_id_ary)) + { + return; + } + self::handle_counter($image_id_ary, false); $sql = 'UPDATE ' . $this->table_images .' SET image_status = ' . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . ' WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' + AND image_album_id = ' . (int) $album_id . ' AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $this->db->sql_query($sql); $sql = 'SELECT image_id, image_name FROM ' . $this->table_images .' WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' + AND image_album_id = ' . (int) $album_id . ' AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) @@ -542,8 +590,14 @@ public function unapprove_images($image_id_ary, $album_id) * @param $album_id * @internal param $ (int) $album_id The album we want to move image to */ - public function move_image($image_id_ary, $album_id) + public function move_image($image_id_ary, $album_id, $source_album_id) { + $image_id_ary = $this->get_image_ids_by_album($image_id_ary, $source_album_id); + if (empty($image_id_ary)) + { + return; + } + $target_data = $this->album->get_info($album_id); // Store images to cache (so we can log them) @@ -551,7 +605,8 @@ public function move_image($image_id_ary, $album_id) //TO DO - Contests $sql = 'UPDATE ' . $this->table_images . ' SET image_album_id = ' . (int) $album_id . ' - WHERE ' . $this->db->sql_in_set('image_id', $image_id_ary); + WHERE image_album_id = ' . (int) $source_album_id . ' + AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $this->db->sql_query($sql); $this->gallery_report->move_images($image_id_ary, $album_id); @@ -571,17 +626,25 @@ public function move_image($image_id_ary, $album_id) */ public function lock_images($image_id_ary, $album_id) { + $image_id_ary = $this->get_image_ids_by_album($image_id_ary, $album_id); + if (empty($image_id_ary)) + { + return; + } + self::handle_counter($image_id_ary, false); $sql = 'UPDATE ' . $this->table_images . ' SET image_status = ' . (int) \phpbbgallery\core\block::STATUS_LOCKED . ' WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' + AND image_album_id = ' . (int) $album_id . ' AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $this->db->sql_query($sql); $sql = 'SELECT image_id, image_name FROM ' . $this->table_images . ' WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' + AND image_album_id = ' . (int) $album_id . ' AND ' . $this->db->sql_in_set('image_id', $image_id_ary); $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) diff --git a/core/images/legacy/watermark.png b/core/images/legacy/watermark.png deleted file mode 100644 index c45fe8397..000000000 Binary files a/core/images/legacy/watermark.png and /dev/null differ diff --git a/core/language/bg/gallery.php b/core/language/bg/gallery.php index 755f0e26f..ebe2a250b 100644 --- a/core/language/bg/gallery.php +++ b/core/language/bg/gallery.php @@ -137,6 +137,7 @@ 'GALLERY_IMAGE' => 'Изображение', 'GALLERY_IMAGES' => 'Изображения', + 'GALLERY_TOOLS' => 'Инструменти на галерията', 'GALLERY_VIEWS' => 'Прегледи', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Напомни ми след 7 дни', @@ -371,4 +372,7 @@ // Versions 1.2.1 additions 'GALLERY_DROP' => 'Пуснете изображенията си тук', + 'GALLERY_UPLOAD_CANCEL' => 'Отказ', + 'GALLERY_UPLOAD_START' => 'Стартиране', + 'UPLOAD_TO_ALBUM' => 'Качване в „%s“', )); diff --git a/core/language/bg/install_gallery.php b/core/language/bg/install_gallery.php index b4a1a3326..9eba05417 100644 --- a/core/language/bg/install_gallery.php +++ b/core/language/bg/install_gallery.php @@ -24,114 +24,6 @@ } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'The BBCode needs to be rebuild.', - - 'CAT_CONVERT' => 'convert phpBB2', - 'CAT_CONVERT_TS' => 'convert TS Gallery', - 'CAT_UNINSTALL' => 'phpBB Gallery uninstall', - - 'CHECK_TABLES' => 'Check tables', - 'CHECK_TABLES_EXPLAIN' => 'The following tables need to exist, so they can be converted.', - - 'CONVERT_SMARTOR_INTRO' => 'Convertor from “Album-MOD“ by smartor to “phpBB Gallery“', - 'CONVERT_SMARTOR_INTRO_BODY' => 'With this convertor, you can convert your albums, images, rates and comments from the Album-MOD by Smartor (tested v2.0.56) and Full Album Pack (tested v1.4.1) to the phpBB Gallery.

Note: The permissions will not be copied.', - 'CONVERT_TS_INTRO' => 'Convertor from “TS Gallery“ to “phpBB Gallery“', - 'CONVERT_TS_INTRO_BODY' => 'With this convertor, you can convert your albums, images, rates and comments from the TS Gallery (tested v0.2.1) to the phpBB Gallery.

Note: The permissions will not be copied.', - 'CONVERT_COMPLETE_EXPLAIN' => 'Conversion from your gallery to phpBB Gallery v%s was successful.
Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory.

Please note that the permissions were not copied.

You should also clean your database from old entries, where the images are missing. This can be done in “.MODs > phpBB Gallery > Cleanup gallery“.', - - 'CONVERTED_ALBUMS' => 'The albums were successful copied.', - 'CONVERTED_COMMENTS' => 'The comments were successful copied.', - 'CONVERTED_IMAGES' => 'The images were successful copied.', - 'CONVERTED_MISC' => 'Converted miscellaneous things.', - 'CONVERTED_PERSONALS' => 'The personal albums were successful copied.', - 'CONVERTED_RATES' => 'The rates were successful copied.', - 'CONVERTED_RESYNC_ALBUMS' => 'Resynchronize album-stats.', - 'CONVERTED_RESYNC_COMMENTS' => 'Resynchronize comments.', - 'CONVERTED_RESYNC_COUNTS' => 'Resynchronize imagecounters.', - 'CONVERTED_RESYNC_RATES' => 'Resynchronize rates.', - - 'FILE_DELETE_FAIL' => 'File could not be deleted, you need to delete it manually', - 'FILE_STILL_EXISTS' => 'File still exists', - 'FILES_REQUIRED_EXPLAIN' => 'Required - In order to function correctly phpBB Gallery needs to be able to access or write to certain files or directories. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.', - 'FILES_DELETE_OUTDATED' => 'Delete outdated files', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'When you click to delete the files, they are completely deleted and can not be restored!

Please note:
If you have more styles and languages installed, you need to delete the files by hand.', - 'FILES_OUTDATED' => 'Outdated files', - 'FILES_OUTDATED_EXPLAIN' => 'Outdated - In order to deny hacking attempts, please remove the following files.', - 'FOUND_INSTALL' => 'Double Installation', - 'FOUND_INSTALL_EXPLAIN' => 'Double Installation - An Installation of the gallery was found! If you continue here, you overwrite all existing data. All albums, images and comments will be deleted! That´s why an %1$supdate%2$s recommanded.', - 'FOUND_VERSION' => 'The following version was found', - 'FOUNDER_CHECK' => 'You are a “Founder“ of this board', - 'FOUNDER_NEEDED' => 'You must be a “Founder“ of this board!', - - 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB Gallery v%s.

Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', - 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB Gallery onto your board.', - - 'GOTO_GALLERY' => 'Go to phpBB Gallery', - 'GOTO_INDEX' => 'Go to Board-Index', - - 'MISSING_CONSTANTS' => 'Before you can run the install-script, you need to upload your edited files, especially the includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Create parent standard-module', - 'MODULES_PARENT_SELECT' => 'Choose parent module', - 'MODULES_SELECT_4ACP' => 'Choose parent module for “admin control panel“', - 'MODULES_SELECT_4LOG' => 'Choose parent module for “Gallery log“', - 'MODULES_SELECT_4MCP' => 'Choose parent module for “moderation control panel“', - 'MODULES_SELECT_4UCP' => 'Choose parent module for “user control panel“', - 'MODULES_SELECT_NONE' => 'no parent module', - - 'NO_INSTALL_FOUND' => 'No installation was found!', - - 'OPTIONAL_EXIFDATA' => 'Function “exif_read_data“ exists', - 'OPTIONAL_EXIFDATA_EXP' => 'The exif-module is not loaded or installed.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'If the function exists, the exif data of the images are displayed on the imagepage.', - 'OPTIONAL_IMAGEROTATE' => 'Function “imagerotate“ exists', - 'OPTIONAL_IMAGEROTATE_EXP' => 'You should update your GD Version, which is currently “%s“.', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'If the function exists, you can rotate images while uploading and editing them.', - - 'PAYPAL_DEV_SUPPORT' => '

-

Author Notes

-

Creating, maintaining and updating this MOD required/requires a lot of time and effort, so if you like this MOD and have the desire to express your thanks through a donation, that would be greatly appreciated. My Paypal ID is nickvergessen@gmx.de, or contact me for my mailing address.

The suggested donation amount for this MOD is 25.00€ (but any amount will help).


- -

', - - 'PHP_SETTINGS' => 'PHP settings', - 'PHP_SETTINGS_EXP' => 'These PHP settings and configurations are required for installing and running the gallery.', - 'PHP_SETTINGS_OPTIONAL' => 'Optional PHP settings', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'These PHP settings are NOT required for normal usage, but will give some extra features.', - - 'REQ_GD_LIBRARY' => 'GD Library is installed', - 'REQ_PHP_VERSION' => 'php version >= %s', - 'REQ_PHPBB_VERSION' => 'phpBB version >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB Gallery. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed.', - - 'STAGE_ADVANCED_EXPLAIN' => 'Please choose the parent module for the gallery modules. In normal case you should not change them.', - 'STAGE_COPY_TABLE' => 'Copy database-tables', - 'STAGE_COPY_TABLE_EXPLAIN' => 'The database-tables for the album- and user-data have the same names in TS Gallery and phpBB Gallery. So we create a copy to be able to convert the data.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB Gallery have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB Gallery.', - 'STAGE_DELETE_TABLES' => 'Clean database', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'The database-content of the Gallery-MOD was deleted. Proceed to the next screen to finish uninstalling phpBB Gallery.', - 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB Gallery, free of charge. This includes:

The use of Beta-Versions is limited recommended. If there are updates, it’s recommended to update quickly.

Support is given on the following boards

', - - 'TABLE_ALBUM' => 'table including the images', - 'TABLE_ALBUM_CAT' => 'table including the albums', - 'TABLE_ALBUM_COMMENT' => 'table including the comments', - 'TABLE_ALBUM_CONFIG' => 'table including the configuration', - 'TABLE_ALBUM_RATE' => 'table including the rates', - 'TABLE_EXISTS' => 'exists', - 'TABLE_MISSING' => 'missing', - 'TABLE_PREFIX_EXPLAIN' => 'Prefix of phpBB2-installation', - - 'UNINSTALL_INTRO' => 'Welcome to Uninstall', - 'UNINSTALL_INTRO_BODY' => 'With this option, it is possible to uninstall phpBB Gallery from your board.

WARNING: All albums, images and comments will be deleted unrecoverable!', - 'UNINSTALL_REQUIREMENTS' => 'Requirement', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Before proceeding with the full uninstallation phpBB will carry out some tests to ensure that you are allowed to uninstall phpBB Gallery.', - 'UNINSTALL_START' => 'Uninstall', - 'UNINSTALL_FINISHED' => 'Uninstall nearly finished', - 'UNINSTALL_FINISHED_EXPLAIN' => 'You uninstalled the phpBB Gallery successfully.

Now you only need to undo the steps of the install.xml and delete the files of the gallery. Afterwards your board is completely free from the gallery.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Here you can Update your phpBB Gallery-Version.', - - 'VERSION_NOT_SUPPORTED' => 'Sorry, but your updates prior to 1.0.6 are not supported from this install/update-system.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'Трябва да деинсталирате разширението:
%s
преди да деинсталирате основното разширение.', 2 => 'Трябва да деинсталирате разширенията:
%s
преди да деинсталирате основното разширение.', diff --git a/core/language/de/gallery.php b/core/language/de/gallery.php index dc66ce613..95b3a080b 100644 --- a/core/language/de/gallery.php +++ b/core/language/de/gallery.php @@ -137,6 +137,7 @@ 'GALLERY_IMAGE' => 'Bild', 'GALLERY_IMAGES' => 'Bilder', + 'GALLERY_TOOLS' => 'Galerie-Werkzeuge', 'GALLERY_VIEWS' => 'Betrachtet', 'IGNORE_NOTUPTODATE_MESSAGE' => 'In 7 Tagen wieder erinnern', @@ -370,4 +371,7 @@ // Versions 1.2.1 additions 'GALLERY_DROP' => 'Lege Dein Bild hier rein', + 'GALLERY_UPLOAD_CANCEL' => 'Abbrechen', + 'GALLERY_UPLOAD_START' => 'Starten', + 'UPLOAD_TO_ALBUM' => 'In "%s" hochladen', )); diff --git a/core/language/de/install_gallery.php b/core/language/de/install_gallery.php index 7837bea71..54b39ce8a 100644 --- a/core/language/de/install_gallery.php +++ b/core/language/de/install_gallery.php @@ -24,114 +24,6 @@ } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'Der BBCode muss aktualisiert werden.', - - 'CAT_CONVERT' => 'phpBB2 konvertieren', - 'CAT_CONVERT_TS' => 'TS Gallery konvertieren', - 'CAT_UNINSTALL' => 'phpBB Gallery deinstallieren', - - 'CHECK_TABLES' => 'Tabellen überprüfung', - 'CHECK_TABLES_EXPLAIN' => 'Die folgenden Tabellen müssten existieren, damit sie auch übernommen werden können.', - - 'CONVERT_SMARTOR_INTRO' => 'Konverter vom „Album-MOD“ von smartor zur „phpBB Gallery“', - 'CONVERT_SMARTOR_INTRO_BODY' => 'Mit diesem Konverter, kannst du deine Alben, Bilder, Bewertungen und Kommentare aus dem Album-MOD von Smartor (getestet mit v2.0.56) und Full Album Pack (getestet mit v1.4.1) auslesen und dann in die phpBB Gallery einfügen lassen.

Achtung: Die Berechtigungen werden dabei nicht übernommen.', - 'CONVERT_TS_INTRO' => 'Konverter von der „TS Gallery“ zur „phpBB Gallery“', - 'CONVERT_TS_INTRO_BODY' => 'Mit diesem Konverter, kannst du deine Alben, Bilder, Bewertungen und Kommentare aus der TS Gallery (getestet mit v0.2.1) auslesen und dann in die phpBB Gallery einfügen lassen.

Achtung: Die Berechtigungen werden dabei nicht übernommen.', - 'CONVERT_COMPLETE_EXPLAIN' => 'Du hast nun deine Galerie erfolgreich auf die phpBB Gallery v%s konvertiert.
Bitte prüfe, ob alle Einträge richtig übernommen wurden, bevor du dein Board durch Löschen des „install“-Verzeichnisses freigibst.

Bitte beachte, dass die Berechtigungen nicht übernohmen wurden. Du musst diese also neu vergeben.

Es wird außerdem empfohlen die Datenbank von Einträgen zu befreien, bei denen die Bilder nicht mehr existieren. Dies kann im Administrations-Bereich unter „MODs > phpBB Galerie > Galerie reinigen“ getan werden.', - - 'CONVERTED_ALBUMS' => 'Die Alben wurden erfolgreich kopiert.', - 'CONVERTED_COMMENTS' => 'Die Kommentare wurden erfolgreich kopiert.', - 'CONVERTED_IMAGES' => 'Die Bilder wurden erfolgreich kopiert.', - 'CONVERTED_MISC' => 'Verschiedene Daten wurden konvertiert.', - 'CONVERTED_PERSONALS' => 'Die persönlichen Alben wurden erfolgreich erstellt.', - 'CONVERTED_RATES' => 'Die Bewertungen wurden erfolgreich kopiert.', - 'CONVERTED_RESYNC_ALBUMS' => 'Die Alben-Statistiken wurden erfolgreich resyncronisiert.', - 'CONVERTED_RESYNC_COMMENTS' => 'Die Kommentare wurden erfolgreich resyncronisiert.', - 'CONVERTED_RESYNC_COUNTS' => 'Die Zähler-Statistiken wurden erfolgreich resyncronisiert.', - 'CONVERTED_RESYNC_RATES' => 'Die Bewertungen wurden erfolgreich resyncronisiert.', - - 'FILE_DELETE_FAIL' => 'Datei konnte nicht gelöscht werden, du musst sie manuell löschen', - 'FILE_STILL_EXISTS' => 'Datei existiert noch', - 'FILES_REQUIRED_EXPLAIN' => 'Voraussetzung - die phpBB Gallery muss auf diverse Verzeichnisse zugreifen oder diese beschreiben können, um reibungslos zu funktionieren. Wenn „Nicht beschreibbar“ angezeigt wird, musst du die Befugnisse für die Datei oder das Verzeichnis so ändern, dass phpBB darauf schreiben kann.', - 'FILES_DELETE_OUTDATED' => 'Veraltete Dateien löschen', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'Wenn du die Dateien löscht, werden sie entgülig gelöscht und können nicht wiederhergestellt werden!

Hinweis:
Wenn du weitere Styles und Sprachpakete installiert hast, musst du die Dateien dort von Hand löschen.', - 'FILES_OUTDATED' => 'Veraltete Dateien', - 'FILES_OUTDATED_EXPLAIN' => 'Veraltete Dateien - bitte entferne die folgenden Dateien um mögliche Sicherheitslücken zu entfernen.', - 'FOUND_INSTALL' => 'Doppelte Installation', - 'FOUND_INSTALL_EXPLAIN' => 'Doppelte Installation - Es wurde eine Gallery Installation gefunden! Wenn du hier fortfährst, überschreibst du die bereits vorhandenen Daten. Alle Alben, Bilder und Kommentare werden dabei gelöscht! Es wird daher empfohlen nur ein %1$sUpdate%2$s zu machen.', - 'FOUND_VERSION' => 'Es wurde folgende Version gefunden', - 'FOUNDER_CHECK' => 'Du bist Gründer des Forums', - 'FOUNDER_NEEDED' => 'Du musst Gründer des Forums sein!', - - 'INSTALL_CONGRATS_EXPLAIN' => 'Du hast die phpBB Gallery v%s nun erfolgreich installiert.

Bitte lösche oder verschiebe nun das Installations-Verzeichnis „install“ oder nenne es nun um, bevor du dein Board benutzt. Solange dieses Verzeichnis existiert, ist nur der Administrations-Bereich zugänglich.', - 'INSTALL_INTRO_BODY' => 'Dieser Assistent ermöglicht dir die Installation der phpBB Gallery in deinem phpBB-Board.', - - 'GOTO_GALLERY' => 'Gehe zur phpBB Gallery', - 'GOTO_INDEX' => 'Gehe zum Forum-Index', - - 'MISSING_CONSTANTS' => 'Bevor du das Installations-Skript aufrufen kannst, musst du deine geänderten Dateien hochladen, insbesondere die includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Übergeordnetes Standard-Modul erstellen', - 'MODULES_PARENT_SELECT' => 'Übergeordnetes Modul auswählen', - 'MODULES_SELECT_4ACP' => 'Übergeordnetes Modul für den „Administrations-Bereich“', - 'MODULES_SELECT_4LOG' => 'Übergeordnetes Modul für das „Gallery-Protokoll“', - 'MODULES_SELECT_4MCP' => 'Übergeordnetes Modul für den „Moderations-Bereich“', - 'MODULES_SELECT_4UCP' => 'Übergeordnetes Modul für den „Persönlichen Bereich“', - 'MODULES_SELECT_NONE' => 'kein übergeordnetes Modul', - - 'NO_INSTALL_FOUND' => 'Es wurde keine installierte Version gefunden!', - - 'OPTIONAL_EXIFDATA' => 'Funktion „exif_read_data“ existiert', - 'OPTIONAL_EXIFDATA_EXP' => 'Das Exif-Modul ist nicht installiert oder geladen.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'Wenn die Funktion existiert, werden auf der imagepage die Exif Daten zu den Bildern mit angezeigt.', - 'OPTIONAL_IMAGEROTATE' => 'Funktion „imagerotate“ existiert', - 'OPTIONAL_IMAGEROTATE_EXP' => 'Du musst deine GD Version, derzeit „%s“, aktualisieren.', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'Wenn die Funktion existiert, können Bilder während dem Hochladen und Bearbeiten gedreht werden.', - - 'PAYPAL_DEV_SUPPORT' => '

-

Hinweise des Autors

-

Das Erstellen, Warten und Aktualisieren dieser MOD hat viel Zeit und Mühe in Anspruch genommen und das wird auch in Zukunft so bleiben. Wenn dir die MOD gefällt und du dies gerne mit einer Spende zeigen möchtest, würde mich das sehr freuen. Meine Paypal ID ist nickvergessen@gmx.de, oder kontaktiere mich per Email.

Die empfohlene Spendenhöhe für diese MOD beträgt 25,00€ (aber jeder Betrag hilft).


- -

', - - 'PHP_SETTINGS' => 'PHP Einstellungen', - 'PHP_SETTINGS_EXP' => 'Diese PHP Einstellungen und Konfigurationen werden benötigt um die Gallery zu installieren und korrekt benutzen zu können.', - 'PHP_SETTINGS_OPTIONAL' => 'Optionale PHP Einstellungen', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'Diese PHP Einstellungen werden NICHT zwingend benötigt, aber ermöglichen einige Extra-Features.', - - 'REQ_GD_LIBRARY' => 'GD Library ist installiert', - 'REQ_PHP_VERSION' => 'php version >= %s', - 'REQ_PHPBB_VERSION' => 'phpBB version >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Bevor die Installation fortgesetzt werden kann, wird phpBB einige Tests zu deiner Server-Konfiguration und deinen Dateien durchführen, um sicherzustellen, dass du die phpBB Gallery installieren und benutzen kannst. Bitte lies die Ergebnisse aufmerksam durch und fahre nicht weiter fort, bevor alle erforderlichen Tests bestanden sind.', - - 'STAGE_ADVANCED_EXPLAIN' => 'Bitte wähle die übergeordneten Module für die Module der phpBB Gallery aus. Im Normalfall solltest du diese Einstellungen nicht verändern.', - 'STAGE_COPY_TABLE' => 'Datenbank-Tabellen kopieren', - 'STAGE_COPY_TABLE_EXPLAIN' => 'Die Datenbank-Tabellen mit den Alben und Benutzer-Informationen der TS Gallery haben die gleichen Namen wie die der phpBB Gallery. Es wurde daher eine Kopie angelegt, um die Daten trotzdem importieren zu können.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'Die von der phpBB Gallery genutzten Datenbank-Tabellen wurden nun erstellt und mit einigen Ausgangswerten gefüllt. Geh weiter zum nächsten Schritt, um die Installation der phpBB Gallery abzuschließen.', - 'STAGE_DELETE_TABLES' => 'Datenbank reinigen', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'Die von der phpBB Gallery genutzten Datenbank-Inhalte wurden gelöscht. Geh weiter zum nächsten Schritt, um die Deinstallation der phpBB Gallery abzuschließen.', - 'SUPPORT_BODY' => 'Für die aktuelle, stabile Version der „phpBB Gallery“ wird kostenloser Support gewährt. Dies umfasst:

Die Verwendung der Beta-Versionen wird nur beschränkt empfohlen. Sollte ein neues Update erscheinen, wird empfohlen das Update schnell durchzuführen.

Support gibt es in folgenden Foren:

', - - 'TABLE_ALBUM' => 'Tabelle mit den Bildern', - 'TABLE_ALBUM_CAT' => 'Tabelle mit den Alben', - 'TABLE_ALBUM_COMMENT' => 'Tabelle mit den Kommentaren', - 'TABLE_ALBUM_CONFIG' => 'Tabelle mit den Konfigurationswerten', - 'TABLE_ALBUM_RATE' => 'Tabelle mit den Bewertungen', - 'TABLE_EXISTS' => 'vorhanden', - 'TABLE_MISSING' => 'fehlt', - 'TABLE_PREFIX_EXPLAIN' => 'Präfix der phpBB2-Installation', - - 'UNINSTALL_INTRO' => 'Willkommen bei der Deinstallation', - 'UNINSTALL_INTRO_BODY' => 'Dieser Assistent ermöglicht dir die Deinstallation der phpBB Gallery aus deinem phpBB-Board.

ACHTUNG: Dabei werden alle Alben, Bilder und Kommentare unwiderruflich gelöscht!', - 'UNINSTALL_REQUIREMENTS' => 'Vorraussetzungen', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Bevor die Deinstallation fortgesetzt werden kann, wird phpBB ein paar Tests durchgeführt, um sicherzustellen, dass du die phpBB Gallery deinstallieren darfst.', - 'UNINSTALL_START' => 'Deinstallieren', - 'UNINSTALL_FINISHED' => 'Deinstallation fast abgeschlossen', - 'UNINSTALL_FINISHED_EXPLAIN' => 'Du hast die phpBB Gallery erfolgreich deinstalliert.

Du musst nun nur noch die Schritte aus der install.xml rückgäng machen und die Dateien der Gallery löschen, danach ist dein Forum komplett von der Gallery bereinigt.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Mit dieser Option kannst du deine phpBB Gallery-Version auf den neuesten Stand bringen.', - - 'VERSION_NOT_SUPPORTED' => 'Leider konnte das Update-Schema für Versionen < 1.0.6 nicht übernommen werden.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'Sie müssen die Erweiterung deinstallieren:
%s
bevor Sie die Kern-Erweiterung deinstallieren können.', 2 => 'Sie müssen die Erweiterungen deinstallieren:
%s
bevor Sie die Kern-Erweiterung deinstallieren können.', diff --git a/core/language/en/gallery.php b/core/language/en/gallery.php index 4916d7415..9d3f817ec 100644 --- a/core/language/en/gallery.php +++ b/core/language/en/gallery.php @@ -136,6 +136,7 @@ 'GALLERY_IMAGE' => 'Image', 'GALLERY_IMAGES' => 'Images', + 'GALLERY_TOOLS' => 'Gallery tools', 'GALLERY_VIEWS' => 'Views', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Remind me in 7 days', @@ -306,6 +307,9 @@ 'UNWATCHED_PEGAS' => 'You are no longer automatically subscribed to new personal galleries.', 'UPLOAD_ERROR' => 'While uploading “%1$s“ the following error occurred:
» %2$s', 'UPLOAD_IMAGE' => 'Upload Image', + 'GALLERY_UPLOAD_CANCEL' => 'Cancel', + 'GALLERY_UPLOAD_START' => 'Start', + 'UPLOAD_TO_ALBUM' => 'Upload to "%s"', 'UPLOAD_IMAGE_SIZE_TOO_BIG' => 'Your image dimension size is too large', 'UPLOAD_NO_FILE' => 'You must enter your path and filename', 'UPLOADED_BY_USER' => 'Uploaded by', diff --git a/core/language/en/gallery_acp.php b/core/language/en/gallery_acp.php index 761e2a24b..95ddf41ae 100644 --- a/core/language/en/gallery_acp.php +++ b/core/language/en/gallery_acp.php @@ -43,7 +43,7 @@ 'ALBUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a album and decide where you want to put the images it contained', 'ALBUM_DELETED' => 'This album has been deleted successfully.', 'ALBUM_DESC' => 'Description', - 'ALBUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is.', + 'ALBUM_DESC_EXPLAIN' => 'The album description is parsed according to the selected BBCode, smilies, and URL options.', 'ALBUM_DESC_TOO_LONG' => 'The album description is too long, it must be less than 4000 characters.', 'ALBUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this album. Please note that moderation control are set via album permissions for each user or usergroup.', 'ALBUM_ID' => 'Album-ID', diff --git a/core/language/en/install_gallery.php b/core/language/en/install_gallery.php index 38cf3cee6..21d455817 100644 --- a/core/language/en/install_gallery.php +++ b/core/language/en/install_gallery.php @@ -23,114 +23,6 @@ } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'The BBCode needs to be rebuild.', - - 'CAT_CONVERT' => 'convert phpBB2', - 'CAT_CONVERT_TS' => 'convert TS Gallery', - 'CAT_UNINSTALL' => 'phpBB Gallery uninstall', - - 'CHECK_TABLES' => 'Check tables', - 'CHECK_TABLES_EXPLAIN' => 'The following tables need to exist, so they can be converted.', - - 'CONVERT_SMARTOR_INTRO' => 'Convertor from “Album-MOD“ by smartor to “phpBB Gallery“', - 'CONVERT_SMARTOR_INTRO_BODY' => 'With this convertor, you can convert your albums, images, rates and comments from the Album-MOD by Smartor (tested v2.0.56) and Full Album Pack (tested v1.4.1) to the phpBB Gallery.

Note: The permissions will not be copied.', - 'CONVERT_TS_INTRO' => 'Convertor from “TS Gallery“ to “phpBB Gallery“', - 'CONVERT_TS_INTRO_BODY' => 'With this convertor, you can convert your albums, images, rates and comments from the TS Gallery (tested v0.2.1) to the phpBB Gallery.

Note: The permissions will not be copied.', - 'CONVERT_COMPLETE_EXPLAIN' => 'Conversion from your gallery to phpBB Gallery v%s was successful.
Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory.

Please note that the permissions were not copied.

You should also clean your database from old entries, where the images are missing. This can be done in “.MODs > phpBB Gallery > Cleanup gallery“.', - - 'CONVERTED_ALBUMS' => 'The albums were successful copied.', - 'CONVERTED_COMMENTS' => 'The comments were successful copied.', - 'CONVERTED_IMAGES' => 'The images were successful copied.', - 'CONVERTED_MISC' => 'Converted miscellaneous things.', - 'CONVERTED_PERSONALS' => 'The personal albums were successful copied.', - 'CONVERTED_RATES' => 'The rates were successful copied.', - 'CONVERTED_RESYNC_ALBUMS' => 'Resynchronize album-stats.', - 'CONVERTED_RESYNC_COMMENTS' => 'Resynchronize comments.', - 'CONVERTED_RESYNC_COUNTS' => 'Resynchronize image counters.', - 'CONVERTED_RESYNC_RATES' => 'Resynchronize rates.', - - 'FILE_DELETE_FAIL' => 'File could not be deleted, you need to delete it manually', - 'FILE_STILL_EXISTS' => 'File still exists', - 'FILES_REQUIRED_EXPLAIN' => 'Required - In order to function correctly phpBB Gallery needs to be able to access or write to certain files or directories. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.', - 'FILES_DELETE_OUTDATED' => 'Delete outdated files', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'When you click to delete the files, they are completely deleted and can not be restored!

Please note:
If you have more styles and languages installed, you need to delete the files by hand.', - 'FILES_OUTDATED' => 'Outdated files', - 'FILES_OUTDATED_EXPLAIN' => 'Outdated - In order to deny hacking attempts, please remove the following files.', - 'FOUND_INSTALL' => 'Double Installation', - 'FOUND_INSTALL_EXPLAIN' => 'Double Installation - An Installation of the gallery was found! If you continue here, you overwrite all existing data. All albums, images and comments will be deleted! That´s why an %1$supdate%2$s recommanded.', - 'FOUND_VERSION' => 'The following version was found', - 'FOUNDER_CHECK' => 'You are a “Founder“ of this board', - 'FOUNDER_NEEDED' => 'You must be a “Founder“ of this board!', - - 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB Gallery v%s.

Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', - 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB Gallery onto your board.', - - 'GOTO_GALLERY' => 'Go to phpBB Gallery', - 'GOTO_INDEX' => 'Go to Board-Index', - - 'MISSING_CONSTANTS' => 'Before you can run the install-script, you need to upload your edited files, especially the includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Create parent standard-module', - 'MODULES_PARENT_SELECT' => 'Choose parent module', - 'MODULES_SELECT_4ACP' => 'Choose parent module for “admin control panel“', - 'MODULES_SELECT_4LOG' => 'Choose parent module for “Gallery log“', - 'MODULES_SELECT_4MCP' => 'Choose parent module for “moderation control panel“', - 'MODULES_SELECT_4UCP' => 'Choose parent module for “user control panel“', - 'MODULES_SELECT_NONE' => 'no parent module', - - 'NO_INSTALL_FOUND' => 'No installation was found!', - - 'OPTIONAL_EXIFDATA' => 'Function “exif_read_data“ exists', - 'OPTIONAL_EXIFDATA_EXP' => 'The exif-module is not loaded or installed.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'If the function exists, the exif data of the images are displayed on the imagepage.', - 'OPTIONAL_IMAGEROTATE' => 'Function “imagerotate“ exists', - 'OPTIONAL_IMAGEROTATE_EXP' => 'You should update your GD Version, which is currently “%s“.', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'If the function exists, you can rotate images while uploading and editing them.', - - 'PAYPAL_DEV_SUPPORT' => '

-

Author Notes

-

Creating, maintaining and updating this MOD required/requires a lot of time and effort, so if you like this MOD and have the desire to express your thanks through a donation, that would be greatly appreciated. My Paypal ID is nickvergessen@gmx.de, or contact me for my mailing address.

The suggested donation amount for this MOD is 25.00€ (but any amount will help).


- -

', - - 'PHP_SETTINGS' => 'PHP settings', - 'PHP_SETTINGS_EXP' => 'These PHP settings and configurations are required for installing and running the gallery.', - 'PHP_SETTINGS_OPTIONAL' => 'Optional PHP settings', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'These PHP settings are NOT required for normal usage, but will give some extra features.', - - 'REQ_GD_LIBRARY' => 'GD Library is installed', - 'REQ_PHP_VERSION' => 'php version >= %s', - 'REQ_PHPBB_VERSION' => 'phpBB version >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB Gallery. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed.', - - 'STAGE_ADVANCED_EXPLAIN' => 'Please choose the parent module for the gallery modules. In normal case you should not change them.', - 'STAGE_COPY_TABLE' => 'Copy database-tables', - 'STAGE_COPY_TABLE_EXPLAIN' => 'The database-tables for the album- and user-data have the same names in TS Gallery and phpBB Gallery. So we create a copy to be able to convert the data.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB Gallery have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB Gallery.', - 'STAGE_DELETE_TABLES' => 'Clean database', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'The database-content of the Gallery-MOD was deleted. Proceed to the next screen to finish uninstalling phpBB Gallery.', - 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB Gallery, free of charge. This includes:

The use of Beta-Versions is limited recommended. If there are updates, it’s recommended to update quickly.

Support is given on the following boards

', - - 'TABLE_ALBUM' => 'table including the images', - 'TABLE_ALBUM_CAT' => 'table including the albums', - 'TABLE_ALBUM_COMMENT' => 'table including the comments', - 'TABLE_ALBUM_CONFIG' => 'table including the configuration', - 'TABLE_ALBUM_RATE' => 'table including the rates', - 'TABLE_EXISTS' => 'exists', - 'TABLE_MISSING' => 'missing', - 'TABLE_PREFIX_EXPLAIN' => 'Prefix of phpBB2-installation', - - 'UNINSTALL_INTRO' => 'Welcome to Uninstall', - 'UNINSTALL_INTRO_BODY' => 'With this option, it is possible to uninstall phpBB Gallery from your board.

WARNING: All albums, images and comments will be deleted unrecoverable!', - 'UNINSTALL_REQUIREMENTS' => 'Requirement', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Before proceeding with the full uninstallation phpBB will carry out some tests to ensure that you are allowed to uninstall phpBB Gallery.', - 'UNINSTALL_START' => 'Uninstall', - 'UNINSTALL_FINISHED' => 'Uninstall nearly finished', - 'UNINSTALL_FINISHED_EXPLAIN' => 'You uninstalled the phpBB Gallery successfully.

Now you only need to undo the steps of the install.xml and delete the files of the gallery. Afterwards your board is completely free from the gallery.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Here you can Update your phpBB Gallery-Version.', - - 'VERSION_NOT_SUPPORTED' => 'Sorry, but your updates prior to 1.0.6 are not supported from this install/update-system.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'You must uninstall the extension:
%s
before uninstalling the core extension.', 2 => 'You must uninstall the extensions:
%s
before uninstalling the core extension.', diff --git a/core/language/es/gallery.php b/core/language/es/gallery.php index b4833fb98..71785c2e4 100644 --- a/core/language/es/gallery.php +++ b/core/language/es/gallery.php @@ -137,6 +137,7 @@ 'GALLERY_IMAGE' => 'Imagen', 'GALLERY_IMAGES' => 'Imágenes', + 'GALLERY_TOOLS' => 'Herramientas de la galería', 'GALLERY_VIEWS' => 'Vistas', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Recuérdeme en 7 días', @@ -372,4 +373,7 @@ // Versions 1.2.1 additions 'GALLERY_DROP' => 'Deja tus imágenes aquí', + 'GALLERY_UPLOAD_CANCEL' => 'Cancelar', + 'GALLERY_UPLOAD_START' => 'Iniciar', + 'UPLOAD_TO_ALBUM' => 'Subir a "%s"', )); diff --git a/core/language/es/install_gallery.php b/core/language/es/install_gallery.php index 39e2daa8b..546a7f74a 100644 --- a/core/language/es/install_gallery.php +++ b/core/language/es/install_gallery.php @@ -24,114 +24,6 @@ } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'El BBCode necesita ser reconstruido.', - - 'CAT_CONVERT' => 'convertir phpBB2', - 'CAT_CONVERT_TS' => 'Convertir Galería de TS', - 'CAT_UNINSTALL' => 'Desinstalación de la galería phpBB', - - 'CHECK_TABLES' => 'Comprobar tablas', - 'CHECK_TABLES_EXPLAIN' => 'Las siguientes tablas deben existir, para que puedan ser convertidas.', - - 'CONVERT_SMARTOR_INTRO' => 'Convertidor de "Album-MOD" por smartor a "phpBB Gallery"', - 'CONVERT_SMARTOR_INTRO_BODY' => 'Con este convertidor, puede convertir sus álbumes, imágenes, tarifas y comentarios de la Album-MOD por Smartor (probado v2.0.56) y Paquete completo de álbumes (probado v1.4.1) A la galería phpBB.

Nota: los permisos no se copiarán .', - 'CONVERT_TS_INTRO' => 'Convertidor desde "TS Gallery" a "phpBB Gallery"', - 'CONVERT_TS_INTRO_BODY' => 'Con este convertidor, puede convertir sus álbumes, imágenes, tarifas y comentarios de la Galería TS (probado v0.2.1) en la galería phpBB.

Nota: los permisos no serán Copiado . ', - 'CONVERT_COMPLETE_EXPLAIN' => 'La conversión de tu galería a phpBB Gallery v%s tuvo éxito.
Por favor, asegúrate de que los ajustes se transfirieron correctamente antes de habilitar tu directorio borrando el directorio de instalación.

< Strong> Tenga en cuenta que los permisos no se copiaron.

También debe limpiar su base de datos de entradas antiguas, donde faltan las imágenes. Esto se puede hacer en ".MODs> phpBB Gallery> Galería de limpieza". ', - - 'CONVERTED_ALBUMS' => 'Los álbumes se copiaron con éxito.', - 'CONVERTED_COMMENTS' => 'Los comentarios se copiaron correctamente.', - 'CONVERTED_IMAGES' => 'Las imágenes se copiaron con éxito.', - 'CONVERTED_MISC' => 'Convertido cosas misceláneas.', - 'CONVERTED_PERSONALS' => 'Los álbumes personales se copiaron con éxito.', - 'CONVERTED_RATES' => 'Las tasas se copiaron con éxito.', - 'CONVERTED_RESYNC_ALBUMS' => 'Resincronizar las estadísticas del álbum.', - 'CONVERTED_RESYNC_COMMENTS' => 'Resincronizar comentarios.', - 'CONVERTED_RESYNC_COUNTS' => 'Resincronizar imagecounters.', - 'CONVERTED_RESYNC_RATES' => 'Resincronizar las tasas.', - - 'FILE_DELETE_FAIL' => 'No se pudo eliminar el archivo, es necesario eliminarlo manualmente', - 'FILE_STILL_EXISTS' => 'El archivo aún existe', - 'FILES_REQUIRED_EXPLAIN' => 'Obligatorio - Para funcionar correctamente, phpBB Gallery debe poder acceder o escribir en ciertos archivos o directorios. Si ve "No escritura" necesita cambiar los permisos en el archivo o directorio para permitir que phpBB le escriba. ', - 'FILES_DELETE_OUTDATED' => 'Eliminar archivos obsoletos', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'Cuando haga clic para borrar los archivos, se eliminan completamente y no se pueden restaurar!

Tenga en cuenta:
Si tiene más estilos e idiomas instalados, necesita Para borrar los archivos a mano. ', - 'FILES_OUTDATED' => 'Archivos obsoletos', - 'FILES_OUTDATED_EXPLAIN' => 'Desactualizado - Para negar los intentos de piratería, elimine los siguientes archivos.', - 'FOUND_INSTALL' => 'Doble instalación', - 'FOUND_INSTALL_EXPLAIN' => 'Doble instalación - Se encontró una instalación de la galería. Si continúa aquí, sobrescribirá todos los datos existentes. ¡Todos los álbumes, imágenes y comentarios serán borrados! Por eso se recomienda una %1$sactualización%2$s,', - 'FOUND_VERSION' => 'Se encontró la siguiente versión', - 'FOUNDER_CHECK' => 'Usted es un "Fundador" de este foro', - 'FOUNDER_NEEDED' => 'Debes ser un "Fundador" de este foro!', - - 'INSTALL_CONGRATS_EXPLAIN' => 'Ahora has instalado correctamente phpBB Gallery v%s.

Ahora debes borrar, mover o renombrar el directorio de instalación antes de usar tu tabla. Si este directorio aún está presente, sólo se podrá acceder al panel de control de administración (ACP).', - 'INSTALL_INTRO_BODY' => 'Con esta opción, es posible instalar phpBB Gallery en tu directorio.', - - 'GOTO_GALLERY' => 'Ir a la galería phpBB', - 'GOTO_INDEX' => 'Ir al Índice del Principal', - - 'MISSING_CONSTANTS' => 'Antes de poder ejecutar el script de instalación, debe cargar sus archivos editados, especialmente el archivo includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Crear padre-módulo estándar', - 'MODULES_PARENT_SELECT' => 'Elija el módulo padre', - 'MODULES_SELECT_4ACP' => 'Elija el módulo principal para "panel de control admin"', - 'MODULES_SELECT_4LOG' => 'Elija el módulo principal para "Galería de registro"', - 'MODULES_SELECT_4MCP' => 'Elija el módulo principal para "panel de control de moderación"', - 'MODULES_SELECT_4UCP' => 'Elija el módulo principal para "panel de control del usuario"', - 'MODULES_SELECT_NONE' => 'sin módulo padre', - - 'NO_INSTALL_FOUND' => 'No se encontró ninguna instalación!', - - 'OPTIONAL_EXIFDATA' => 'Función "exif_read_data" existe', - 'OPTIONAL_EXIFDATA_EXP' => 'El módulo exif no está cargado o instalado.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'Si la función existe, los datos exif de las imágenes se muestran en la página de imagen.', - 'OPTIONAL_IMAGEROTATE' => 'Función "imagerotate" existe', - 'OPTIONAL_IMAGEROTATE_EXP' => 'Debes actualizar tu versión de GD, que es actualmente "%s".', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'Si la función existe, puede girar las imágenes mientras las sube y edita.', - - 'PAYPAL_DEV_SUPPORT' => '

-

Notas de autor

-

Crear, mantener y actualizar este MOD requiere/requiere mucho tiempo y esfuerzo, así que si te gusta este MOD y tiene el deseo de expresar tus gracias a través de una donación, eso sería muy apreciado. Mi ID de Paypal es nickvergessen@gmx.de, o póngase en contacto conmigo para mi dirección de correo.

La cantidad de donación sugerida para este MOD es de 25.00 € (pero cualquier cantidad ayudará).


- -

', - - 'PHP_SETTINGS' => 'Ajustes de PHP', - 'PHP_SETTINGS_EXP' => 'Estos ajustes y configuraciones de PHP son necesarios para instalar y ejecutar la galería.', - 'PHP_SETTINGS_OPTIONAL' => 'Ajustes opcionales de PHP', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'Estas configuraciones de PHP son NOT necesarias para el uso normal, pero darán algunas características adicionales.', - - 'REQ_GD_LIBRARY' => 'Biblioteca de GD está instalada', - 'REQ_PHP_VERSION' => 'versión de php >= %s', - 'REQ_PHPBB_VERSION' => 'versión de phpBB >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Antes de continuar con la instalación completa phpBB realizará algunas pruebas en la configuración y los archivos del servidor para asegurarse de que es capaz de instalar y ejecutar phpBB Gallery. Asegúrese de leer detenidamente los resultados y no proceda hasta que se hayan superado todas las pruebas necesarias. ', - - 'STAGE_ADVANCED_EXPLAIN' => 'Por favor elija el módulo padre para los módulos de la galería. En el caso normal no debe cambiarlos. ', - 'STAGE_COPY_TABLE' => 'Copiar tablas de base de datos', - 'STAGE_COPY_TABLE_EXPLAIN' => 'Las tablas de base de datos para el álbum y el usuario tienen los mismos nombres en la Galería de TS y en la Galería de phpBB. Así que creamos una copia para poder convertir los datos. ', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'Las tablas de base de datos utilizadas por phpBB Gallery han sido creadas y rellenadas con algunos datos iniciales. Vaya a la siguiente pantalla para terminar de instalar phpBB Gallery. ', - 'STAGE_DELETE_TABLES' => 'Limpiar base de datos', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'Se eliminó el contenido de la base de datos de Gallery-MOD. Vaya a la siguiente pantalla para terminar de desinstalar phpBB Gallery. ', - 'SUPPORT_BODY' => 'Se proporcionará soporte completo para la versión estable actual de phpBB Gallery, de forma gratuita. Esto incluye:

  • problemas
  • problemas relacionados con posibles errores en el software

    • Se recomienda limitar el uso de versiones Beta. Si hay actualizaciones, se recomienda actualizar rápidamente.

    Se ofrece soporte en las siguientes placas

    ', - - 'TABLE_ALBUM' => 'tabla que incluye las imágenes', - 'TABLE_ALBUM_CAT' => 'tabla incluyendo los álbumes', - 'TABLE_ALBUM_COMMENT' => 'tabla incluyendo los comentarios', - 'TABLE_ALBUM_CONFIG' => 'tabla incluyendo la configuración', - 'TABLE_ALBUM_RATE' => 'tabla incluyendo las tarifas', - 'TABLE_EXISTS' => 'existe', - 'TABLE_MISSING' => 'faltantes', - 'TABLE_PREFIX_EXPLAIN' => 'Prefijo de phpBB2-instalación', - - 'UNINSTALL_INTRO' => 'Bienvenido a Desinstalar', - 'UNINSTALL_INTRO_BODY' => 'Con esta opción, es posible desinstalar phpBB Gallery de tu foro.

    ADVERTENCIA: ¡Todos los álbumes, imágenes y comentarios serán eliminados e irrecuperables! ,', - 'UNINSTALL_REQUIREMENTS' => 'Requerimiento', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Antes de proceder con la desinstalación completa phpBB realizará algunas pruebas para asegurarse de que se le permite desinstalar phpBB Gallery.', - 'UNINSTALL_START' => 'Desinstalar', - 'UNINSTALL_FINISHED' => 'Desinstalar casi terminado', - 'UNINSTALL_FINISHED_EXPLAIN' => 'Desinstalaste la galería phpBB con éxito.

    Ahora solo necesitas deshacer los pasos de install.xml y borrar los archivos de la galería. Después su tablero está completamente libre de la galería. ', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Aquí puedes actualizar tu versión de la galería de phpBB.', - - 'VERSION_NOT_SUPPORTED' => 'Lo sentimos, pero sus actualizaciones anteriores a 1.0.6 no son compatibles con este sistema de instalación / actualización.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'Debe desinstalar la extensión:
    %s
    antes de desinstalar la extensión principal.', 2 => 'Debe desinstalar las extensiones:
    %s
    antes de desinstalar la extensión principal.', diff --git a/core/language/fr/gallery.php b/core/language/fr/gallery.php index f105e233c..b0e0fb31e 100644 --- a/core/language/fr/gallery.php +++ b/core/language/fr/gallery.php @@ -153,6 +153,7 @@ 'GALLERY_IMAGE' => 'Image', 'GALLERY_IMAGES' => 'Images', + 'GALLERY_TOOLS' => 'Outils de la galerie', 'GALLERY_VIEWS' => 'Vues', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Rappelez-le moi dans une semaine', @@ -387,4 +388,7 @@ // Versions 1.2.1 additions 'GALLERY_DROP' => 'Déposez vos images ici', + 'GALLERY_UPLOAD_CANCEL' => 'Annuler', + 'GALLERY_UPLOAD_START' => 'Démarrer', + 'UPLOAD_TO_ALBUM' => 'Téléverser vers « %s »', )); diff --git a/core/language/fr/install_gallery.php b/core/language/fr/install_gallery.php index 9f076d477..87a7b0733 100644 --- a/core/language/fr/install_gallery.php +++ b/core/language/fr/install_gallery.php @@ -40,114 +40,6 @@ // $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'Le BBCode a besoin d’être reconstruit.', - - 'CAT_CONVERT' => 'Convertir phpBB2', - 'CAT_CONVERT_TS' => 'Convertir TS Gallery', - 'CAT_UNINSTALL' => 'Désinstaller Galerie phpBB', - - 'CHECK_TABLES' => 'Vérifier les tables', - 'CHECK_TABLES_EXPLAIN' => 'Les tables suivantes doivent exister, pour qu’elles puissent être converties.', - - 'CONVERT_SMARTOR_INTRO' => 'Convertir « Album-MOD » par Smartor en « Galerie phpBB »', - 'CONVERT_SMARTOR_INTRO_BODY' => 'Avec ce convertisseur, vous pouvez convertir les albums, images, notes et commentaires du Album-MOD par Smartor (v2.0.56 testée) et du Full Album Pack (v1.4.1 testée) en Galerie phpBB.

    Remarque : Les permissions ne seront pas copiées.', - 'CONVERT_TS_INTRO' => 'Convertir « TS Gallery » en « Galerie phpBB »', - 'CONVERT_TS_INTRO_BODY' => 'Avec ce convertisseur, vous pouvez convertir les albums, images, notes et commentaires du TS Gallery (v0.2.1 testée) en Galerie phpBB.

    Remarque : Les permissions ne seront pas copiées.', - 'CONVERT_COMPLETE_EXPLAIN' => 'La conversion de votre galerie en Galerie phpBB v%s a été réalisée avec succès.
    Merci de vérifier que les paramètres ont bien été transférés avant d’activer votre forum, en supprimant le répertoire d’installation.

    Merci de noter que les permissions n’ont pas été copiées.

    Vous devez aussi nettoyer votre base de données des anciennes entrées, ainsi que les images manquantes. Actions disponibles depuis la page « EXTENSIONS > Galerie > Nettoyage de la Galerie ».', - - 'CONVERTED_ALBUMS' => 'Les albums ont été copiés avec succès.', - 'CONVERTED_COMMENTS' => 'Les commentaires ont été copiés avec succès.', - 'CONVERTED_IMAGES' => 'Les images ont été copiées avec succès.', - 'CONVERTED_MISC' => 'Autres paramètres convertis.', - 'CONVERTED_PERSONALS' => 'Les albums personnels ont été copiés avec succès.', - 'CONVERTED_RATES' => 'Les notes ont été copiées avec succès.', - 'CONVERTED_RESYNC_ALBUMS' => 'Resynchroniser les statistiques des albums.', - 'CONVERTED_RESYNC_COMMENTS' => 'Resynchroniser les commentaires.', - 'CONVERTED_RESYNC_COUNTS' => 'Resynchroniser les compteurs d’images.', - 'CONVERTED_RESYNC_RATES' => 'Resynchroniser les notes.', - - 'FILE_DELETE_FAIL' => 'Le fichier ne peut être supprimé. Vous devez le supprimer manuellement.', - 'FILE_STILL_EXISTS' => 'Le fichier existe encore', - 'FILES_REQUIRED_EXPLAIN' => 'Requis - Afin de fonctionner correctement, la Galerie phpBB doit pouvoir accéder ou écrire certains fichiers ou répertoires. Si vous voyez « Non accessible en écriture », vous devez modifier les permissions du fichier ou du répertoire, afin de permettre à phpBB de l’écrire.', - 'FILES_DELETE_OUTDATED' => 'Supprimez les fichiers obsolètes', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'Lorsque vous cliquez sur « Supprimer les fichiers », ils seront complètement supprimés et il ne sera pas possible de les restaurer !

    Remarque :
    Si vous avez d’autres styles ou d’autres packs de langues, veuillez les supprimer manuellement.', - 'FILES_OUTDATED' => 'Fichiers obsolètes', - 'FILES_OUTDATED_EXPLAIN' => 'Obsolète - Afin d’éviter les tentatives de piratage, merci de supprimer les fichiers suivants.', - 'FOUND_INSTALL' => 'Installation en double', - 'FOUND_INSTALL_EXPLAIN' => 'Installation en double - Une autre installation de la galerie a été trouvée ! Si vous continuez, toutes les données existantes seront écrasées. Tous les albums, toutes les images et tous les commentaires seront supprimés ! C’est pourquoi une %1$smise à jour%2$s est recommandée.', - 'FOUND_VERSION' => 'La version suivante a été trouvée.', - 'FOUNDER_CHECK' => 'Vous êtes le/la « Fondateur(trice) » de ce forum.', - 'FOUNDER_NEEDED' => 'Vous devez être le/la « Fondateur(trice) » de ce forum !', - - 'INSTALL_CONGRATS_EXPLAIN' => 'Vous avez installé la Galerie phpBB v%s avec succès.

    Merci de supprimer, déplacer ou renommer le répertoire « install » avant d’utiliser votre Forum. Si ce répertoire est toujours présent, seul le Panneau d’administration sera accessible.', - 'INSTALL_INTRO_BODY' => 'Avec cette option, il est possible d’installer la Galerie phpBB sur votre Forum.', - - 'GOTO_GALLERY' => 'Aller à la Galerie phpBB', - 'GOTO_INDEX' => 'Aller à l’index du Forum', - - 'MISSING_CONSTANTS' => 'Avant de pouvoir exécuter le script d’installation, vous devez charger les fichiers modifiés, surtout le fichier « includes/constants.php ».', - 'MODULES_CREATE_PARENT' => 'Créer un module parent standard', - 'MODULES_PARENT_SELECT' => 'Choisir le module parent', - 'MODULES_SELECT_4ACP' => 'Choisir le module parent pour le « Panneau d’administration »', - 'MODULES_SELECT_4LOG' => 'Choisir le module parent pour le « Journal de la Galerie »', - 'MODULES_SELECT_4MCP' => 'Choisir le module parent pour le « Panneau de modération »', - 'MODULES_SELECT_4UCP' => 'Choisir le module parent pour le « Panneau de l’utilisateur »', - 'MODULES_SELECT_NONE' => 'Aucun module parent', - - 'NO_INSTALL_FOUND' => 'Aucune installation n’a été trouvée !', - - 'OPTIONAL_EXIFDATA' => 'La fonction « exif_read_data » existe.', - 'OPTIONAL_EXIFDATA_EXP' => 'Le module « Informations sur les images » n’est pas chargé ou n’est pas installé.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'Si la fonction existe, les informations des images sont affichées sur la page des images.', - 'OPTIONAL_IMAGEROTATE' => 'La fonction « imagerotate » existe.', - 'OPTIONAL_IMAGEROTATE_EXP' => 'Vous devriez mettre à jour votre version de GD, qui est actuellement à la version « %s ».', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'Si la fonction existe, vous pourrez faire pivoter les images qui ont été chargées et modifiées.', - - 'PAYPAL_DEV_SUPPORT' => '

    -

    Notes de l’auteur

    -

    Créer, maintenir et mettre à jour ce MOD, nécessite beaucoup de temps et d’efforts, donc si vous aimez ce MOD et que vous avez envie d’exprimer vos remerciements, vous pouvez effectuer un don, ce qui sera grandement apprécié. Mon ID Paypal est nickvergessen@gmx.de, ou contactez-moi pour avoir mon adresse e-mail.

    Le montant du don suggéré pour ce MOD est de 25,00€ (mais tout montant aidera).


    - -

    ', - - 'PHP_SETTINGS' => 'Paramètres PHP', - 'PHP_SETTINGS_EXP' => 'Ces paramètres et configurations PHP sont requis pour l’installation et l’exécution de la Galerie.', - 'PHP_SETTINGS_OPTIONAL' => 'Paramètres PHP optionnels', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'Ces paramètres PHP ne sont pas requis pour un usage normal, mais ils permettent d’exécuter plusieurs autres fonctions.', - - 'REQ_GD_LIBRARY' => 'La librairie GD est installée.', - 'REQ_PHP_VERSION' => 'Version de PHP >= %s', - 'REQ_PHPBB_VERSION' => 'Version de phpBB >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Avant de procéder à l’installation complète, effectuez quelques tests sur la configuration du serveur et des fichiers, afin de vous assurer que l’installation de la Galerie phpBB se passe correctement. Merci de lire tous les résultats et de ne pas continuer tant que tous les tests ne se sont pas bien passés.', - - 'STAGE_ADVANCED_EXPLAIN' => 'Merci de choisir le module parent pour les modules de la Galerie. Dans un cas normal, les valeurs n’ont pas besoin d’être modifiées.', - 'STAGE_COPY_TABLE' => 'Copier les tables de la base de données', - 'STAGE_COPY_TABLE_EXPLAIN' => 'Les tables de la base de données, pour les données des albums et des images, ont les même noms dans TS Gallery et Galerie phpBB. Nous avons donc créé une copie pour être en mesure de convertir les données.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'Les tables de la base de données, utilisées par la Galerie phpBB, ont été créées, puis les données initiales ont été insérées. Passez à l’étape suivante pour terminer l’installation de la Galerie phpBB.', - 'STAGE_DELETE_TABLES' => 'Vider la base de données', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'Le contenu de la base de données de la Galerie a été supprimé. Passez à l’étape suivante pour terminer la désinstallation de la Galerie phpBB.', - 'SUPPORT_BODY' => 'Le support complet de la version stable actuelle de phpBB Gallery sera fait gratuitement. Cela inclut :

    L’utilisation limitée des versions Beta est recommandée. S’il y a des mises à jour, il est recommandé de mettre à jour le MOD rapidement.

    Le support est apporté sur les forums suivants :

    ', - - 'TABLE_ALBUM' => 'Table incluant les images', - 'TABLE_ALBUM_CAT' => 'Table incluant les albums', - 'TABLE_ALBUM_COMMENT' => 'Table incluant les commentaires', - 'TABLE_ALBUM_CONFIG' => 'Table incluant la configuration', - 'TABLE_ALBUM_RATE' => 'Table incluant les notes', - 'TABLE_EXISTS' => 'existe', - 'TABLE_MISSING' => 'manquant', - 'TABLE_PREFIX_EXPLAIN' => 'Préfixe de l’installation phpBB2', - - 'UNINSTALL_INTRO' => 'Bienvenue dans la désinstallation', - 'UNINSTALL_INTRO_BODY' => 'Avec cette option, il est possible de désinstaller la Galerie phpBB de votre forum phpBB.

    ATTENTION : Tous les albums, les images et les commentaires seront supprimés définitivement !', - 'UNINSTALL_REQUIREMENTS' => 'Nécessite', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Avant de procéder à la désinstallation complète, effectuez quelques tests sur phpBB pour vous assurer que vous avez les autorisations nécessaires afin de désinstaller la Galerie phpBB.', - 'UNINSTALL_START' => 'Désinstaller', - 'UNINSTALL_FINISHED' => 'Désinstallation presque terminée', - 'UNINSTALL_FINISHED_EXPLAIN' => 'Vous avez désinstallé la Galerie phpBB avec succès.

    Maintenant, vous devez annuler toutes les étapes du fichier « install.xml » et supprimez les fichiers de la galerie.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Ici, vous pouvez mettre à jour la Galerie phpBB.', - - 'VERSION_NOT_SUPPORTED' => 'Désolé, mais les mises à jour inférieures à la version 1.0.6 ne sont pas supportées par cette version d’installation.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'Vous devez désinstaller l’extension:
    %s
    avant de désinstaller l’extension principale.', 2 => 'Vous devez désinstaller les extensions:
    %s
    avant de désinstaller l’extension principale.', diff --git a/core/language/it/gallery.php b/core/language/it/gallery.php index 96594508e..e7a781c24 100644 --- a/core/language/it/gallery.php +++ b/core/language/it/gallery.php @@ -137,6 +137,7 @@ 'GALLERY_IMAGE' => 'Immagine', 'GALLERY_IMAGES' => 'Immagini', + 'GALLERY_TOOLS' => 'Strumenti della galleria', 'GALLERY_VIEWS' => 'Visualizzazioni', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Ricordamelo il 7 giorni', @@ -372,4 +373,7 @@ // Versions 1.2.1 addiotions 'GALLERY_DROP' => 'Lascia qui le tue immagini', + 'GALLERY_UPLOAD_CANCEL' => 'Annulla', + 'GALLERY_UPLOAD_START' => 'Avvia', + 'UPLOAD_TO_ALBUM' => 'Carica in "%s"', )); diff --git a/core/language/it/install_gallery.php b/core/language/it/install_gallery.php index 7b30172fd..f2c2805b7 100644 --- a/core/language/it/install_gallery.php +++ b/core/language/it/install_gallery.php @@ -24,114 +24,6 @@ } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'Il BBCode deve essere ricostruito.', - - 'CAT_CONVERT' => 'converti phpBB2', - 'CAT_CONVERT_TS' => 'converti TS Gallery', - 'CAT_UNINSTALL' => 'disinstalla phpBB Gallery', - - 'CHECK_TABLES' => 'Controlla tabelle', - 'CHECK_TABLES_EXPLAIN' => 'Le seguenti tabelle necessitano di conversione.', - - 'CONVERT_SMARTOR_INTRO' => 'Converti da “Album-MOD“ di smartor a “phpBB Gallery“', - 'CONVERT_SMARTOR_INTRO_BODY' => 'Con questo convertitore, puoi convertire i tuoi albums, immagini, voti e commenti da Album-MOD di Smartor (testato v2.0.56) e Full Album Pack (testato v1.4.1) a phpBB Gallery.

    Nota: I permessi non saranno copiati.', - 'CONVERT_TS_INTRO' => 'Converti da “TS Gallery“ a “phpBB Gallery“', - 'CONVERT_TS_INTRO_BODY' => 'Con questo convertitore, puoi convertire i tuoi albums, immagini, voti e commenti da TS Gallery (testato v0.2.1) a phpBB Gallery.

    Nota: I permessi non saranno copiati.', - 'CONVERT_COMPLETE_EXPLAIN' => 'La conversione della tua gallery a phpBB Gallery v%s è stata completata con successo.
    Assicurati di aver trasferito tutti i file prima di attivare il tuo forum e di cancellare la cartella install.

    I permessi non saranno copiati.

    Devi anche pulire il tuo database da vecchie voci, relative a immagini non più esistenti. Questo può essere fatto in ".MODs > phpBB Gallery > Pulisci gallery".', - - 'CONVERTED_ALBUMS' => 'Gli albums sono stati copiati con successo.', - 'CONVERTED_COMMENTS' => 'I commenti sono stati copiati con successo.', - 'CONVERTED_IMAGES' => 'Le immagini sono stati copiati con successo.', - 'CONVERTED_MISC' => 'Convertite altre funzioni.', - 'CONVERTED_PERSONALS' => 'Gli album personali sono stati copiati con successo.', - 'CONVERTED_RATES' => 'I voti sono stati copiati con successo.', - 'CONVERTED_RESYNC_ALBUMS' => 'Sincronizzazione statistiche album.', - 'CONVERTED_RESYNC_COMMENTS' => 'Sincronizzazione commenti.', - 'CONVERTED_RESYNC_COUNTS' => 'Sincronizzazione contatore immagini.', - 'CONVERTED_RESYNC_RATES' => 'Sincronizzazione voti.', - - 'FILE_DELETE_FAIL' => 'Il file non può essere eliminato, occorre eliminarlo manualmente', - 'FILE_STILL_EXISTS' => 'Il file cercato non esiste', - 'FILES_REQUIRED_EXPLAIN' => 'Richiesto - Per poter funzionare correttamente phpBB Gallery deve essere in grado di accedere o scrivere ad alcuni file o directory. Se vedi “ Non scrivibile ” è necessario modificare le autorizzazioni su file o directory per consentire a phpBB di scrivere in esso.', - 'FILES_DELETE_OUTDATED' => 'Elimina i file obsoleti', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'Se sceglii di eliminare i file, essi saranno completamente eliminati e non potranno essere ripristinati!

    Nota:
    Se hai stili e linguaggi installati, è necessario cancellarli manualmente.', - 'FILES_OUTDATED' => 'Files obsoleti', - 'FILES_OUTDATED_EXPLAIN' => 'Obsoleti - Per eliminare il rischio di attacchi hackers, elimina definitivamente i seguenti files.', - 'FOUND_INSTALL' => 'Doppia installazione', - 'FOUND_INSTALL_EXPLAIN' => 'Doppia installazione - E’ stata trovata già una galeria installata! Se continui, tutti i dati esistenti saranno sovrascritti. Tutti gli albums, immagini e commenti saranno cancellati! Per questo un %1$saggiornamento%2$s è raccomandato.', - 'FOUND_VERSION' => 'E’ stata trovata la seguente versione', - 'FOUNDER_CHECK' => 'Sei un "Founder" di questa board', - 'FOUNDER_NEEDED' => 'Devi essere un “Founder“ di questa board!', - - 'INSTALL_CONGRATS_EXPLAIN' => '

    Hai correttamente installato phpBB Gallery v%s.

    Ora cancella, sposta o rinomina la cartella install prima di usare il tuo forum. Se questa directory è ancora presente, sarà consentito solo l’accesso in amministrazione (ACP).

    ', - 'INSTALL_INTRO_BODY' => 'Con questa opzione, è possibile installare phpBB Gallery sul tuo forum.', - - 'GOTO_GALLERY' => 'Vai su phpBB Gallery', - 'GOTO_INDEX' => 'Vai all’indice del forum', - - 'MISSING_CONSTANTS' => 'Prima di eseguire lo script di installazione, devi caricare i tuoi files modificati, in particolare il file includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Crea modulo standard padre', - 'MODULES_PARENT_SELECT' => 'Scegli il modulo padre', - 'MODULES_SELECT_4ACP' => 'Scegli il modulo padre per “pannello di controllo amministrativo“', - 'MODULES_SELECT_4LOG' => 'Scegli il modulo padre per “log gallery“', - 'MODULES_SELECT_4MCP' => 'Scegli il modulo padre per “pannelo di controllo moderatore“', - 'MODULES_SELECT_4UCP' => 'Scegli il modulo padre per “pannello di controllo utente“', - 'MODULES_SELECT_NONE' => 'nessun modulo padre', - - 'NO_INSTALL_FOUND' => 'Nessuna installazione trovata!', - - 'OPTIONAL_EXIFDATA' => 'La funzione “exif_read_data“ esiste', - 'OPTIONAL_EXIFDATA_EXP' => 'Il modulo exif-module non è installato o non esiste.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'Se la funzione esiste, i dati exif delle immagini sono visualizzate nella pagina immagini.', - 'OPTIONAL_IMAGEROTATE' => 'La funzione “imagerotate“ esiste', - 'OPTIONAL_IMAGEROTATE_EXP' => 'Devi aggiornare la tua libreria GD, quella attuale è "%s".', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'Se la funzione esiste, puoi ruotare le immagini quando le carichi o le modifichi.', - - 'PAYPAL_DEV_SUPPORT' => '

    -

    Note autore

    -

    La creazione, il mantenimento e gli aggiornamenti per questa MOD richiedono molto tempo e fatica, se ti piace questa MOD e vuoi aiutarmi con una donazione puoi usare la mia ID Paypal nickvergessen@gmx.de, o contattarmi al mio indirizzo email.

    La donazione suggerita è di 25,00€ (ma qualunque importo potrà aiutarmi).


    - -

    ', - - 'PHP_SETTINGS' => 'Configurazioni PHP', - 'PHP_SETTINGS_EXP' => 'Queste sono le configurazioni richieste per installare la galleria.', - 'PHP_SETTINGS_OPTIONAL' => 'Configurazioni PHP opzionali', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'Queste configuraioni PHP non sono richieste per il normale uso, ma sono necessarie per utilizzare nuovi strumenti.', - - 'REQ_GD_LIBRARY' => 'GD Library è installato', - 'REQ_PHP_VERSION' => 'Versione php >= %s', - 'REQ_PHPBB_VERSION' => 'Versione phpBB >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Prima di procedere con l’installazione completa, phpBB effettuerà alcuni test sulla tua configurazione del server e file per garantire che possano essere installati ed eseguiti correttamente su phpBB. Assicurati di leggere attentamente attraverso i risultati e non procedere fino a quando vengono passati tutti i test necessari.', - - 'STAGE_ADVANCED_EXPLAIN' => 'Hai scelto i moduli principali per la gallery. Per un’installazione normale non è consigliabile effettuare modifiche.', - 'STAGE_COPY_TABLE' => 'Copia tabelle database', - 'STAGE_COPY_TABLE_EXPLAIN' => 'Le tabelle del database per l’album e dati utente hanno gli stessi nomi in TS Gallery e phpBB Gallery. Puoi così copiarli e convertire i dati.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'Le tabelle del database utilizzate da phpBB gallery sono state create e popolate con alcuni dati iniziali. Passare alla schermata successiva per completare l’installazione di phpBB gallery.', - 'STAGE_DELETE_TABLES' => 'Pulizia database', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'Il database della Mod Gallery è stato cancellato. Procedi con gli step successivi per terminare la disinstallazione della phpBB Gallery.', - 'SUPPORT_BODY' => 'Pieno supporto è previsto per la corrente versione stabile di phpBB, gratuitamente. Questo include::

    L’uso delle versioni Beta è raccomandato in modo limitato. Gli aggiornamenti sono consigliati.

    Il supporto è dato sui seguenti forum:

    ', - - 'TABLE_ALBUM' => 'la tabella include le immagini', - 'TABLE_ALBUM_CAT' => 'la tabella include gli albums', - 'TABLE_ALBUM_COMMENT' => 'la tabella include i commenti', - 'TABLE_ALBUM_CONFIG' => 'la tabella include la configurazione', - 'TABLE_ALBUM_RATE' => 'la tabella include i voti', - 'TABLE_EXISTS' => 'esiste', - 'TABLE_MISSING' => 'non esiste', - 'TABLE_PREFIX_EXPLAIN' => 'Prefisso di phpBB', - - 'UNINSTALL_INTRO' => 'Benvenuto nel processo di disinstallazione', - 'UNINSTALL_INTRO_BODY' => 'Con questa opzione è possibile disinstallare la phpBB Gallery dalla tua board.

    ATTENZIONE: tutti gli albums, immagini e commenti saranno cancellati!', - 'UNINSTALL_REQUIREMENTS' => 'Requisiti', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Prima di procedere con la disinstallazione phpBB effettuerà alcuni test per verificare che tu abbia i permessi per disinstallare phpBB Gallery.', - 'UNINSTALL_START' => 'Disinstallazione', - 'UNINSTALL_FINISHED' => 'Disinstallazione quasi terminata', - 'UNINSTALL_FINISHED_EXPLAIN' => 'Hai disinstallato phpBB Gallery con successo.

    Ora hai solo bisogno di annullare la procedura dell’install.xml e cancellare i files della galleria. Successivamente il tuo ACP sarà completamente libero dalla galleria.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Puoi aggiornare la tua versione di phpBB Gallery.', - - 'VERSION_NOT_SUPPORTED' => 'Spiacente, ma gli aggiornamenti dalle versioni inferiori a < 0.2.0 non sono supportate con questo processo di installazione.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'È necessario disinstallare l’estensione:
    %s
    prima di disinstallare l’estensione principale.', 2 => 'È necessario disinstallare le estensioni:
    %s
    prima di disinstallare l’estensione principale.', diff --git a/core/language/nl/gallery.php b/core/language/nl/gallery.php index ea347b81e..04fae4b49 100644 --- a/core/language/nl/gallery.php +++ b/core/language/nl/gallery.php @@ -137,6 +137,7 @@ 'GALLERY_IMAGE' => 'Afbeelding', 'GALLERY_IMAGES' => 'Afbeeldingen', + 'GALLERY_TOOLS' => 'Galerijhulpmiddelen', 'GALLERY_VIEWS' => 'Weergaves', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Herinner mij over 7 dagen weer', @@ -372,4 +373,7 @@ // Versions 1.2.1 additions 'GALLERY_DROP' => 'Plaats je afbeeldingen hier', + 'GALLERY_UPLOAD_CANCEL' => 'Annuleren', + 'GALLERY_UPLOAD_START' => 'Starten', + 'UPLOAD_TO_ALBUM' => 'Uploaden naar "%s"', )); diff --git a/core/language/nl/install_gallery.php b/core/language/nl/install_gallery.php index ddf514a34..c346d8aaa 100644 --- a/core/language/nl/install_gallery.php +++ b/core/language/nl/install_gallery.php @@ -24,114 +24,6 @@ } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'De BBCode moet opnieuw opgebouwd worden.', - - 'CAT_CONVERT' => 'converteer phpBB2', - 'CAT_CONVERT_TS' => 'converteer TS Gallery', - 'CAT_UNINSTALL' => 'phpBB Galerij deïnstalleren', - - 'CHECK_TABLES' => 'Controleer tabellen', - 'CHECK_TABLES_EXPLAIN' => 'De volgende tabellen moeten bestaan zodat ze geconverteerd kunnen worden.', - - 'CONVERT_SMARTOR_INTRO' => 'Converteer van “Album-MOD“ van Smartor naar “phpBB Galerij“', - 'CONVERT_SMARTOR_INTRO_BODY' => 'Met dit conversieprogramma kan je je albums, afbeeldingen, beoordelingen en commentaren van de Album-MOD van Smartor (getest v2.0.56) en Full Album Pack (getest v1.4.1) naar phpBB Galerij omzetten.

    Let op: De permissies worden niet meegenomen.', - 'CONVERT_TS_INTRO' => 'Converteer van “TS Gallery“ naar “phpBB Galerij“', - 'CONVERT_TS_INTRO_BODY' => 'Met dit conversieprogramma kan je je albums, afbeeldingen, beoordelingen en commentaren van de TS Gallery (getest v0.2.1) naar phpBB Galerij omzetten.

    Let op: De permissies worden niet meegenomen.', - 'CONVERT_COMPLETE_EXPLAIN' => 'Conversion from your gallery to phpBB Gallery v%s was successful.
    Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory.

    Please note that the permissions were not copied.

    You should also clean your database from old entries, where the images are missing. This can be done in “.MODs > phpBB Gallery > Cleanup gallery“.', - - 'CONVERTED_ALBUMS' => 'De albums zijn succesvol gekopieeerd.', - 'CONVERTED_COMMENTS' => 'De reacties zijn succesvol gekopieerd.', - 'CONVERTED_IMAGES' => 'De afbeeldingen zijn succesvol gekopieerd.', - 'CONVERTED_MISC' => 'Diverse onderdelen geconverteerd.', - 'CONVERTED_PERSONALS' => 'De persoonlijke albums zijn succesvol gekopieerd.', - 'CONVERTED_RATES' => 'De beoordelingen zijn succesvol gekopieerd.', - 'CONVERTED_RESYNC_ALBUMS' => 'Album statestieken synchroniseren.', - 'CONVERTED_RESYNC_COMMENTS' => 'Reacties synchroniseren.', - 'CONVERTED_RESYNC_COUNTS' => 'Afbeeldingstellers synchroniseren.', - 'CONVERTED_RESYNC_RATES' => 'Beoordelingen synchroniseren.', - - 'FILE_DELETE_FAIL' => 'Het bestand kan niet verwijderd worden, je zult het bestand handmatig moeten verwijderen', - 'FILE_STILL_EXISTS' => 'Het bestand bestaat nog steeds', - 'FILES_REQUIRED_EXPLAIN' => 'Verplicht - In order to function correctly phpBB Gallery needs to be able to access or write to certain files or directories. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.', - 'FILES_DELETE_OUTDATED' => 'Verwijder verouderde bestanden', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'Als je op verouderde bestanden verwijderen klikt, dan worden de bestanden volledig verwijderd. Dit kan niet terugedraaid worden!

    LET OP:
    Als je meer stijlen en talen hebt geïnstalleerd, dan moet je deze met de hand verwijderen.', - 'FILES_OUTDATED' => 'Verouderde bestanden', - 'FILES_OUTDATED_EXPLAIN' => 'Verouderd - In order to deny hacking attempts, please remove the following files.', - 'FOUND_INSTALL' => 'Dubbele Installatie', - 'FOUND_INSTALL_EXPLAIN' => 'Dubbele Installatie - An Installation of the gallery was found! If you continue here, you overwrite all existing data. All albums, images and comments will be deleted! That´s why an %1$supdate%2$s recommanded.', - 'FOUND_VERSION' => 'De volgende versie is gevonden', - 'FOUNDER_CHECK' => 'Je bent een “Oprichter“ van dit forum', - 'FOUNDER_NEEDED' => 'Je moet een “Oprichter“ van dit forum zijn!', - - 'INSTALL_CONGRATS_EXPLAIN' => 'Je hebt phpBB Galerij v%s succesvol geïnstalleerd.

    Verwijder, verplaats of hernoem install map voordat je het forum weer gaat gebruiken. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', - 'INSTALL_INTRO_BODY' => 'Met deze optie is het mogelijk op de phpBB Galerij te installeren op je forum.', - - 'GOTO_GALLERY' => 'Ga naar phpBB Galerij', - 'GOTO_INDEX' => 'Ga naar Forumoverzicht ', - - 'MISSING_CONSTANTS' => 'Voordat je het installatiescript kan starten moet je de bijgewerkte bestanden uploaden, in het bijzonder: includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Kies hoofd standaard-module', - 'MODULES_PARENT_SELECT' => 'Kies hoofd module', - 'MODULES_SELECT_4ACP' => 'Kies hoofd module voor “beheerderspaneel“', - 'MODULES_SELECT_4LOG' => 'Kies hoofd module voor “Galerij-log“', - 'MODULES_SELECT_4MCP' => 'Kies hoofd module voor “moderatorpaneel“', - 'MODULES_SELECT_4UCP' => 'Kies hoofd module voor “gebruikerspaneel“', - 'MODULES_SELECT_NONE' => 'Geen hoofd module', - - 'NO_INSTALL_FOUND' => 'Er is geen installatie gevonden!', - - 'OPTIONAL_EXIFDATA' => 'Functie “exif_read_data“ bestaat', - 'OPTIONAL_EXIFDATA_EXP' => 'De exif-module wordt niet geladen of is niet geïnstalleerd.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'Als de functie bestaat, worden de exif gegevens van de afbeeldingen getoond op de afbeeldingspagina.', - 'OPTIONAL_IMAGEROTATE' => 'Functie “imagerotate“ bestaat', - 'OPTIONAL_IMAGEROTATE_EXP' => 'De versie van GD Version moet worden bijgewerkt, deze is momenteel “%s“.', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'Als de functie bestaat kan je afbeeldingen draaien tijdens het uploaden en bewerken.', - - 'PAYPAL_DEV_SUPPORT' => '

    -

    Opmerking van de auteur

    -

    Het maken, onderhouden en bijwerken van deze extensie vraagt veel tijd en moeite, als je deze extensie waardeert en die waardering ook via een donatie wilt laten blijken, dan wordt dat zeer op prijs gesteld. Mijn Paypal ID is nickvergessen@gmx.de, of neem contact met me op voor mijn postadres.

    Het voorgestelde donatiebedrag voor deze extensie is €25,00 (maar alle kleine beetjes helpen).


    - -

    ', - - 'PHP_SETTINGS' => 'PHP Instellingen', - 'PHP_SETTINGS_EXP' => 'Deze PHP instellingen en configuraties zijn verplicht voor het installeren en het draaien van de galerij.', - 'PHP_SETTINGS_OPTIONAL' => 'Optionle PHP instelingen', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'Deze PHP instellingen zijn NIET verplicht voor normaal gebruik, maak kunnen wel zorgen voor een aantal extra functies.', - - 'REQ_GD_LIBRARY' => 'GD Library is geïnstalleerd', - 'REQ_PHP_VERSION' => 'php versie >= %s', - 'REQ_PHPBB_VERSION' => 'phpBB versie >= %s', - 'REQUIREMENTS_EXPLAIN' => 'Voordat je verder gaat met de volledige installatie, zal phpBB een aantal test uitvoeren om je serverinstellingen en bestanden te contoleren. Zodat je zeker weet dat je de phpBB galerij kan installeren en draaien. LET OP: Lees de resultaten van deze test goed door om er zeker van te zijn dat alle verplichte tests geslaagd zijn.', - - 'STAGE_ADVANCED_EXPLAIN' => 'Kies een hoofd-module voor de Galerij-modules. Normaal gezien verander je dit niet.', - 'STAGE_COPY_TABLE' => 'Kopieer de database-tabellen ', - 'STAGE_COPY_TABLE_EXPLAIN' => 'De database-tabellen met de albums en gebruikersgegevens van TS Gallery hebben dezelfde namen als voor phpBB Galerij. Daarom is er een kopie aangemaakt om de gegevens toch te kunnen importeren.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'De database-tabellen die phpBB Galerij gebruikt zijn aangemaakt en gevuld met de eerste gegevens. Ga verder naar het volgende scherm om de installatie van phpBB Galerij te voltooien.', - 'STAGE_DELETE_TABLES' => 'Database opschonen', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'De database-inhoud van de Galerij-MOD is verwijderd. Ga verder naar het volgende scherm on de deïnstallatie van de phpBB Galerij te voltooien.', - 'SUPPORT_BODY' => 'Volledige ondersteunig voor de huidige stabiele versie voor de phpBB Galerij, wordt gratis aangeboden. Dit omvat:

    Het gebruik van Beta-versies oftewel test-vesies wordt afgeraden. Als er een nieuwe versie is, wordt het aangeraden zosnel mogelijk te updaten.

    Support wordt gegeven op deze forums

    ', - - 'TABLE_ALBUM' => 'tabel met de afbeeldingen', - 'TABLE_ALBUM_CAT' => 'tabel met de albums', - 'TABLE_ALBUM_COMMENT' => 'tabel met de reacties', - 'TABLE_ALBUM_CONFIG' => 'tabel met de instellingen', - 'TABLE_ALBUM_RATE' => 'tabel met de beoordelingen', - 'TABLE_EXISTS' => 'bestaat', - 'TABLE_MISSING' => 'mist', - 'TABLE_PREFIX_EXPLAIN' => 'Prefix van de phpBB2-installatie', - - 'UNINSTALL_INTRO' => 'Welkom bij deïnstalleren', - 'UNINSTALL_INTRO_BODY' => 'Met deze optie is het mogelijk om de phpBB galerij te verwijderen van je forum.

    WAARSCHUWING: All albums, afbeelding en reacties worden verwijderd. Dit is onomkeerbaar!', - 'UNINSTALL_REQUIREMENTS' => 'Benodigdheden', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Voordat je verder gaat met het volledig verwijderen, voert phpBB een aantal tests uitvoeen om zeker te zijn dat je de phpBB Galerij mag verwijderen.', - 'UNINSTALL_START' => 'Deïnstalleren', - 'UNINSTALL_FINISHED' => 'Deïnstalleren bijna voltooid', - 'UNINSTALL_FINISHED_EXPLAIN' => 'Je hebt de phpBB galerij succesvol gedeïnstalleerd.

    Nu hoef je alleen nog maar de stappen uit de install.xml te volgen en alle bestanden en wijzigingen te verwijderen. Daarna is je forum volledig van de Galerij verlost.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Hier kan je de phpBB galerij updaten.', - - 'VERSION_NOT_SUPPORTED' => 'Sorry, maar updates van voor versie 1.0.6 worden door deze installatie niet ondersteund.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'U moet de extensie:
    %s
    verwijderen voordat u de kern-extensie verwijdert.', 2 => 'U moet de extensies:
    %s
    verwijderen voordat u de kern-extensie verwijdert.', diff --git a/core/language/ru/gallery.php b/core/language/ru/gallery.php index 7d55d3090..de63c7268 100644 --- a/core/language/ru/gallery.php +++ b/core/language/ru/gallery.php @@ -131,6 +131,7 @@ 'GALLERY_IMAGE' => 'Фото', 'GALLERY_IMAGES' => 'Фотографии', + 'GALLERY_TOOLS' => 'Инструменты галереи', 'GALLERY_VIEWS' => 'Просмотры', 'IGNORE_NOTUPTODATE_MESSAGE' => 'Напомнить через неделю', 'IMAGE_ALREADY_REPORTED' => 'Фото уже обжаловано.', @@ -347,4 +348,7 @@ // Versions 1.2.1 additions 'GALLERY_DROP' => 'Перетащите сюда ваши фото', + 'GALLERY_UPLOAD_CANCEL' => 'Отмена', + 'GALLERY_UPLOAD_START' => 'Начать', + 'UPLOAD_TO_ALBUM' => 'Загрузить в «%s»', )); diff --git a/core/language/ru/install_gallery.php b/core/language/ru/install_gallery.php index f92b2e16f..d05c5f3af 100644 --- a/core/language/ru/install_gallery.php +++ b/core/language/ru/install_gallery.php @@ -22,98 +22,6 @@ $lang = []; } $lang = array_merge($lang, array( - 'BBCODES_NEEDS_REPARSE' => 'BBCode нуждается в переобработке.', - 'CAT_CONVERT' => 'Конвертация phpBB2', - 'CAT_CONVERT_TS' => 'Конвертация TS Gallery', - 'CAT_UNINSTALL' => 'Удаление phpBB Gallery', - 'CHECK_TABLES' => 'Проверка таблиц', - 'CHECK_TABLES_EXPLAIN' => 'Следующие таблицы должны существовать, чтобы была возможность конвертирования.', - 'CONVERT_SMARTOR_INTRO' => 'Конвертер из «Smartor’s Album MOD» в «phpBB Gallery»', - 'CONVERT_SMARTOR_INTRO_BODY' => 'Можно ковертировать альбомы, фотографии, оценки и комментарии из Smartor’s Album MOD (тестировано на версии 2.0.56) и Full Album Pack (тестировано на версии 1.4.1) в phpBB Gallery.

    Примечание: права доступа не будут скопированы.', - 'CONVERT_TS_INTRO' => 'Конвертер из «TS Gallery» в «phpBB Gallery»', - 'CONVERT_TS_INTRO_BODY' => 'Можно ковертировать альбомы, фотографии, оценки и комментарии из TS Gallery (тестировано на версии 0.2.1) в phpBB Gallery.

    Примечание: права доступа не будут скопированы.', - 'CONVERT_COMPLETE_EXPLAIN' => 'Конвертация из вашей галереи в phpBB Gallery v%s прошла успешно.
    Удостоверьтесь, что все параметры перенеслись правильно. Не забудьте удалить папку install.

    Не забудьте также, что права доступа не копировались и вам придётся задать их заново.

    Очистить базу данных от пустых записей, для которых фотографии отсутствуют, можно в администраторском разделе: Модули → Галерея → Очистка галереи.', - 'CONVERTED_ALBUMS' => 'Альбомы скопированы.', - 'CONVERTED_COMMENTS' => 'Комментарии скопированы.', - 'CONVERTED_IMAGES' => 'Фотографии скопированы.', - 'CONVERTED_MISC' => 'Прочее скопировано.', - 'CONVERTED_PERSONALS' => 'Личные альбомы скопированы.', - 'CONVERTED_RATES' => 'Оценки скопированы.', - 'CONVERTED_RESYNC_ALBUMS' => 'Пересчёт статистики.', - 'CONVERTED_RESYNC_COMMENTS' => 'Пересчёт комментариев.', - 'CONVERTED_RESYNC_COUNTS' => 'Пересчёт счетчиков.', - 'CONVERTED_RESYNC_RATES' => 'Пересчёт рейтингов.', - 'FILE_DELETE_FAIL' => 'Файл не может быть удалён автоматически, вам надо это сделать вручную.', - 'FILE_STILL_EXISTS' => 'Файл всё ещё существует.', - 'FILES_REQUIRED_EXPLAIN' => 'Для корректного функционирования галерее нужен доступ на запись к некоторым файлам и папкам. Если вы видите надпись «Недоступно», то должны изменить права доступа для файла или папки так, чтоб phpBB мог записывать в них.', - 'FILES_DELETE_OUTDATED' => 'Удалить устаревшие файлы', - 'FILES_DELETE_OUTDATED_EXPLAIN' => 'Действие необратимо, файлы удаляются полностью и не могут быть восстановлены.

    Примечание:
    если у вас несколько стилей и языков, вам придётся удалить файлы вручную.', - 'FILES_OUTDATED' => 'Устаревшие файлы', - 'FILES_OUTDATED_EXPLAIN' => 'Устаревшие: для предотвращения хакерского доступа удалите эти файлы.', - 'FOUND_INSTALL' => 'Повторная установка', - 'FOUND_INSTALL_EXPLAIN' => 'Повторная установка: найдена установленная галерея. Если вы продолжите установку, все данные будут перезаписаны. Все альбомы, фотографии и комментарии будут удалены. Рекомендуется %1$sобновление%2$s галереи.', - 'FOUND_VERSION' => 'Обнаружена следующая версия', - 'FOUNDER_CHECK' => 'Вы являетесь основателем этой конференции.', - 'FOUNDER_NEEDED' => 'Вы должны иметь статус основателя этой конференции.', - 'INSTALL_CONGRATS_EXPLAIN' => 'Вы успешно установили phpBB Gallery версии %s.

    Удалите, переместите или переименуйте папку install перед использованием конференции. Пока папка не удалена, будет доступен только администраторский раздел.', - 'INSTALL_INTRO_BODY' => 'Установка phpBB Gallery на вашу конференцию.', - 'GOTO_GALLERY' => 'Перейти в phpBB Gallery', - 'GOTO_INDEX' => 'Перейти на главную страницу', - 'MISSING_CONSTANTS' => 'Перед запуском скрипта установки вам необходимо загрузить отредактированные файлы, в первую очередь includes/constants.php.', - 'MODULES_CREATE_PARENT' => 'Создать родительский модуль', - 'MODULES_PARENT_SELECT' => 'Сменить родительский модуль', - 'MODULES_SELECT_4ACP' => 'Сменить родительский модуль в администраторском разделе', - 'MODULES_SELECT_4LOG' => 'Сменить родительский модуль для логов', - 'MODULES_SELECT_4MCP' => 'Сменить родительский модуль в модераторском разделе', - 'MODULES_SELECT_4UCP' => 'Сменить родительский модуль в личном разделе', - 'MODULES_SELECT_NONE' => 'Нет родительского модуля', - 'NO_INSTALL_FOUND' => 'Галерея не найдена.', - 'OPTIONAL_EXIFDATA' => 'Функция exif_read_data доступна', - 'OPTIONAL_EXIFDATA_EXP' => 'Exif-модуль не загружен или не установлен.', - 'OPTIONAL_EXIFDATA_EXPLAIN' => 'Если функция доступна, exif-данные будут отображаться в галерее.', - 'OPTIONAL_IMAGEROTATE' => 'Функция imagerotate доступна', - 'OPTIONAL_IMAGEROTATE_EXP' => 'Вы должны обновить версию GD, текущая версия — %s.', - 'OPTIONAL_IMAGEROTATE_EXPLAIN' => 'Если функция доступна, вы сможете вращать фотографии при загрузке и редактировании.', - 'PAYPAL_DEV_SUPPORT' => '

    -

    От автора

    -

    Создание, обслуживание и обновление этого мода требует много времени и усилий. Если вам нравится мод и если у вас появится желание подчеркнуть свою благодарность пожертвованием, я буду вам очень признателен. Мой Paypal-ID: nickvergessen@gmx.de, или же свяжитесь со мной по email.

    Рекомендуемый взнос — 25 € (но буду благодарен за любую сумму).


    - -

    ', - 'PHP_SETTINGS' => 'Параметры PHP', - 'PHP_SETTINGS_EXP' => 'Эти параметры PHP требуются для установки и запуска галереи.', - 'PHP_SETTINGS_OPTIONAL' => 'Дополнительные параметры PHP', - 'PHP_SETTINGS_OPTIONAL_EXP' => 'Эти параметры PHP не требуются для нормального функционирования галереи, но они дадут возможность использовать дополнительные функции.', - 'REQ_GD_LIBRARY' => 'GD-библиотека установлена', - 'REQ_PHP_VERSION' => 'Версия PHP ≥ %s', - 'REQ_PHPBB_VERSION' => 'Версия phpBB ≥ %s', - 'REQUIREMENTS_EXPLAIN' => 'Перед началом установки будет произведено тестирование параметров сервера и проверка некотрых файлов, чтобы определить возможность установки и запуска галереи. Ознакомьтесь с результатами тестирования и не принимайте никаких действий, пока тестирование не завершится.', - 'STAGE_ADVANCED_EXPLAIN' => 'Выберите родительский модуль для модулей галереи. Обычно не требуется менять.', - 'STAGE_COPY_TABLE' => 'Копирование таблиц базы данных', - 'STAGE_COPY_TABLE_EXPLAIN' => 'Таблицы БД, содержащие данные галереи и пользователей, имеют одинаковые названия в TS Gallery и phpBB Gallery. Мы делаем копию, чтобы иметь возможность конвертировать данные.', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'Таблицы базы данных phpBB Gallery созданы и заполнены первоначальными данными. Нажмите «Следующий шаг» для завершения установки.', - 'STAGE_DELETE_TABLES' => 'Очистка базы данных', - 'STAGE_DELETE_TABLES_EXPLAIN' => 'Содержимое базы данных галереи удалено. Нажмите «Завершить» для завершения удаления галереи.', - 'SUPPORT_BODY' => '

    Полная поддержка оказывается для текущей стабильной версии phpBB Gallery бесплатно по следующим вопросам:

    Использование бета-версий рекомендуется с осторожностью. Если выходят обновления, их рекомендуется устанавливать в кратчайшие сроки.

    Поддержка оказывается на следующих конференциях:

    Актуальный русский перевод доступен на сайте официальной российской поддержки phpBB www.phpbbguru.net.

    ', - 'TABLE_ALBUM' => 'таблица, содержащая фотографии', - 'TABLE_ALBUM_CAT' => 'таблица, содержащая альбомы', - 'TABLE_ALBUM_COMMENT' => 'таблица, содержащая комментарии', - 'TABLE_ALBUM_CONFIG' => 'таблица, содержащая параметры', - 'TABLE_ALBUM_RATE' => 'таблица, содержащая оценки', - 'TABLE_EXISTS' => 'найдены', - 'TABLE_MISSING' => 'отсутствуют', - 'TABLE_PREFIX_EXPLAIN' => 'Префикс таблиц БД phpBB2', - 'UNINSTALL_INTRO' => 'Удаление галереи', - 'UNINSTALL_INTRO_BODY' => 'Удаление phpBB Gallery с вашей конференции.

    Будьте осторожны: все альбомы, фотографии и комментарии будут удалены без возможности восстановления.', - 'UNINSTALL_REQUIREMENTS' => 'Требования', - 'UNINSTALL_REQUIREMENTS_EXPLAIN' => 'Перед удалением галереи будут проведены некоторые тесты, чтобы убедиться, есть ли у вас право удалять галерею.', - 'UNINSTALL_START' => 'Удаление', - 'UNINSTALL_FINISHED' => 'Удаление почти закончено', - 'UNINSTALL_FINISHED_EXPLAIN' => 'Вы успешно удалили phpBB Gallery.

    Теперь вам осталось откатить изменения в файлах конференции, описанные в install.xml, и удалить файлы галереи. После этого ваша конференция будет полностью очищена от галереи.', - - 'UPDATE_INSTALLATION_EXPLAIN' => 'Обновление phpBB Gallery.', - - 'VERSION_NOT_SUPPORTED' => 'Извините, но обновление галереи с версий < 1.0.6 не поддерживаются данной версией инсталятора.', - 'GALLERY_SUB_EXT_UNINSTALL' => array( 1 => 'Вы должны удалить расширение:
    %s
    перед удалением основного расширения.', 2 => 'Вы должны удалить расширения:
    %s
    перед удалением основного расширения.', diff --git a/core/log.php b/core/log.php index ca427fb96..585effc51 100644 --- a/core/log.php +++ b/core/log.php @@ -94,13 +94,13 @@ public function add_log($log_type, $log_action, $album = 0, $image = 0, $descrip $sql_array = array( 'log_time' => (int) $time, - 'log_type' => $this->db->sql_escape($log_type), - 'log_action' => $this->db->sql_escape($log_action), + 'log_type' => $log_type, + 'log_action' => $log_action, 'log_user' => (int) $user, - 'log_ip' => $this->db->sql_escape($this->user->ip), + 'log_ip' => $this->user->ip, 'album' => (int) $album, 'image' => (int) $image, - 'description' => $this->db->sql_escape(json_encode($description)) + 'description' => json_encode($description, JSON_UNESCAPED_UNICODE) ); $sql = 'INSERT INTO ' . $this->log_table . ' ' . $this->db->sql_build_array('INSERT', $sql_array); $this->db->sql_query($sql); @@ -199,22 +199,18 @@ public function build_list($type, $limit = 0, $page = 1, $album = 0, $image = 0, { case 'u': $sql_array['ORDER_BY'] = 'l.log_user ' . (isset($additional['sort_dir']) ? 'ASC' : 'DESC'); - $sql_array['GROUP_BY'] = 'l.log_user, l.log_id, i.image_id, i.image_album_id'; break; case 'i': $sql_array['ORDER_BY'] = 'l.log_ip ' . (isset($additional['sort_dir']) ? 'ASC' : 'DESC'); - $sql_array['GROUP_BY'] = 'l.log_ip, l.log_id, i.image_id, i.image_album_id'; break; case 'o': $sql_array['ORDER_BY'] = 'l.description ' . (isset($additional['sort_dir']) ? 'ASC' : 'DESC'); - $sql_array['GROUP_BY'] = 'l.description, l.log_id, i.image_id, i.image_album_id'; break; } } else { $sql_array['ORDER_BY'] = 'l.log_time ' . (isset($additional['sort_dir']) ? 'ASC' : 'DESC'); - $sql_array['GROUP_BY'] = 'l.log_time, l.log_id, i.image_id, i.image_album_id'; } // So we need count - so define SELECT $count_sql_array = $sql_array; @@ -260,7 +256,7 @@ public function build_list($type, $limit = 0, $page = 1, $album = 0, $image = 0, 'ip' => $row['log_ip'], 'album' => $row['album'], 'image' => $row['image'], - 'description' => json_decode(stripslashes($row['description'])) + 'description' => json_decode($row['description'], true) ); $users_array[$row['log_user']] = array(''); } diff --git a/core/migrations/create_import_dir.php b/core/migrations/create_import_dir.php new file mode 100644 index 000000000..8ba09e8f3 --- /dev/null +++ b/core/migrations/create_import_dir.php @@ -0,0 +1,45 @@ + '3.2.1', 'disp_gallery_icon' => true, + 'allow_webp' => true, ); protected $profilefield_name = 'gallery_palbum'; diff --git a/core/migrations/release_3_2_1_1.php b/core/migrations/release_3_2_1_1.php index b919b179b..87cf42f18 100644 --- a/core/migrations/release_3_2_1_1.php +++ b/core/migrations/release_3_2_1_1.php @@ -17,7 +17,7 @@ class release_3_2_1_1 extends migration { static public function depends_on() { - return ['\phpbbgallery\core\migrations\release_1_2_0_db_create']; + return ['\phpbbgallery\core\migrations\release_3_2_1_0']; } public function update_data() diff --git a/core/migrations/release_3_3_0.php b/core/migrations/release_3_3_0.php index 5ba437bef..e3f9f5df7 100644 --- a/core/migrations/release_3_3_0.php +++ b/core/migrations/release_3_3_0.php @@ -17,7 +17,7 @@ class release_3_3_0 extends migration { static public function depends_on() { - return ['\phpbbgallery\core\migrations\release_1_2_0_db_create']; + return ['\phpbbgallery\core\migrations\release_3_2_1_1']; } public function update_data() diff --git a/core/migrations/release_3_4_0.php b/core/migrations/release_3_4_0.php index 2d650b80a..4961bdf0f 100644 --- a/core/migrations/release_3_4_0.php +++ b/core/migrations/release_3_4_0.php @@ -16,7 +16,7 @@ class release_3_4_0 extends migration { static public function depends_on() { - return ['\phpbbgallery\core\migrations\release_1_2_0_db_create']; + return ['\phpbbgallery\core\migrations\release_3_3_0']; } public function update_data() diff --git a/core/migrations/remove_gallery_version.php b/core/migrations/remove_gallery_version.php new file mode 100644 index 000000000..75156f5d0 --- /dev/null +++ b/core/migrations/remove_gallery_version.php @@ -0,0 +1,28 @@ +image->get_image_ids_by_album($images, $album_id); + if (empty($images)) + { + return; + } + $files = array_intersect_key($files, array_flip($images)); + // We are going to do some cleanup $this->gallery_rating->loader(0); $this->gallery_rating->delete_ratings($images); diff --git a/core/notification/events/phpbbgallery_image_approved.php b/core/notification/events/phpbbgallery_image_approved.php index cd019440f..c50f2337b 100644 --- a/core/notification/events/phpbbgallery_image_approved.php +++ b/core/notification/events/phpbbgallery_image_approved.php @@ -139,7 +139,7 @@ public function get_email_template_variables() */ public function get_url() { - return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'gallery/album/' . $this->get_data('album_id')) : $this->get_data('album_url'); + return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . '/gallery/album/' . (int) $this->get_data('album_id')) : $this->get_data('album_url'); } /** diff --git a/core/notification/events/phpbbgallery_image_for_approval.php b/core/notification/events/phpbbgallery_image_for_approval.php index 272b38b94..1f733feb0 100644 --- a/core/notification/events/phpbbgallery_image_for_approval.php +++ b/core/notification/events/phpbbgallery_image_for_approval.php @@ -155,7 +155,7 @@ public function get_email_template_variables() */ public function get_url() { - return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'gallery/album/' . $this->get_data('album_id')) : $this->get_data('album_url'); + return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . '/gallery/album/' . (int) $this->get_data('album_id')) : $this->get_data('album_url'); } /** diff --git a/core/notification/events/phpbbgallery_image_not_approved.php b/core/notification/events/phpbbgallery_image_not_approved.php index c8f34f9c6..b33a0a9b4 100644 --- a/core/notification/events/phpbbgallery_image_not_approved.php +++ b/core/notification/events/phpbbgallery_image_not_approved.php @@ -139,7 +139,7 @@ public function get_email_template_variables() */ public function get_url() { - return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'gallery/album/' . $this->get_data('album_id')) : $this->get_data('album_url'); + return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . '/gallery/album/' . (int) $this->get_data('album_id')) : $this->get_data('album_url'); } /** diff --git a/core/notification/events/phpbbgallery_new_comment.php b/core/notification/events/phpbbgallery_new_comment.php index 92fff08cb..2db39c0c0 100644 --- a/core/notification/events/phpbbgallery_new_comment.php +++ b/core/notification/events/phpbbgallery_new_comment.php @@ -136,7 +136,7 @@ public function get_reference() */ public function get_email_template() { - return false; + return '@phpbbgallery_core/newcomment_notify'; } /** * Get email template variables @@ -145,7 +145,10 @@ public function get_email_template() */ public function get_email_template_variables() { - return array(); + return array( + 'IMAGE_NAME' => htmlspecialchars_decode(censor_text((string) $this->get_data('image_name')), ENT_COMPAT), + 'U_IMAGE' => generate_board_url() . '/app.' . $this->php_ext . '/gallery/image/' . (int) $this->get_data('image_id'), + ); } /** @@ -155,7 +158,7 @@ public function get_email_template_variables() */ public function get_url() { - return $this->get_data('image_id') ? append_sid($this->phpbb_root_path . 'gallery/image/' . $this->get_data('image_id')) : $this->get_data('url'); + return $this->get_data('image_id') ? append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . '/gallery/image/' . (int) $this->get_data('image_id')) : $this->get_data('url'); } /** @@ -183,6 +186,7 @@ public function create_insert_array($data, $pre_create_data = array()) $this->set_data('comment_id', $data['comment_id']); $this->set_data('poster_id', $data['poster']); $this->set_data('url', $data['url']); + $this->set_data('image_name', (isset($data['image_name'])) ? $data['image_name'] : ''); parent::create_insert_array($data, $pre_create_data); } } diff --git a/core/notification/events/phpbbgallery_new_image.php b/core/notification/events/phpbbgallery_new_image.php index 69353ad83..33f2380a1 100644 --- a/core/notification/events/phpbbgallery_new_image.php +++ b/core/notification/events/phpbbgallery_new_image.php @@ -130,7 +130,7 @@ public function get_reference() */ public function get_email_template() { - return false; + return '@phpbbgallery_core/newimage_notify'; } /** * Get email template variables @@ -139,7 +139,11 @@ public function get_email_template() */ public function get_email_template_variables() { - return array(); + return array( + 'ALBUM_NAME' => htmlspecialchars_decode(censor_text((string) $this->get_data('album_name')), ENT_COMPAT), + 'IMAGE_NAME' => htmlspecialchars_decode(censor_text((string) $this->get_data('image_name')), ENT_COMPAT), + 'U_ALBUM' => generate_board_url() . '/app.' . $this->php_ext . '/gallery/album/' . (int) $this->get_data('album_id'), + ); } /** @@ -149,7 +153,7 @@ public function get_email_template_variables() */ public function get_url() { - return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'gallery/album/' . $this->get_data('album_id')) : $this->get_data('album_url'); + return $this->get_data('album_id') ? append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . '/gallery/album/' . (int) $this->get_data('album_id')) : $this->get_data('album_url'); } /** @@ -176,6 +180,7 @@ public function create_insert_array($data, $pre_create_data = array()) $this->set_data('album_name', $data['album_name']); $this->set_data('album_url', $data['album_url']); $this->set_data('album_id', $data['album_id']); + $this->set_data('image_name', (isset($data['image_name'])) ? $data['image_name'] : ''); parent::create_insert_array($data, $pre_create_data); } } diff --git a/core/notification/events/phpbbgallery_new_report.php b/core/notification/events/phpbbgallery_new_report.php index 0b0926796..6375b05e5 100644 --- a/core/notification/events/phpbbgallery_new_report.php +++ b/core/notification/events/phpbbgallery_new_report.php @@ -154,7 +154,7 @@ public function users_to_query() */ public function get_url() { - return $this->get_data('reported_image_id') ? append_sid($this->phpbb_root_path . 'gallery/moderate/image/' . $this->get_data('reported_image_id')) : $this->get_data('url'); + return $this->get_data('reported_image_id') ? append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . '/gallery/moderate/image/' . (int) $this->get_data('reported_image_id')) : $this->get_data('url'); } /** diff --git a/core/notification/helper.php b/core/notification/helper.php index 159cedf70..3811625e0 100644 --- a/core/notification/helper.php +++ b/core/notification/helper.php @@ -100,19 +100,23 @@ public function notify($type, $target) case 'new_image': $targets = $target['targets']; $album_data = $this->album_load->get($target['album_id']); + $image_data = $this->image->get_image_data($target['last_image']); $notification_data = array( 'user_ids' => $targets, 'album_id' => $target['album_id'], 'album_name' => $album_data['album_name'], + 'image_name' => (isset($image_data['image_name'])) ? $image_data['image_name'] : '', 'last_image_id' => $target['last_image'], 'album_url' => $this->url->get_uri($this->helper->route('phpbbgallery_core_album', array('album_id' => $target['album_id']))), ); $phpbb_notifications->add_notifications('phpbbgallery.core.notification.new_image', $notification_data); break; case 'new_comment': + $image_data = $this->image->get_image_data($target['image_id']); $notification_data = array( 'user_ids' => array_diff($this->get_image_watchers($target['image_id']), array($target['poster_id'])), 'image_id' => $target['image_id'], + 'image_name' => (isset($image_data['image_name'])) ? $image_data['image_name'] : '', 'comment_id' => $target['comment_id'], 'poster' => $target['poster_id'], 'url' => $this->url->get_uri($this->helper->route('phpbbgallery_core_image', array('image_id' => $target['image_id']))), diff --git a/core/rating.php b/core/rating.php index b0832ab2e..f3e2d0ebd 100644 --- a/core/rating.php +++ b/core/rating.php @@ -422,7 +422,7 @@ public function recalc_image_rating($image_ids) $image_ids = (int) $image_ids; } - $sql = 'SELECT rate_image_id, COUNT(rate_user_ip) image_rates, AVG(rate_point) image_rate_avg, SUM(rate_point) image_rate_points + $sql = 'SELECT rate_image_id, COUNT(rate_user_ip) image_rates, AVG(rate_point * 1.0) image_rate_avg, SUM(rate_point) image_rate_points FROM ' . $this->rates_table . ' WHERE ' . $this->db->sql_in_set('rate_image_id', $image_ids, false, true) . ' GROUP BY rate_image_id'; diff --git a/core/report.php b/core/report.php index 86de307a7..64589c316 100644 --- a/core/report.php +++ b/core/report.php @@ -305,7 +305,7 @@ public function build_list($album, $page = 1, $per_page = 0, $status = 1) $this->reports_table => 'r', ), 'WHERE' => 'i.image_id = r.report_image_id and r.report_status = ' . (int) $status . ' and ' . $this->db->sql_in_set('i.image_album_id', $mod_array), - 'ORBER_BY' => 'r.report_id DESC' + 'ORDER_BY' => 'r.report_id DESC' ); // Get Count $sql_array['SELECT'] = 'COUNT(r.report_id) as count'; diff --git a/core/search.php b/core/search.php index 86b7f5c69..666974ca6 100644 --- a/core/search.php +++ b/core/search.php @@ -149,6 +149,10 @@ public function random($limit, $user = 0, $fields = 'rrc_gindex_display', $block $sql_order = 'NEWID()'; break; + case 'oracle': + $sql_order = 'DBMS_RANDOM.VALUE'; + break; + default: $sql_order = 'RAND()'; break; @@ -213,10 +217,8 @@ public function random($limit, $user = 0, $fields = 'rrc_gindex_display', $block $id_ary = array_map('intval', $id_ary); - $sql_where = $this->db->sql_in_set('i.image_id', $id_ary); - $sql_array = array( - 'SELECT' => 'i.*, a.album_name, a.album_status, a.album_user_id, album_id', + 'SELECT' => 'i.*, a.album_name, a.album_status, a.album_user_id, a.album_id', 'FROM' => array($this->images_table => 'i'), 'LEFT_JOIN' => array( @@ -226,8 +228,7 @@ public function random($limit, $user = 0, $fields = 'rrc_gindex_display', $block ), ), - 'WHERE' => 'i.image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' AND ' . $sql_where, - 'GROUP_BY' => 'i.image_id, a.album_name, a.album_status, a.album_user_id, a.album_id', + 'WHERE' => 'i.image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' AND ' . $this->db->sql_in_set('i.image_id', $id_ary), 'ORDER_BY' => $sql_order, ); $sql = $this->db->sql_build_query('SELECT', $sql_array); @@ -335,7 +336,6 @@ public function recent_comments($limit, $start = 0, $pagination = true) $this->comments_table => 'c', ), 'WHERE' => 'i.image_id = c.comment_image_id and ' . $this->db->sql_in_set('image_album_id', $this->gallery_auth->acl_album_ids('c_read'), false, true), - 'GROUP_BY' => 'c.comment_id, c.comment_time, i.image_id', 'ORDER_BY' => 'comment_time DESC' ); $sql_array['WHERE'] .= ' AND ((' . $this->db->sql_in_set('image_album_id', array_diff($this->gallery_auth->acl_album_ids('i_view'), $exclude_albums), false, true) . ' AND image_status <> ' . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . ') @@ -541,8 +541,6 @@ public function recent($limit, $start = 0, $user = 0, $fields = 'rrc_gindex_disp $id_ary = array_map('intval', $id_ary); - $sql_where = $this->db->sql_in_set('i.image_id', $id_ary); - $sql_array = array( 'SELECT' => 'i.*, a.album_name, a.album_status, a.album_user_id, a.album_id', 'FROM' => array($this->images_table => 'i'), @@ -554,7 +552,7 @@ public function recent($limit, $start = 0, $user = 0, $fields = 'rrc_gindex_disp ), ), - 'WHERE' => 'i.image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' AND ' . $sql_where, + 'WHERE' => 'i.image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . ' AND ' . $this->db->sql_in_set('i.image_id', $id_ary), 'ORDER_BY' => $sql_order, ); $sql = $this->db->sql_build_query('SELECT', $sql_array); @@ -619,7 +617,7 @@ public function rating($limit, $start = 0) $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); $count = $row['count']; - $sql_array['SELECT'] = '* , a.album_name, a.album_status, a.album_user_id, a.album_id'; + $sql_array['SELECT'] = 'i.*, a.album_name, a.album_status, a.album_user_id, a.album_id'; $sql_array['LEFT_JOIN'] = array( array( 'FROM' => array($this->albums_table => 'a'), diff --git a/core/styles/all/template/event/overall_footer_after.html b/core/styles/all/template/event/overall_footer_after.html index 3164e3a2c..6d920824b 100644 --- a/core/styles/all/template/event/overall_footer_after.html +++ b/core/styles/all/template/event/overall_footer_after.html @@ -11,6 +11,7 @@ //acceptFileTypes: '{S_QUICK_FILE_TYPES}', // User side filetype test does not work! maxFileSize: '{S_QUICK_MAX_FILESIZE}', // And it appears that user side size is ignored too. dataType: 'json', + formData: $('#postform').serializeArray(), paramName: 'files[]', uploadTemplateId: null, downloadTemplateId: null, @@ -27,8 +28,8 @@ '' + '' + (!index && !o.options.autoUpload ? - '' : '') + - (!index ? '' : '') + + '' : '') + + (!index ? '' : '') + '' + ''); row.find('.name').text(file.name); @@ -136,14 +137,17 @@ }); })(jQuery); // Avoid conflicts with other libraries - - - - - - - - + + + + + + + + + + + @@ -151,4 +155,4 @@ (function($) { // Avoid conflicts with other libraries $('#pf_gallery_palbum').prop('disabled', true); })(jQuery); // Avoid conflicts with other libraries - \ No newline at end of file + diff --git a/core/styles/all/template/js/jquery-ui.min.js b/core/styles/all/template/js/jquery-ui.min.js deleted file mode 100644 index 41ac4a5b3..000000000 --- a/core/styles/all/template/js/jquery-ui.min.js +++ /dev/null @@ -1,13 +0,0 @@ -/*! jQuery UI - v1.11.4 - 2016-02-02 -* http://jqueryui.com -* Includes: core.js, widget.js, mouse.js, position.js, draggable.js, droppable.js, resizable.js, selectable.js, sortable.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, menu.js, progressbar.js, selectmenu.js, slider.js, spinner.js, tabs.js, tooltip.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js -* Copyright jQuery Foundation and other contributors; Licensed MIT */ - -(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("
    "))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):(o.length&&(n=e.widget.extend.apply(null,[n].concat(o))),this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))})),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"
    ",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("
    "),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.widthi?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("
    ").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.lefti[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)} -},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,s._parent=i.helper.parent(),a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>_||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-_),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-_),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.droppable",{version:"1.11.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(e("
    ").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=e(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("
    "),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=e(this.handles[i]),this._on(this.handles[i],{mousedown:o._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidthe.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("
    "),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options;e(i.alsoResize).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0};e(n.alsoResize).each(function(){var t=e(this),s=e(this).data("ui-resizable-alsoresize"),n={},a=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(a,function(e,t){var i=(s[t]||0)+(r[t]||0);i&&i>=0&&(n[t]=i||null)}),t.css(n)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=l-t.width,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.selectable",e.ui.mouse,{version:"1.11.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this; -this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("
    ")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s],this.document[0]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i],this.document[0]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tbody"===s?t._createTrPlaceholder(t.currentItem.find("tr").eq(0),e("",t.document[0]).appendTo(n)):"tr"===s?t._createTrPlaceholder(t.currentItem,n):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_createTrPlaceholder:function(t,i){var s=this;t.children().each(function(){e(" ",s.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.width():this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.leftthis.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.accordion",{version:"1.11.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels))) -},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(e(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.css("box-sizing"),l=e.length&&(!t.length||e.index()",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("