@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | 'EXIF_CAM_MODEL' => 'Camera-model', |
31 | 31 | 'EXIF_DATE' => 'Image taken on', |
32 | 32 | 'EXIF_EXPOSURE' => 'Shutter speed', |
33 | - 'EXIF_EXPOSURE_EXP' => '%s Sec',// 'EXIF_EXPOSURE' unit |
|
33 | + 'EXIF_EXPOSURE_EXP' => '%s Sec', // 'EXIF_EXPOSURE' unit |
|
34 | 34 | 'EXIF_EXPOSURE_BIAS' => 'Exposure bias', |
35 | - 'EXIF_EXPOSURE_BIAS_EXP' => '%s EV',// 'EXIF_EXPOSURE_BIAS' unit |
|
35 | + 'EXIF_EXPOSURE_BIAS_EXP' => '%s EV', // 'EXIF_EXPOSURE_BIAS' unit |
|
36 | 36 | 'EXIF_EXPOSURE_PROG' => 'Exposure program', |
37 | 37 | 'EXIF_EXPOSURE_PROG_0' => 'Not defined', |
38 | 38 | 'EXIF_EXPOSURE_PROG_1' => 'Manual', |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | 'EXIF_FLASH_CASE_93' => 'Flash fired, auto mode, return light not detected, red-eye reduction mode', |
73 | 73 | 'EXIF_FLASH_CASE_95' => 'Flash fired, auto mode, return light detected, red-eye reduction mode', |
74 | 74 | 'EXIF_FOCAL' => 'Focus length', |
75 | - 'EXIF_FOCAL_EXP' => '%s mm',// 'EXIF_FOCAL' unit |
|
75 | + 'EXIF_FOCAL_EXP' => '%s mm', // 'EXIF_FOCAL' unit |
|
76 | 76 | 'EXIF_ISO' => 'ISO speed rating', |
77 | 77 | 'EXIF_METERING_MODE' => 'Metering mode', |
78 | 78 | 'EXIF_METERING_MODE_0' => 'Unknown', |
@@ -141,24 +141,24 @@ discard block |
||
141 | 141 | |
142 | 142 | public function base($page = 1) |
143 | 143 | { |
144 | - $search_id = $this->request->variable('search_id', ''); |
|
144 | + $search_id = $this->request->variable('search_id', ''); |
|
145 | 145 | $image_id = $this->request->variable('image_id', 0); |
146 | 146 | |
147 | - $submit = $this->request->variable('submit', false); |
|
147 | + $submit = $this->request->variable('submit', false); |
|
148 | 148 | $keywords = utf8_normalize_nfc($this->request->variable('keywords', '', true)); |
149 | 149 | $add_keywords = utf8_normalize_nfc($this->request->variable('add_keywords', '', true)); |
150 | 150 | $username = $this->request->variable('username', '', true); |
151 | - $user_id = $this->request->variable('user_id', array(0)); |
|
151 | + $user_id = $this->request->variable('user_id', array(0)); |
|
152 | 152 | $search_terms = $this->request->variable('terms', 'all'); |
153 | 153 | $search_album = $this->request->variable('aid', array(0)); |
154 | 154 | $search_child = $this->request->variable('sc', true); |
155 | - $search_fields = $this->request->variable('sf', 'all'); |
|
156 | - $sort_days = $this->request->variable('st', 0); |
|
155 | + $search_fields = $this->request->variable('sf', 'all'); |
|
156 | + $sort_days = $this->request->variable('st', 0); |
|
157 | 157 | $sort_key = $this->request->variable('sk', 't'); |
158 | 158 | $sort_dir = $this->request->variable('sd', 'd'); |
159 | 159 | |
160 | - $start = ($page - 1) * $this->gallery_config->get('items_per_page'); |
|
161 | - if ($keywords != '' && $add_keywords ='' ) |
|
160 | + $start = ($page - 1) * $this->gallery_config->get('items_per_page'); |
|
161 | + if ($keywords != '' && $add_keywords = '') |
|
162 | 162 | { |
163 | 163 | $submit = true; |
164 | 164 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | if ($this->gallery_config->get('allow_rates')) |
175 | 175 | { |
176 | 176 | $sort_by_text['ra'] = $this->language->lang('RATING'); |
177 | - $sort_by_sql['ra'] = 'image_rate_points';//@todo: (phpbb_gallery_contest::$mode == phpbb_gallery_contest::MODE_SUM) ? 'image_rate_points' : 'image_rate_avg'; |
|
177 | + $sort_by_sql['ra'] = 'image_rate_points'; //@todo: (phpbb_gallery_contest::$mode == phpbb_gallery_contest::MODE_SUM) ? 'image_rate_points' : 'image_rate_avg'; |
|
178 | 178 | $sort_by_text['r'] = $this->language->lang('RATES_COUNT'); |
179 | 179 | $sort_by_sql['r'] = 'image_rates'; |
180 | 180 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | { |
206 | 206 | trigger_error(sprintf($this->language->lang('TOO_FEW_AUTHOR_CHARS'), $this->config['min_search_author_chars'])); |
207 | 207 | } |
208 | - $username_parsed = (strpos($username, '*') !== false) ? ' username_clean ' . $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), utf8_clean_string($this->db->sql_escape($username)))) : ' username_clean = \'' . $this->db->sql_escape(utf8_clean_string($username)) .'\''; |
|
208 | + $username_parsed = (strpos($username, '*') !== false) ? ' username_clean ' . $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), utf8_clean_string($this->db->sql_escape($username)))) : ' username_clean = \'' . $this->db->sql_escape(utf8_clean_string($username)) . '\''; |
|
209 | 209 | $sql = 'SELECT user_id |
210 | 210 | FROM ' . USERS_TABLE . ' |
211 | 211 | WHERE ' . $username_parsed . ' |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | |
224 | 224 | if (!empty($user_id)) |
225 | 225 | { |
226 | - $sql_where[] = $this->db->sql_in_set('i.image_user_id', $user_id); |
|
226 | + $sql_where[] = $this->db->sql_in_set('i.image_user_id', $user_id); |
|
227 | 227 | } |
228 | 228 | // if we search in an existing search result just add the additional keywords. But we need to use "all search terms"-mode |
229 | 229 | // so we can keep the old keywords in their old mode, but add the new ones as required words |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | else |
237 | 237 | { |
238 | 238 | $search_terms = 'all'; |
239 | - $keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' .$add_keywords; |
|
239 | + $keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' . $add_keywords; |
|
240 | 240 | } |
241 | 241 | } |
242 | 242 | $keywords_ary = ($keywords) ? explode(' ', $keywords) : array(); |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | $match_search_query = ''; |
262 | 262 | foreach ($matches as $match) |
263 | 263 | { |
264 | - $match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER('. $match . ') '; |
|
264 | + $match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER(' . $match . ') '; |
|
265 | 265 | $match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char() . mb_strtolower($word) . $this->db->get_any_char())); |
266 | 266 | } |
267 | 267 | $search_query .= ((!$search_query) ? '' : (($search_terms == 'all') ? ' AND ' : ' OR ')) . '(' . $match_search_query . ')'; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | trigger_error('NO_SEARCH_RESULTS'); |
291 | 291 | } |
292 | 292 | $sql_array['SELECT'] = '*, a.album_name, a.album_status, a.album_user_id, a.album_id'; |
293 | - $sql_array['LEFT_JOIN'] = array( |
|
293 | + $sql_array['LEFT_JOIN'] = array( |
|
294 | 294 | array( |
295 | 295 | 'FROM' => array($this->albums_table => 'a'), |
296 | 296 | 'ON' => 'a.album_id = i.image_album_id', |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | { |
319 | 319 | $this->image->assign_block('imageblock.image', $row, $show_options, $thumbnail_link, $imagename_link); |
320 | 320 | } |
321 | - $current_page = $page*$this->gallery_config->get('items_per_page'); |
|
321 | + $current_page = $page * $this->gallery_config->get('items_per_page'); |
|
322 | 322 | $this->pagination->generate_template_pagination(array( |
323 | 323 | 'routes' => array( |
324 | 324 | 'phpbbgallery_core_search', |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | * @since 1.2.0 |
384 | 384 | */ |
385 | 385 | $vars = array('mode', 'tpl'); |
386 | - extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars)));//@todo: Correctly identify the event |
|
386 | + extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars))); //@todo: Correctly identify the event |
|
387 | 387 | break; |
388 | 388 | } |
389 | 389 | |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | |
407 | 407 | $num_images = $num_comments = 0; |
408 | 408 | $sql = 'SELECT SUM(image_comments) as comments |
409 | - FROM ' . $this->table_images .' |
|
409 | + FROM ' . $this->table_images . ' |
|
410 | 410 | WHERE image_status ' . (($readd) ? '=' : '<>') . ' ' . \phpbbgallery\core\block::STATUS_UNAPPROVED . ' |
411 | 411 | AND ' . $this->db->sql_in_set('image_id', $image_id_ary) . ' |
412 | 412 | GROUP BY image_user_id'; |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | $this->db->sql_freeresult($result); |
416 | 416 | |
417 | 417 | $sql = 'SELECT COUNT(image_id) images, image_user_id |
418 | - FROM ' . $this->table_images .' |
|
418 | + FROM ' . $this->table_images . ' |
|
419 | 419 | WHERE image_status ' . (($readd) ? '=' : '<>') . ' ' . \phpbbgallery\core\block::STATUS_UNAPPROVED . ' |
420 | 420 | AND ' . $this->db->sql_in_set('image_id', $image_id_ary) . ' |
421 | 421 | GROUP BY image_user_id'; |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | return; |
456 | 456 | } |
457 | 457 | |
458 | - $sql = 'SELECT * FROM ' . $this->table_images .' WHERE image_id = ' . (int) $image_id; |
|
458 | + $sql = 'SELECT * FROM ' . $this->table_images . ' WHERE image_id = ' . (int) $image_id; |
|
459 | 459 | $result = $this->db->sql_query($sql); |
460 | 460 | $row = $this->db->sql_fetchrow($result); |
461 | 461 | $this->db->sql_freeresult($result); |
@@ -515,14 +515,14 @@ discard block |
||
515 | 515 | { |
516 | 516 | self::handle_counter($image_id_ary, false); |
517 | 517 | |
518 | - $sql = 'UPDATE ' . $this->table_images .' |
|
518 | + $sql = 'UPDATE ' . $this->table_images . ' |
|
519 | 519 | SET image_status = ' . \phpbbgallery\core\block::STATUS_UNAPPROVED . ' |
520 | 520 | WHERE image_status <> ' . \phpbbgallery\core\block::STATUS_ORPHAN . ' |
521 | 521 | AND ' . $this->db->sql_in_set('image_id', $image_id_ary); |
522 | 522 | $this->db->sql_query($sql); |
523 | 523 | |
524 | 524 | $sql = 'SELECT image_id, image_name |
525 | - FROM ' . $this->table_images .' |
|
525 | + FROM ' . $this->table_images . ' |
|
526 | 526 | WHERE image_status <> ' . \phpbbgallery\core\block::STATUS_ORPHAN . ' |
527 | 527 | AND ' . $this->db->sql_in_set('image_id', $image_id_ary); |
528 | 528 | $result = $this->db->sql_query($sql); |
@@ -704,14 +704,14 @@ discard block |
||
704 | 704 | 'U_USER_IP' => $show_ip && $this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) ? $image_data['image_user_ip'] : false, |
705 | 705 | |
706 | 706 | 'S_IMAGE_REPORTED' => $image_data['image_reported'], |
707 | - 'U_IMAGE_REPORTED' => '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '', |
|
707 | + 'U_IMAGE_REPORTED' => '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '', |
|
708 | 708 | 'S_STATUS_APPROVED' => ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED), |
709 | 709 | 'S_STATUS_UNAPPROVED' => ($this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false, |
710 | 710 | 'S_STATUS_UNAPPROVED_ACTION' => ($this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => (int) $image_data['image_id'])) : '', |
711 | 711 | 'S_STATUS_LOCKED' => ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_LOCKED), |
712 | 712 | |
713 | 713 | 'U_REPORT' => ($this->gallery_auth->acl_check('m_report', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported'])*/ : '', |
714 | - 'U_STATUS' => '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '', |
|
714 | + 'U_STATUS' => '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '', |
|
715 | 715 | 'L_STATUS' => ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')), |
716 | 716 | )); |
717 | 717 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $sql = 'SELECT a2.* |
96 | 96 | FROM ' . $this->table_albums . ' a1 |
97 | - LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition .') AND a2.album_user_id = ' . (int) $branch_user_id .' |
|
97 | + LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition . ') AND a2.album_user_id = ' . (int) $branch_user_id . ' |
|
98 | 98 | WHERE a1.album_id = ' . (int) $album_id . ' |
99 | 99 | AND a1.album_user_id = ' . (int) $branch_user_id . ' |
100 | 100 | ORDER BY a2.left_id ' . (($order == 'descending') ? 'ASC' : 'DESC'); |
@@ -177,9 +177,9 @@ discard block |
||
177 | 177 | 'ALBUM_ID' => $album_data['album_id'], |
178 | 178 | 'ALBUM_NAME' => $album_data['album_name'], |
179 | 179 | 'ALBUM_DESC' => generate_text_for_display($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options']), |
180 | - 'ALBUM_CONTEST_START' => ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '', |
|
181 | - 'ALBUM_CONTEST_RATING' => ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '', |
|
182 | - 'ALBUM_CONTEST_END' => ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '', |
|
180 | + 'ALBUM_CONTEST_START' => ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '', |
|
181 | + 'ALBUM_CONTEST_RATING' => ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '', |
|
182 | + 'ALBUM_CONTEST_END' => ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '', |
|
183 | 183 | 'U_VIEW_ALBUM' => $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])), |
184 | 184 | )); |
185 | 185 | |
@@ -691,9 +691,9 @@ discard block |
||
691 | 691 | // phpbb_ext_gallery_core_image::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
692 | 692 | $lastimage_uc_thumbnail = $row['album_image'] ? generate_board_url() . '/' . $row['album_image'] : $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $row['album_last_image_id'])); |
693 | 693 | // phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
694 | - $lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
|
694 | + $lastimage_uc_name = ''; //@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
|
695 | 695 | // phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
696 | - $lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
|
696 | + $lastimage_uc_icon = ''; //@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
|
697 | 697 | } |
698 | 698 | else |
699 | 699 | { |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | $album_user_id = $image_data['album_user_id']; |
343 | 343 | |
344 | 344 | //@todo: $rating = new phpbb_gallery_image_rating($image_data['image_id'], $image_data, $image_data); |
345 | - $image_data['rating'] = '0';//@todo: $rating->get_image_rating(false, false); |
|
345 | + $image_data['rating'] = '0'; //@todo: $rating->get_image_rating(false, false); |
|
346 | 346 | //@todo: unset($rating); |
347 | 347 | |
348 | 348 | $s_user_allowed = (($image_data['image_user_id'] == $this->user->data['user_id']) && ($album_status != \phpbbgallery\core\block::ALBUM_LOCKED)); |
@@ -400,14 +400,14 @@ discard block |
||
400 | 400 | |
401 | 401 | 'U_USER_IP' => $show_ip && $this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) ? $image_data['image_user_ip'] : false, |
402 | 402 | 'S_IMAGE_REPORTED' => $image_data['image_reported'], |
403 | - 'U_IMAGE_REPORTED' => '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '', |
|
403 | + 'U_IMAGE_REPORTED' => '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '', |
|
404 | 404 | 'S_STATUS_APPROVED' => ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED), |
405 | 405 | 'S_STATUS_UNAPPROVED' => ($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false, |
406 | 406 | 'S_STATUS_UNAPPROVED_ACTION' => ($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => $image_data['image_id'])) : '', |
407 | 407 | 'S_STATUS_LOCKED' => ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_LOCKED), |
408 | 408 | |
409 | 409 | 'U_REPORT' => ($this->auth->acl_check('m_report', $image_data['image_album_id'], $album_user_id) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported'])*/ : '', |
410 | - 'U_STATUS' => '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '', |
|
410 | + 'U_STATUS' => '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '', |
|
411 | 411 | 'L_STATUS' => ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')), |
412 | 412 | |
413 | 413 | 'S_CONTEST_RANK' => $image_data['image_contest_rank'], |
@@ -159,7 +159,7 @@ |
||
159 | 159 | 'GALLERY_RESYNC_ALBUMS_TO_CPF_EXPAIN' => 'Diese Aktion wird alle persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellt Profilfelder resynchronisieren . <br> WARNUNG! Dies kann beim Vorhandensein sehr vieler solcher Alben sehr lange dauern!', |
160 | 160 | 'GALLERY_RESYNC_ALBUMS_TO_CPF_CONFIRM' => 'Bist Du sicher, dass Du den Resync aller persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellte Profilfelder durchführen willst?', |
161 | 161 | 'GALLERY_STATS' => 'Galerie Statistik', |
162 | - 'GALLERY_VERSION' => 'Version der phpBB Gallery',//ja mit ll und y, da es sich um den MOD-Namen handelt |
|
162 | + 'GALLERY_VERSION' => 'Version der phpBB Gallery', //ja mit ll und y, da es sich um den MOD-Namen handelt |
|
163 | 163 | 'GD_VERSION' => 'GD Version optimieren', |
164 | 164 | 'GENERAL_ALBUM_SETTINGS' => 'Allgemeine Albumseinstellungen', |
165 | 165 | 'GIF_ALLOWED' => 'Es ist erlaubt GIF-Dateien hochzuladen', |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | } |
261 | 261 | else |
262 | 262 | { |
263 | - $s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />'; |
|
263 | + $s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />'; |
|
264 | 264 | $s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />'; |
265 | 265 | foreach ($approve_ary as $id => $var) |
266 | 266 | { |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | } |
362 | 362 | else |
363 | 363 | { |
364 | - $s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />'; |
|
364 | + $s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />'; |
|
365 | 365 | $s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />'; |
366 | 366 | foreach ($report_ary as $var) |
367 | 367 | { |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | case 'reports_close': |
584 | 584 | if (confirm_box(true)) |
585 | 585 | { |
586 | - $back_link = $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id)); |
|
586 | + $back_link = $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id)); |
|
587 | 587 | $this->report->close_reports_by_image($image_id); |
588 | 588 | $message = $this->language->lang('WAITING_REPORTED_DONE', 1); |
589 | 589 | $this->url->meta_refresh(3, $back_link); |
@@ -679,7 +679,7 @@ discard block |
||
679 | 679 | 'REPORT_TIME' => $this->user->format_date($var['report_time']), |
680 | 680 | 'REPORT_NOTE' => $var['report_note'], |
681 | 681 | 'STATUS' => $var['report_status'], |
682 | - 'MANAGER' => $var['report_manager'] != 0 ? $this->user_loader->get_username($var['report_manager'], 'full') : false, |
|
682 | + 'MANAGER' => $var['report_manager'] != 0 ? $this->user_loader->get_username($var['report_manager'], 'full') : false, |
|
683 | 683 | )); |
684 | 684 | } |
685 | 685 | return $this->helper->render('gallery/moderate_image_overview.html', $this->language->lang('GALLERY')); |
@@ -804,7 +804,7 @@ discard block |
||
804 | 804 | $image_data = $this->image->get_image_data($image_id); |
805 | 805 | $album_id = $image_data['image_album_id']; |
806 | 806 | //$user_id = $image_data['image_user_id']; |
807 | - $album_data = $this->album->get_info($album_id); |
|
807 | + $album_data = $this->album->get_info($album_id); |
|
808 | 808 | $album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id)); |
809 | 809 | $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); |
810 | 810 | $album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login'); |
@@ -852,7 +852,7 @@ discard block |
||
852 | 852 | $image_data = $this->image->get_image_data($image_id); |
853 | 853 | $album_id = $image_data['image_album_id']; |
854 | 854 | //$user_id = $image_data['image_user_id']; |
855 | - $album_data = $this->album->get_info($album_id); |
|
855 | + $album_data = $this->album->get_info($album_id); |
|
856 | 856 | $album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id)); |
857 | 857 | $image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id)); |
858 | 858 | $album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login'); |
@@ -868,7 +868,7 @@ discard block |
||
868 | 868 | $image_id_ary = array($image_id); |
869 | 869 | $this->image->lock_images($image_id_ary, $album_data['album_id']); |
870 | 870 | // To DO - add notification |
871 | - $message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1)); |
|
871 | + $message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE', 1)); |
|
872 | 872 | meta_refresh($meta_refresh_time, $image_backlink); |
873 | 873 | trigger_error($message); |
874 | 874 | } |