@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | ), |
| 274 | 274 | 'params' => array( |
| 275 | 275 | ), |
| 276 | - ), 'pagination', 'page', $count, $limit, ($page-1) * $limit); |
|
| 276 | + ), 'pagination', 'page', $count, $limit, ($page - 1) * $limit); |
|
| 277 | 277 | } |
| 278 | 278 | else if ($album == -1) |
| 279 | 279 | { |
@@ -293,9 +293,9 @@ discard block |
||
| 293 | 293 | { |
| 294 | 294 | $url_array['sd'] = $additional['sort_dir']; |
| 295 | 295 | } |
| 296 | - $url = http_build_query($url_array,'','&'); |
|
| 296 | + $url = http_build_query($url_array, '', '&'); |
|
| 297 | 297 | |
| 298 | - $this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page-1) * $limit); |
|
| 298 | + $this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page - 1) * $limit); |
|
| 299 | 299 | } |
| 300 | 300 | else |
| 301 | 301 | { |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | 'params' => array( |
| 308 | 308 | 'album_id' => $album, |
| 309 | 309 | ), |
| 310 | - ), 'pagination', 'page', $count, $limit, ($page-1) * $limit); |
|
| 310 | + ), 'pagination', 'page', $count, $limit, ($page - 1) * $limit); |
|
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | 313 | } |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | if (($albums = $this->phpbb_cache->get('_albums')) === false) |
| 56 | 56 | { |
| 57 | 57 | $sql = 'SELECT a.album_id, a.parent_id, a.album_name, a.album_type, a.left_id, a.right_id, a.album_user_id, a.display_in_rrc, a.album_auth_access |
| 58 | - FROM ' . $this->table_albums. ' a |
|
| 58 | + FROM ' . $this->table_albums . ' a |
|
| 59 | 59 | LEFT JOIN ' . USERS_TABLE . ' u |
| 60 | 60 | ON (u.user_id = a.album_user_id) |
| 61 | 61 | ORDER BY u.username_clean, a.album_user_id, a.left_id ASC'; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | $phpbb_gallery_url = $phpbb_container->get('phpbbgallery.core.url'); |
| 28 | 28 | $phpbb_gallery_url->_include('functions_display', 'phpbb'); |
| 29 | 29 | |
| 30 | - $phpbb_ext_gallery_core_album =$phpbb_container->get('phpbbgallery.core.album'); |
|
| 30 | + $phpbb_ext_gallery_core_album = $phpbb_container->get('phpbbgallery.core.album'); |
|
| 31 | 31 | |
| 32 | 32 | $phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth'); |
| 33 | 33 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | function initialise_album() |
| 153 | 153 | { |
| 154 | - global $cache, $db, $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user; |
|
| 154 | + global $cache, $db, $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user; |
|
| 155 | 155 | global $request, $users_table, $phpbb_container; |
| 156 | 156 | |
| 157 | 157 | // we will have to initialse $phpbb_ext_gallery_user |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | |
| 446 | 446 | $this->language = $phpbb_container->get('language'); |
| 447 | 447 | |
| 448 | - $phpbb_gallery_url->_include(array('bbcode','message_parser'), 'phpbb'); |
|
| 448 | + $phpbb_gallery_url->_include(array('bbcode', 'message_parser'), 'phpbb'); |
|
| 449 | 449 | |
| 450 | 450 | $album_id = $request->variable('album_id', 0); |
| 451 | 451 | $phpbb_ext_gallery_core_album->check_user($album_id); |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | $sql = 'UPDATE ' . $albums_table . " |
| 829 | 829 | SET right_id = right_id - $delete_id |
| 830 | 830 | WHERE right_id > $right_id |
| 831 | - AND album_user_id = ". (int) $user->data['user_id']; |
|
| 831 | + AND album_user_id = " . (int) $user->data['user_id']; |
|
| 832 | 832 | $db->sql_query($sql); |
| 833 | 833 | } |
| 834 | 834 | |
@@ -1012,9 +1012,9 @@ discard block |
||
| 1012 | 1012 | $db->sql_freeresult($result); |
| 1013 | 1013 | |
| 1014 | 1014 | // Subscribed images |
| 1015 | - $start = $request->variable('start', 0); |
|
| 1016 | - $images_per_page = $phpbb_ext_gallery_config->get('items_per_page'); |
|
| 1017 | - $total_images = 0; |
|
| 1015 | + $start = $request->variable('start', 0); |
|
| 1016 | + $images_per_page = $phpbb_ext_gallery_config->get('items_per_page'); |
|
| 1017 | + $total_images = 0; |
|
| 1018 | 1018 | |
| 1019 | 1019 | $sql = 'SELECT COUNT(image_id) as images |
| 1020 | 1020 | FROM ' . $watch_table . ' |
@@ -129,12 +129,12 @@ |
||
| 129 | 129 | |
| 130 | 130 | if (isset($args[1])) |
| 131 | 131 | { |
| 132 | - $args[1] .= '';//@todo: phpbb_gallery::$display_popup; |
|
| 132 | + $args[1] .= ''; //@todo: phpbb_gallery::$display_popup; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $params = $args + array( |
| 136 | 136 | 0 => '', |
| 137 | - 1 => '',//@todo: phpbb_gallery::$display_popup, |
|
| 137 | + 1 => '', //@todo: phpbb_gallery::$display_popup, |
|
| 138 | 138 | 2 => true, |
| 139 | 139 | 3 => false, |
| 140 | 140 | ); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | function import() |
| 34 | 34 | { |
| 35 | - global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix ,$gallery_config, $gallery_album, $request; |
|
| 35 | + global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix, $gallery_config, $gallery_album, $request; |
|
| 36 | 36 | |
| 37 | 37 | $import_schema = $request->variable('import_schema', ''); |
| 38 | 38 | $images = $request->variable('images', array(''), true); |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | $album_id = $request->variable('album_id', 0); |
| 303 | 303 | if (isset($_POST['users_pega'])) |
| 304 | 304 | { |
| 305 | - $image_user = $phpbb_container->get('phpbbgallery.core.user'); |
|
| 305 | + $image_user = $phpbb_container->get('phpbbgallery.core.user'); |
|
| 306 | 306 | $image_user->set_user_id($user_row['user_id']); |
| 307 | 307 | if ($user->data['user_id'] != $user_row['user_id']) |
| 308 | 308 | { |
@@ -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', |
@@ -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 | } |
@@ -331,90 +331,90 @@ discard block |
||
| 331 | 331 | 'vars' => array( |
| 332 | 332 | '' => array(), |
| 333 | 333 | 'GALLERY_CONFIG' => array( |
| 334 | - 'items_per_page' => array('lang' => 'ITEMS_PER_PAGE', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true), |
|
| 335 | - 'allow_comments' => array('lang' => 'COMMENT_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 336 | - 'comment_user_control' => array('lang' => 'COMMENT_USER_CONTROL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 337 | - 'comment_length' => array('lang' => 'COMMENT_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'), |
|
| 338 | - 'allow_rates' => array('lang' => 'RATE_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 339 | - 'max_rating' => array('lang' => 'RATE_SCALE', 'validate' => 'int', 'type' => 'text:7:2'), |
|
| 340 | - 'allow_hotlinking' => array('lang' => 'HOTLINK_PREVENT', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 341 | - 'hotlinking_domains' => array('lang' => 'HOTLINK_ALLOWED', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), |
|
| 334 | + 'items_per_page' => array('lang' => 'ITEMS_PER_PAGE', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true), |
|
| 335 | + 'allow_comments' => array('lang' => 'COMMENT_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 336 | + 'comment_user_control' => array('lang' => 'COMMENT_USER_CONTROL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 337 | + 'comment_length' => array('lang' => 'COMMENT_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'), |
|
| 338 | + 'allow_rates' => array('lang' => 'RATE_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 339 | + 'max_rating' => array('lang' => 'RATE_SCALE', 'validate' => 'int', 'type' => 'text:7:2'), |
|
| 340 | + 'allow_hotlinking' => array('lang' => 'HOTLINK_PREVENT', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 341 | + 'hotlinking_domains' => array('lang' => 'HOTLINK_ALLOWED', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), |
|
| 342 | 342 | ), |
| 343 | 343 | |
| 344 | 344 | 'ALBUM_SETTINGS' => array( |
| 345 | - 'album_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 346 | - 'default_sort_key' => array('lang' => 'DEFAULT_SORT_METHOD', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_method_select'), |
|
| 347 | - 'default_sort_dir' => array('lang' => 'DEFAULT_SORT_ORDER', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_order_select'), |
|
| 348 | - 'album_images' => array('lang' => 'MAX_IMAGES_PER_ALBUM', 'validate' => 'int', 'type' => 'text:7:7', 'explain' => true), |
|
| 349 | - 'mini_thumbnail_disp' => array('lang' => 'DISP_FAKE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 350 | - 'mini_thumbnail_size' => array('lang' => 'FAKE_THUMB_SIZE', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'), |
|
| 345 | + 'album_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 346 | + 'default_sort_key' => array('lang' => 'DEFAULT_SORT_METHOD', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_method_select'), |
|
| 347 | + 'default_sort_dir' => array('lang' => 'DEFAULT_SORT_ORDER', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_order_select'), |
|
| 348 | + 'album_images' => array('lang' => 'MAX_IMAGES_PER_ALBUM', 'validate' => 'int', 'type' => 'text:7:7', 'explain' => true), |
|
| 349 | + 'mini_thumbnail_disp' => array('lang' => 'DISP_FAKE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 350 | + 'mini_thumbnail_size' => array('lang' => 'FAKE_THUMB_SIZE', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'), |
|
| 351 | 351 | ), |
| 352 | 352 | |
| 353 | 353 | 'SEARCH_SETTINGS' => array( |
| 354 | - 'search_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 354 | + 'search_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 355 | 355 | ), |
| 356 | 356 | |
| 357 | 357 | 'IMAGE_SETTINGS' => array( |
| 358 | - 'num_uploads' => array('lang' => 'UPLOAD_IMAGES', 'validate' => 'int', 'type' => 'text:7:2'), |
|
| 359 | - 'max_filesize' => array('lang' => 'MAX_FILE_SIZE', 'validate' => 'int', 'type' => 'text:12:9', 'append' => 'BYTES'), |
|
| 360 | - 'max_width' => array('lang' => 'MAX_WIDTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'), |
|
| 361 | - 'max_height' => array('lang' => 'MAX_HEIGHT', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'), |
|
| 362 | - 'allow_resize' => array('lang' => 'RESIZE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 363 | - 'allow_rotate' => array('lang' => 'ROTATE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 364 | - 'jpg_quality' => array('lang' => 'JPG_QUALITY', 'validate' => 'int', 'type' => 'text:7:5', 'explain' => true), |
|
| 358 | + 'num_uploads' => array('lang' => 'UPLOAD_IMAGES', 'validate' => 'int', 'type' => 'text:7:2'), |
|
| 359 | + 'max_filesize' => array('lang' => 'MAX_FILE_SIZE', 'validate' => 'int', 'type' => 'text:12:9', 'append' => 'BYTES'), |
|
| 360 | + 'max_width' => array('lang' => 'MAX_WIDTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'), |
|
| 361 | + 'max_height' => array('lang' => 'MAX_HEIGHT', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'), |
|
| 362 | + 'allow_resize' => array('lang' => 'RESIZE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 363 | + 'allow_rotate' => array('lang' => 'ROTATE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 364 | + 'jpg_quality' => array('lang' => 'JPG_QUALITY', 'validate' => 'int', 'type' => 'text:7:5', 'explain' => true), |
|
| 365 | 365 | //'medium_cache' => array('lang' => 'MEDIUM_CACHE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
| 366 | - 'medium_width' => array('lang' => 'RSZ_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'), |
|
| 367 | - 'medium_height' => array('lang' => 'RSZ_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'), |
|
| 368 | - 'allow_gif' => array('lang' => 'GIF_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 369 | - 'allow_jpg' => array('lang' => 'JPG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 370 | - 'allow_png' => array('lang' => 'PNG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 371 | - 'allow_webp' => array('lang' => 'WEBP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 372 | - 'allow_zip' => array('lang' => 'ZIP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 373 | - 'description_length' => array('lang' => 'IMAGE_DESC_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'), |
|
| 374 | - 'disp_nextprev_thumbnail' => array('lang' => 'DISP_NEXTPREV_THUMB','validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 375 | - 'disp_image_url' => array('lang' => 'VIEW_IMAGE_URL', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 366 | + 'medium_width' => array('lang' => 'RSZ_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'), |
|
| 367 | + 'medium_height' => array('lang' => 'RSZ_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'), |
|
| 368 | + 'allow_gif' => array('lang' => 'GIF_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 369 | + 'allow_jpg' => array('lang' => 'JPG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 370 | + 'allow_png' => array('lang' => 'PNG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 371 | + 'allow_webp' => array('lang' => 'WEBP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 372 | + 'allow_zip' => array('lang' => 'ZIP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 373 | + 'description_length' => array('lang' => 'IMAGE_DESC_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'), |
|
| 374 | + 'disp_nextprev_thumbnail' => array('lang' => 'DISP_NEXTPREV_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 375 | + 'disp_image_url' => array('lang' => 'VIEW_IMAGE_URL', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 376 | 376 | ), |
| 377 | 377 | |
| 378 | 378 | 'THUMBNAIL_SETTINGS' => array( |
| 379 | 379 | //'thumbnail_cache' => array('lang' => 'THUMBNAIL_CACHE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
| 380 | - 'gdlib_version' => array('lang' => 'GD_VERSION', 'validate' => 'int', 'type' => 'custom', 'method' => 'gd_radio'), |
|
| 381 | - 'thumbnail_width' => array('lang' => 'THUMBNAIL_WIDTH', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'), |
|
| 382 | - 'thumbnail_height' => array('lang' => 'THUMBNAIL_HEIGHT', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'), |
|
| 383 | - 'thumbnail_quality' => array('lang' => 'THUMBNAIL_QUALITY', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true, 'append' => 'PERCENT'), |
|
| 380 | + 'gdlib_version' => array('lang' => 'GD_VERSION', 'validate' => 'int', 'type' => 'custom', 'method' => 'gd_radio'), |
|
| 381 | + 'thumbnail_width' => array('lang' => 'THUMBNAIL_WIDTH', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'), |
|
| 382 | + 'thumbnail_height' => array('lang' => 'THUMBNAIL_HEIGHT', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'), |
|
| 383 | + 'thumbnail_quality' => array('lang' => 'THUMBNAIL_QUALITY', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true, 'append' => 'PERCENT'), |
|
| 384 | 384 | //'thumbnail_infoline' => array('lang' => 'INFO_LINE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
| 385 | 385 | ), |
| 386 | 386 | |
| 387 | 387 | 'WATERMARK_OPTIONS' => array( |
| 388 | - 'watermark_enabled' => array('lang' => 'WATERMARK_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 389 | - 'watermark_source' => array('lang' => 'WATERMARK_SOURCE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'watermark_source'), |
|
| 390 | - 'watermark_height' => array('lang' => 'WATERMARK_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'), |
|
| 391 | - 'watermark_width' => array('lang' => 'WATERMARK_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'), |
|
| 392 | - 'watermark_position' => array('lang' => 'WATERMARK_POSITION', 'validate' => '', 'type' => 'custom', 'method' => 'watermark_position'), |
|
| 388 | + 'watermark_enabled' => array('lang' => 'WATERMARK_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 389 | + 'watermark_source' => array('lang' => 'WATERMARK_SOURCE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'watermark_source'), |
|
| 390 | + 'watermark_height' => array('lang' => 'WATERMARK_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'), |
|
| 391 | + 'watermark_width' => array('lang' => 'WATERMARK_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'), |
|
| 392 | + 'watermark_position' => array('lang' => 'WATERMARK_POSITION', 'validate' => '', 'type' => 'custom', 'method' => 'watermark_position'), |
|
| 393 | 393 | ), |
| 394 | 394 | |
| 395 | 395 | 'UC_LINK_CONFIG' => array( |
| 396 | - 'link_thumbnail' => array('lang' => 'UC_THUMBNAIL', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'), |
|
| 397 | - 'link_imagepage' => array('lang' => 'UC_IMAGEPAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'), |
|
| 398 | - 'link_image_name' => array('lang' => 'UC_IMAGE_NAME', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'), |
|
| 399 | - 'link_image_icon' => array('lang' => 'UC_IMAGE_ICON', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'), |
|
| 396 | + 'link_thumbnail' => array('lang' => 'UC_THUMBNAIL', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'), |
|
| 397 | + 'link_imagepage' => array('lang' => 'UC_IMAGEPAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'), |
|
| 398 | + 'link_image_name' => array('lang' => 'UC_IMAGE_NAME', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'), |
|
| 399 | + 'link_image_icon' => array('lang' => 'UC_IMAGE_ICON', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'), |
|
| 400 | 400 | ), |
| 401 | 401 | |
| 402 | 402 | 'RRC_GINDEX' => array( |
| 403 | - 'rrc_gindex_mode' => array('lang' => 'RRC_GINDEX_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'), |
|
| 404 | - 'rrc_gindex_comments' => array('lang' => 'RRC_GINDEX_COMMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 403 | + 'rrc_gindex_mode' => array('lang' => 'RRC_GINDEX_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'), |
|
| 404 | + 'rrc_gindex_comments' => array('lang' => 'RRC_GINDEX_COMMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 405 | 405 | //'rrc_gindex_contests' => array('lang' => 'RRC_GINDEX_CONTESTS', 'validate' => 'int', 'type' => 'text:7:3'), |
| 406 | - 'rrc_gindex_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => '', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 407 | - 'rrc_gindex_pegas' => array('lang' => 'RRC_GINDEX_PGALLERIES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 406 | + 'rrc_gindex_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => '', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 407 | + 'rrc_gindex_pegas' => array('lang' => 'RRC_GINDEX_PGALLERIES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 408 | 408 | ), |
| 409 | 409 | |
| 410 | 410 | 'PHPBB_INTEGRATION' => array( |
| 411 | - 'disp_gallery_icon' => array('lang' => 'DISP_GALLERY_ICON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 412 | - 'disp_total_images' => array('lang' => 'DISP_TOTAL_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 413 | - 'profile_user_images' => array('lang' => 'DISP_USER_IMAGES_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 414 | - 'profile_pega' => array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 415 | - 'rrc_profile_mode' => array('lang' => 'RRC_PROFILE_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'), |
|
| 416 | - 'rrc_profile_items' => array('lang' => 'RRC_PROFILE_ITEMS', 'validate' => 'int', 'type' => 'text:7:3'), |
|
| 417 | - 'rrc_profile_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 411 | + 'disp_gallery_icon' => array('lang' => 'DISP_GALLERY_ICON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 412 | + 'disp_total_images' => array('lang' => 'DISP_TOTAL_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 413 | + 'profile_user_images' => array('lang' => 'DISP_USER_IMAGES_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 414 | + 'profile_pega' => array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 415 | + 'rrc_profile_mode' => array('lang' => 'RRC_PROFILE_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'), |
|
| 416 | + 'rrc_profile_items' => array('lang' => 'RRC_PROFILE_ITEMS', 'validate' => 'int', 'type' => 'text:7:3'), |
|
| 417 | + 'rrc_profile_display' => array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'), |
|
| 418 | 418 | //'rrc_profile_pegas' => array('lang' => 'RRC_GINDEX_PGALLERIES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
| 419 | 419 | //'viewtopic_icon' => array('lang' => 'DISP_VIEWTOPIC_ICON', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
| 420 | 420 | //'viewtopic_images' => array('lang' => 'DISP_VIEWTOPIC_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
@@ -422,15 +422,15 @@ discard block |
||
| 422 | 422 | ), |
| 423 | 423 | |
| 424 | 424 | 'INDEX_SETTINGS' => array( |
| 425 | - 'pegas_index_album' => array('lang' => 'PERSONAL_ALBUM_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 425 | + 'pegas_index_album' => array('lang' => 'PERSONAL_ALBUM_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 426 | 426 | //'pegas_index_random' => array('lang' => 'RANDOM_ON_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
| 427 | - 'pegas_index_rnd_count' => array('lang' => 'RANDOM_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'), |
|
| 427 | + 'pegas_index_rnd_count' => array('lang' => 'RANDOM_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'), |
|
| 428 | 428 | //'pegas_index_recent' => array('lang' => 'RECENT_ON_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
| 429 | - 'pegas_index_rct_count' => array('lang' => 'RECENT_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'), |
|
| 430 | - 'disp_login' => array('lang' => 'DISP_LOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 431 | - 'disp_whoisonline' => array('lang' => 'DISP_WHOISONLINE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 432 | - 'disp_birthdays' => array('lang' => 'DISP_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 433 | - 'disp_statistic' => array('lang' => 'DISP_STATISTIC', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 429 | + 'pegas_index_rct_count' => array('lang' => 'RECENT_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'), |
|
| 430 | + 'disp_login' => array('lang' => 'DISP_LOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 431 | + 'disp_whoisonline' => array('lang' => 'DISP_WHOISONLINE', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 432 | + 'disp_birthdays' => array('lang' => 'DISP_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 433 | + 'disp_statistic' => array('lang' => 'DISP_STATISTIC', 'validate' => 'bool', 'type' => 'radio:yes_no'), |
|
| 434 | 434 | ), |
| 435 | 435 | ), |
| 436 | 436 | ), |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | global $phpbb_container; |
| 574 | 574 | $this->language = $phpbb_container->get('language'); |
| 575 | 575 | |
| 576 | - $sort_order_options = '';//phpbb_gallery_plugins::uc_select($value, $key); |
|
| 576 | + $sort_order_options = ''; //phpbb_gallery_plugins::uc_select($value, $key); |
|
| 577 | 577 | |
| 578 | 578 | if ($key != 'link_imagepage') |
| 579 | 579 | { |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | $sort_order_options .= '<option' . (($value == 'none') ? ' selected="selected"' : '') . " value='none'>" . $this->language->lang('UC_LINK_NONE') . '</option>'; |
| 588 | 588 | |
| 589 | 589 | return "<select name='config[$key]' id='$key'>$sort_order_options</select>" |
| 590 | - . (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' . $this->language->lang('UPDATE_BBCODE') . '</label>' : ''); |
|
| 590 | + . (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' . $this->language->lang('UPDATE_BBCODE') . '</label>' : ''); |
|
| 591 | 591 | } |
| 592 | 592 | |
| 593 | 593 | /** |