diff --git a/admin.php b/admin.php index def7d2a47..8988205d7 100644 --- a/admin.php +++ b/admin.php @@ -394,12 +394,13 @@ if (userprefs_get_param('show_whats_new_'.$whats_new_major_version, true) and pw $release_note_url = PHPWG_URL.'/releases/'.$whats_new_major_version.'.0.0'; $whats_new_imgs = array( - '1' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-58ded6af.png', - '2' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-9d651969.png', - '3' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171643-d659d017.png', - '4' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-1109101f.png', + '1' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2025/11/12/20251112112645-7e309b67.png', + '2' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2025/11/12/20251112112645-61f2fcd0.png', + '3' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2025/11/12/20251112112646-b322153b.png', + // '4' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-1109101f.png', ); +//If last major update conf is less than a month old then display bell for whats new popin $display_bell = false; if (strtotime($conf['last_major_update']) > strtotime('1 month ago')) { diff --git a/admin/album_notification.php b/admin/album_notification.php index 3a56bac19..f9899f00b 100644 --- a/admin/album_notification.php +++ b/admin/album_notification.php @@ -33,6 +33,7 @@ $page['cat'] = $category['id']; // info by email to an access granted group of category informations if (isset($_POST['submitEmail'])) { + check_pwg_token(); set_make_full_url(); $img = array(); diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php index e3cf6f331..d2d875191 100644 --- a/admin/batch_manager_unit.php +++ b/admin/batch_manager_unit.php @@ -251,14 +251,6 @@ SELECT $storage_category_id = $row['storage_category_id']; } - $level_convert = [ - "0" => "4", - "1" => "3", - "2" => "2", - "4" => "1", - "8" => "0", - ]; - foreach ($images as $row) { $element_ids[] = $row['id']; @@ -402,10 +394,10 @@ SELECT 'tag_selection' => $tag_selection, 'U_DOWNLOAD' => 'action.php?id='.$row['id'].'&part=e&pwg_token='.get_pwg_token().'&download', 'U_HISTORY' => get_root_url().'admin.php?page=history&filter_image_id='.$row['id'], + 'U_ACTIVITY' => get_root_url().'admin.php?page=user_activity&photo='.$row['id'], 'U_DELETE' => $admin_url_start.'&delete=1&pwg_token='.get_pwg_token(), 'U_SYNC' => $admin_url_start.'&sync_metadata=1', 'PATH'=>$row['path'], - 'LEVEL_CONVERT' => $level_convert[!empty($row['level'])?$row['level']:'0'], 'level_options_selected' => array($selected_level) diff --git a/admin/cat_list.php b/admin/cat_list.php index 3a6747006..0d7b38a0a 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -326,7 +326,8 @@ foreach ($categories as $category) 'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'], 'U_MOVE' => $base_url.'albums#cat-'.$category['id'], - 'IS_VIRTUAL' => empty($category['dir']) + 'IS_VIRTUAL' => empty($category['dir']), + 'CAT_ADMIN_ACCESS' => cat_admin_access($category['id']), ); if (empty($category['dir'])) diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 8fe25a4f4..66c256882 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -187,6 +187,7 @@ $template->assign( 'CAT_NAME' => @htmlspecialchars($category['name']), 'CAT_COMMENT' => @htmlspecialchars($category['comment']), 'IS_VISIBLE' => boolean_to_string($category['visible']), + 'CAT_ADMIN_ACCESS' => cat_admin_access($category['id']), 'U_DELETE' => $base_url.'albums', @@ -199,6 +200,7 @@ $template->assign( 'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'], 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'], 'U_MOVE' => $base_url.'albums&parent_id='.$category['id'], + 'U_ACTIVITY' => get_root_url().'admin.php?page=user_activity&album='.$category['id'], ) ); diff --git a/admin/comments.php b/admin/comments.php index 2cd6b313b..133b545de 100644 --- a/admin/comments.php +++ b/admin/comments.php @@ -13,70 +13,12 @@ if (!defined('PHPWG_ROOT_PATH')) include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); -if (isset($_GET['start']) and is_numeric($_GET['start'])) -{ - $page['start'] = $_GET['start']; -} -else -{ - $page['start'] = 0; -} - // +-----------------------------------------------------------------------+ // | Check Access and exit when user status is not ok | // +-----------------------------------------------------------------------+ check_status(ACCESS_ADMINISTRATOR); -// +-----------------------------------------------------------------------+ -// | actions | -// +-----------------------------------------------------------------------+ - -if (!empty($_POST)) -{ - if (empty($_POST['comments'])) - { - $template->assign( - array( - 'save_warning' => l10n('Select at least one comment') - ) - ); - } - else - { - include_once( PHPWG_ROOT_PATH .'include/functions_comment.inc.php' ); - check_input_parameter('comments', $_POST, true, PATTERN_ID); - - if (isset($_POST['validate'])) - { - validate_user_comment($_POST['comments']); - - $template->assign( - array( - 'save_success' => l10n_dec( - '%d user comment validated', '%d user comments validated', - count($_POST['comments']) - ) - ) - ); - } - - if (isset($_POST['reject'])) - { - delete_user_comment($_POST['comments']); - - $template->assign( - array( - 'save_error' => l10n_dec( - '%d user comment rejected', '%d user comments rejected', - count($_POST['comments']) - ) - ) - ); - } - } -} - // +-----------------------------------------------------------------------+ // | template init | // +-----------------------------------------------------------------------+ @@ -85,7 +27,8 @@ $template->set_filenames(array('comments'=>'comments.tpl')); $template->assign( array( - 'F_ACTION' => get_root_url().'admin.php?page=comments' + 'F_ACTION' => get_root_url().'admin.php?page=comments', + 'PWG_TOKEN' => get_pwg_token(), ) ); @@ -102,128 +45,6 @@ $tabsheet->set_id('comments'); $tabsheet->select(''); $tabsheet->assign(); -// +-----------------------------------------------------------------------+ -// | comments display | -// +-----------------------------------------------------------------------+ - -$nb_total = 0; -$nb_pending = 0; - -$query = ' -SELECT - COUNT(*) AS counter, - validated - FROM '.COMMENTS_TABLE.' - GROUP BY validated -;'; -$result = pwg_query($query); -while ($row = pwg_db_fetch_assoc($result)) -{ - $nb_total+= $row['counter']; - - if ('false' == $row['validated']) - { - $nb_pending = $row['counter']; - } -} - -if (!isset($_GET['filter']) and $nb_pending > 0) -{ - $page['filter'] = 'pending'; -} -else -{ - $page['filter'] = 'all'; -} - -if (isset($_GET['filter']) and 'pending' == $_GET['filter']) -{ - $page['filter'] = $_GET['filter']; -} - -$template->assign( - array( - 'nb_total' => $nb_total, - 'nb_pending' => $nb_pending, - 'filter' => $page['filter'], - ) - ); - -$where_clauses = array('1=1'); - -if ('pending' == $page['filter']) -{ - $where_clauses[] = 'validated=\'false\''; -} - -$query = ' -SELECT - c.id, - c.image_id, - c.date, - c.author, - '.$conf['user_fields']['username'].' AS username, - c.content, - i.path, - i.representative_ext, - validated, - c.anonymous_id - FROM '.COMMENTS_TABLE.' AS c - INNER JOIN '.IMAGES_TABLE.' AS i - ON i.id = c.image_id - LEFT JOIN '.USERS_TABLE.' AS u - ON u.'.$conf['user_fields']['id'].' = c.author_id - WHERE '.implode(' AND ', $where_clauses).' - ORDER BY c.date DESC - LIMIT '.$page['start'].', '.$conf['comments_page_nb_comments'].' -;'; -$result = pwg_query($query); -while ($row = pwg_db_fetch_assoc($result)) -{ - $thumb = DerivativeImage::thumb_url( - array( - 'id'=>$row['image_id'], - 'path'=>$row['path'], - 'representative_ext'=>$row['representative_ext'], - ) - ); - if (empty($row['author_id'])) - { - $author_name = $row['author']; - } - else - { - $author_name = stripslashes($row['username']); - } - $template->append( - 'comments', - array( - 'U_PICTURE' => get_root_url().'admin.php?page=photo-'.$row['image_id'], - 'ID' => $row['id'], - 'TN_SRC' => $thumb, - 'AUTHOR' => trigger_change('render_comment_author', $author_name), - 'DATE' => format_date($row['date'], array('day_name','day','month','year','time')), - 'CONTENT' => trigger_change('render_comment_content',$row['content']), - 'IS_PENDING' => ('false' == $row['validated']), - 'IP' => $row['anonymous_id'], - ) - ); - - $list[] = $row['id']; -} - -// +-----------------------------------------------------------------------+ -// | navigation bar | -// +-----------------------------------------------------------------------+ - -$navbar = create_navigation_bar( - get_root_url().'admin.php'.get_query_string_diff(array('start')), - ('pending' == $page['filter'] ? $nb_pending : $nb_total), - $page['start'], - $conf['comments_page_nb_comments'] - ); - -$template->assign('navbar', $navbar); $template->assign('ADMIN_PAGE_TITLE', l10n('User comments')); // +-----------------------------------------------------------------------+ diff --git a/admin/configuration.php b/admin/configuration.php index 0c3f00303..bbc62cae2 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -112,6 +112,13 @@ $display_info_checkboxes = array( 'rating_score', ); +if (!isset($conf['filters_views'])) +{ + conf_update_param('filters_views', $conf['default_filters_views'], true); +} + +$filters_names_checkboxes = array_values(array_diff(array_keys(safe_unserialize($conf['filters_views'])), array('last_filters_conf'))); + // image order management $sort_fields = array( '' => '', @@ -277,6 +284,23 @@ if (isset($_POST['submit'])) $_POST['picture_informations'] = addslashes(serialize($_POST['picture_informations'])); break; } + case 'search' : + { + foreach( $filters_names_checkboxes as $checkbox) + { + if (empty($_POST['filters_views_box'][$checkbox])){ + $_POST['filters_views'][$checkbox]['access'] = 'nobody'; + $_POST['filters_views'][$checkbox]['default'] = false; + } + else{ + $_POST['filters_views'][$checkbox]['default'] = + empty($_POST['filters_views'][$checkbox]['default'])? false : true; + } + } + $_POST['filters_views']['last_filters_conf'] = + empty($_POST['filters_views']['last_filters_conf'])? false : true; + $_POST['filters_views'] = addslashes(serialize($_POST['filters_views'])); + } } // updating configuration if no error found @@ -322,10 +346,12 @@ WHERE param = \''.$row['param'].'\' // restore default derivatives settings if ('sizes' == $page['section'] and isset($_GET['action']) and 'restore_settings' == $_GET['action']) { - ImageStdParams::set_and_save( ImageStdParams::get_default_sizes() ); - pwg_query('DELETE FROM '.CONFIG_TABLE.' WHERE param = \'disabled_derivatives\''); + ImageStdParams::restore_default(); clear_derivative_cache(); + // reset conf + load_conf_from_db(); + $template->assign( array( 'save_success' => l10n('Your configuration settings are saved'), @@ -536,7 +562,7 @@ switch ($page['section']) // derivatives = multiple size $enabled = ImageStdParams::get_defined_type_map(); - $disabled = @unserialize(@$conf['disabled_derivatives']); + $disabled = safe_unserialize(ImageStdParams::get_disabled_type_map()); if ($disabled === false) { $disabled = array(); @@ -660,6 +686,17 @@ switch ($page['section']) break; } + case 'search': + { + $template->assign( + 'search', + array( + 'filters_views' => safe_unserialize($conf['filters_views']), + 'filters_names' => $filters_names_checkboxes, + ), + ); + $template->assign('SHOW_FILTER_RATINGS', $conf['rate']); + } } $template->assign('isWebmaster', (is_webmaster()) ? 1 : 0); diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php index 1f3e9b63f..11a2788cc 100644 --- a/admin/include/add_core_tabs.inc.php +++ b/admin/include/add_core_tabs.inc.php @@ -81,6 +81,7 @@ function add_core_tabs($sheets, $tab_id) $sheets['watermark'] = array('caption' => ''.l10n('Watermark'), 'url' => $conf_link.'watermark'); $sheets['display'] = array('caption' => ''.l10n('Display'), 'url' => $conf_link.'display'); $sheets['comments'] = array('caption' => ''.l10n('Comments'), 'url' => $conf_link.'comments'); + $sheets['search'] = array('caption' => ''.l10n('Search'), 'url' => $conf_link.'search'); // $sheets['default'] = array('caption' => l10n('Guest Settings'), 'url' => $conf_link.'default'); break; @@ -161,6 +162,7 @@ function add_core_tabs($sheets, $tab_id) $sheets['update'] = array('caption' => ''.l10n('Check for updates'), 'url' => $my_base_url.'&tab=update'); $sheets['new'] = array('caption' => ''.l10n('Add New Theme'), 'url' => $my_base_url.'&tab=new'); } + $sheets['standard_pages'] = array('caption' => ''.l10n('Standard pages'), 'url' => $my_base_url.'&tab=standard_pages'); break; case 'updates': diff --git a/admin/include/batch_manager_filters.inc.php b/admin/include/batch_manager_filters.inc.php index 4473576bc..1481ffc81 100644 --- a/admin/include/batch_manager_filters.inc.php +++ b/admin/include/batch_manager_filters.inc.php @@ -137,3 +137,5 @@ SELECT } $template->assign('associated_categories', $associated_categories); + +load_language('help_quick_search.lang'); \ No newline at end of file diff --git a/admin/include/configuration_sizes_process.inc.php b/admin/include/configuration_sizes_process.inc.php index f79a7c975..9110c835e 100644 --- a/admin/include/configuration_sizes_process.inc.php +++ b/admin/include/configuration_sizes_process.inc.php @@ -134,7 +134,7 @@ if (count($errors) == 0) ImageStdParams::$quality = intval($_POST['resize_quality']); $enabled = ImageStdParams::get_defined_type_map(); - $disabled = @unserialize( @$conf['disabled_derivatives'] ); + $disabled = safe_unserialize(ImageStdParams::get_disabled_type_map()); if ($disabled === false) { $disabled = array(); @@ -228,16 +228,7 @@ if (count($errors) == 0) } ImageStdParams::set_and_save($enabled_by); - if (count($disabled) == 0) - { - $query='DELETE FROM '.CONFIG_TABLE.' WHERE param = \'disabled_derivatives\''; - pwg_query($query); - } - else - { - conf_update_param('disabled_derivatives', addslashes(serialize($disabled)) ); - } - $conf['disabled_derivatives'] = serialize($disabled); + ImageStdParams::set_and_save_disabled($disabled); if (count($changed_types)) { diff --git a/admin/include/functions.php b/admin/include/functions.php index 71b3c2706..c5a26ebca 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -2583,7 +2583,7 @@ function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_ fclose($s); return false; } - $status = (integer) $m[2]; + $status = (int) $m[2]; if ($status < 200 || $status >= 400) { fclose($s); @@ -3636,6 +3636,30 @@ SELECT return; } } + + // search for duplicate paths + $query = ' +SELECT + path + FROM '.IMAGES_TABLE.' + GROUP BY path + HAVING COUNT(*) > 1 +;'; + $duplicate_paths = query2array($query); + + if (count($duplicate_paths) > 0) + { + global $template; + + $template->assign( + 'header_msgs', + array( + l10n('We have found %d duplicate paths. Details provided by plugin Check Uploads', count($duplicate_paths)), + ) + ); + + return; + } } /** @@ -3702,6 +3726,14 @@ function get_graphics_library() switch (pwg_image::get_library()) { + case 'ext_imagick': + exec($conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command().' -version', $returnarray); + if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match)) + { + $library.= '/'.$match[1]; + } + break; + case 'imagick': $img = new Imagick(); $version = $img->getVersion(); @@ -3711,14 +3743,6 @@ function get_graphics_library() } break; - case 'ext_imagick': - exec($conf['ext_imagick_dir'].'convert -version', $returnarray); - if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match)) - { - $library.= '/'.$match[1]; - } - break; - case 'gd': $gd_info = gd_info(); $library.= '/'.@$gd_info['GD Version']; diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index f667545b1..3a3aeb19f 100644 --- a/admin/include/functions_install.inc.php +++ b/admin/include/functions_install.inc.php @@ -65,7 +65,7 @@ function activate_core_themes() $themes = new themes(); foreach ($themes->fs_themes as $theme_id => $fs_theme) { - if (in_array($theme_id, array('modus', 'smartpocket'))) + if (in_array($theme_id, array('modus'))) { $themes->perform_action('activate', $theme_id); } diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php index 8f0bb5007..3c8c082b0 100644 --- a/admin/include/functions_metadata.php +++ b/admin/include/functions_metadata.php @@ -188,37 +188,44 @@ function get_sync_metadata($infos) $file = original_to_representative($file, $infos['representative_ext']); } - if (function_exists('mime_content_type') && in_array(mime_content_type($file), array('image/svg+xml', 'image/svg'))) + if (function_exists('mime_content_type')) { - $xml = file_get_contents($file); + $mime_type = mime_content_type($file); - $xmlget = simplexml_load_string($xml); - $xmlattributes = $xmlget->attributes(); - $width = $xmlattributes->width; - $height = $xmlattributes->height; - $vb = (string) $xmlattributes->viewBox; + if (str_starts_with($mime_type, 'image/')) + { + if (in_array($mime_type, array('image/svg+xml', 'image/svg'))) + { + $xml = file_get_contents($file); - if (isset($width) and $width != "") - { - $infos['width'] = (int) $width; - } elseif (isset($vb)) - { - $infos['width'] = round(explode(" ", $vb)[2]); + $xmlget = simplexml_load_string($xml); + $xmlattributes = $xmlget->attributes(); + $width = $xmlattributes->width; + $height = $xmlattributes->height; + $vb = (string) $xmlattributes->viewBox; + + if (isset($width) and $width != "") + { + $infos['width'] = (int) $width; + } elseif (isset($vb)) + { + $infos['width'] = round(explode(" ", $vb)[2]); + } + + if (isset($height) and $height != "") + { + $infos['height'] = (int) $height; + } elseif (isset($vb)) + { + $infos['height'] = round(explode(" ", $vb)[3]); + } + } + if ($image_size = @getimagesize($file)) + { + $infos['width'] = $image_size[0]; + $infos['height'] = $image_size[1]; + } } - - if (isset($height) and $height != "") - { - $infos['height'] = (int) $height; - } elseif (isset($vb)) - { - $infos['height'] = round(explode(" ", $vb)[3]); - } - } - - if ($image_size = @getimagesize($file)) - { - $infos['width'] = $image_size[0]; - $infos['height'] = $image_size[1]; } if ($is_tiff) @@ -243,7 +250,7 @@ function get_sync_metadata($infos) { if (isset($infos[$single_line_field])) { - foreach (array("\r\n", "\n") as $to_replace_string) + foreach (array("\r\n", "\n", "\r") as $to_replace_string) { $infos[$single_line_field] = str_replace($to_replace_string, ' ', $infos[$single_line_field]); } @@ -411,7 +418,7 @@ function metadata_normalize_keywords_string($keywords_string) $keywords_string = preg_replace($conf['metadata_keyword_separator_regex'], ',', $keywords_string); // new lines are always considered as keyword separators - $keywords_string = str_replace(array("\r\n", "\n"), ',', $keywords_string); + $keywords_string = str_replace(array("\r\n", "\n", "\r"), ',', $keywords_string); $keywords_string = preg_replace('/,+/', ',', $keywords_string); $keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string); diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php index 3ea729e1b..474062bd3 100644 --- a/admin/include/functions_upload.inc.php +++ b/admin/include/functions_upload.inc.php @@ -520,8 +520,36 @@ SELECT 'filesize' => $file_infos['filesize'], ); - single_insert(IMAGE_FORMAT_TABLE, $insert); - $format_id = pwg_db_insert_id(IMAGE_FORMAT_TABLE); + + $query = ' +SELECT + format_id + FROM '.IMAGE_FORMAT_TABLE.' + WHERE image_id = '.$format_of.' + AND ext = "'.$format_ext.'" +;'; + + $formats = query2array($query); + if($formats) + { + $set_fields = array( + 'filesize' => $file_infos['filesize'], + ); + $where_fields = array( + 'format_id' => $formats[0]['format_id'], + 'image_id' => $format_of, + 'ext' => $format_ext, + ); + single_update(IMAGE_FORMAT_TABLE, $set_fields, $where_fields); + $format_id = $formats[0]['format_id']; + $add_status = "update"; + } + else + { + single_insert(IMAGE_FORMAT_TABLE, $insert); + $format_id = pwg_db_insert_id(IMAGE_FORMAT_TABLE); + $add_status = "add"; + } pwg_activity('photo', $format_of, 'edit', array('action'=>'add format', 'format_ext'=>$format_ext, 'format_id'=>$format_id)); @@ -530,7 +558,7 @@ SELECT trigger_notify('loc_end_add_format', $format_infos); - return $format_id; + return $add_status; } add_event_handler('upload_file', 'upload_file_pdf'); @@ -562,12 +590,12 @@ function upload_file_pdf($representative_ext, $file_path) $representative_file_path = original_to_representative($file_path, $ext); prepare_directory(dirname($representative_file_path)); - $exec = $conf['ext_imagick_dir'].'convert'; + $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); + $exec.= ' "'.realpath($file_path).'"[0]'; if ('jpg' == $ext) { $exec.= ' -quality '.$jpg_quality; } - $exec.= ' "'.realpath($file_path).'"[0]'; $exec.= ' "'.$representative_file_path.'"'; $exec.= ' 2>&1'; @exec($exec, $returnarray); @@ -611,9 +639,9 @@ function upload_file_heic($representative_ext, $file_path) list($w,$h) = get_optimal_dimensions_for_representative(); - $exec = $conf['ext_imagick_dir'].'convert'; - $exec.= ' -sampling-factor 4:2:0 -quality 85 -interlace JPEG -colorspace sRGB -auto-orient +repage -resize "'.$w.'x'.$h.'>"'; + $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); $exec.= ' "'.realpath($file_path).'"'; + $exec.= ' -sampling-factor 4:2:0 -quality 85 -interlace JPEG -colorspace sRGB -auto-orient +repage -resize "'.$w.'x'.$h.'>"'; $exec.= ' "'.$representative_file_path.'"'; $exec.= ' 2>&1'; @@ -661,15 +689,14 @@ function upload_file_tiff($representative_ext, $file_path) prepare_directory(dirname($representative_file_path)); - $exec = $conf['ext_imagick_dir'].'convert'; + $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); + $exec .= ' "'.realpath($file_path).'"'; if ('jpg' == $conf['tiff_representative_ext']) { $exec .= ' -quality 98'; } - $exec .= ' "'.realpath($file_path).'"'; - $dest = pathinfo($representative_file_path); $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"'; @@ -808,7 +835,7 @@ function upload_file_psd($representative_ext, $file_path) prepare_directory(dirname($representative_file_path)); - $exec = $conf['ext_imagick_dir'].'convert'; + $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); $exec .= ' "'.realpath($file_path).'"'; @@ -870,9 +897,9 @@ function upload_file_eps($representative_ext, $file_path) // convert -density 300 image.eps -resize 2048x2048 image.png - $exec = $conf['ext_imagick_dir'].'convert'; - $exec.= ' -density 300'; + $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); $exec.= ' "'.realpath($file_path).'"'; + $exec.= ' -density 300'; $exec.= ' -resize 2048x2048'; $exec.= ' "'.$representative_file_path.'"'; $exec.= ' 2>&1'; @@ -919,6 +946,13 @@ function prepare_directory($directory) function need_resize($image_filepath, $max_width, $max_height) { + global $conf, $logger; + + if (!in_array(strtolower(get_extension($image_filepath)), $conf['picture_ext'])) + { + return false; + } + // TODO : the resize check should take the orientation into account. If a // rotation must be applied to the resized photo, then we should test // invert width and height. @@ -926,6 +960,7 @@ function need_resize($image_filepath, $max_width, $max_height) if ($width > $max_width or $height > $max_height) { + $logger->info(__FUNCTION__.' '.(string)$image_filepath.' is too big (current='.$width.'x'.$height.'px Vs max='.$max_width.'x'.$max_height.'px)'); return true; } @@ -1077,7 +1112,7 @@ function get_optimal_dimensions_for_representative() global $conf; $enabled = ImageStdParams::get_defined_type_map(); - $disabled = @unserialize(@$conf['disabled_derivatives']); + $disabled = safe_unserialize(ImageStdParams::get_disabled_type_map()); if ($disabled === false) { $disabled = array(); diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 9ae2350cd..67718acf2 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -368,6 +368,29 @@ class pwg_image return (extension_loaded('imagick') and class_exists('Imagick')); } + static function get_ext_imagick_command() + { + global $page, $conf; + + if (!isset($page['ext_imagick_command'])) + { + $retval=null; + $cmd_out=null; + // check if magick is in path + exec('command -v '.$conf['ext_imagick_dir'].'magick', $cmd_out , $retval ); + if (0 == $retval) + { + $page['ext_imagick_command'] = 'magick'; + } + else + { + $page['ext_imagick_command'] = 'convert'; + } + } + + return $page['ext_imagick_command']; + } + static function is_ext_imagick() { global $conf; @@ -376,7 +399,8 @@ class pwg_image { return false; } - @exec($conf['ext_imagick_dir'].'convert -version', $returnarray); + + @exec($conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command().' -version', $returnarray); if (is_array($returnarray) and !empty($returnarray[0]) and preg_match('/ImageMagick/i', $returnarray[0])) { if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match)) @@ -406,16 +430,16 @@ class pwg_image switch (strtolower($library)) { case 'auto': - case 'imagick': - if ($extension != 'gif' and self::is_imagick()) - { - return 'imagick'; - } case 'ext_imagick': if ($extension != 'gif' and self::is_ext_imagick()) { return 'ext_imagick'; } + case 'imagick': + if ($extension != 'gif' and self::is_imagick()) + { + return 'imagick'; + } case 'gd': if (self::is_gd()) { @@ -704,9 +728,15 @@ class image_ext_imagick implements imageInterface $this->add_command('sampling-factor', '4:2:2' ); } - $exec = $this->imagickdir.'convert'; + $exec = $this->imagickdir.pwg_image::get_ext_imagick_command(); $exec .= ' "'.realpath($this->source_filepath).'"'; + // If the image is animated webp add a filter to avoid breaking the animation + if ($this->is_animated_webp) + { + $exec .= ' -layers coalesce '; + } + foreach ($this->commands as $command => $params) { $exec .= ' -'.$command; @@ -715,7 +745,6 @@ class image_ext_imagick implements imageInterface $exec .= ' '.$params; } } - $dest = pathinfo($destination_filepath); $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'" 2>&1'; $logger->debug($exec, 'i.php'); diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php index fa53e7e15..1bc77351b 100644 --- a/admin/include/themes.class.php +++ b/admin/include/themes.class.php @@ -373,7 +373,6 @@ SELECT 'mobile' => false, ); $theme_data = implode('', file($path.'/themeconf.inc.php')); - if (preg_match("|Theme Name:\\s*(.+)|", $theme_data, $val)) { $theme['name'] = trim( $val[1] ); @@ -419,6 +418,10 @@ SELECT { $theme['mobile'] = get_boolean($val[1]); } + if (preg_match('/["\']use_standard_pages["\'].*?(true|false)/i', $theme_data, $val)) + { + $theme['use_standard_pages'] = get_boolean($val[1]); + } // screenshot $screenshot_path = $path.'/screenshot.png'; diff --git a/admin/intro.php b/admin/intro.php index c9629a5fe..1cbf28507 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -46,8 +46,8 @@ $tabsheet->assign(); if (isset($page['nb_pending_comments'])) { - $message = l10n('User comments').' '; - $message.= ''; + $message = l10n('User comments'); + $message.= ''; $message.= l10n('%d waiting for validation', $page['nb_pending_comments']); $message.= ' '; @@ -100,13 +100,41 @@ fs_quick_check(); $template->set_filenames(array('intro' => 'intro.tpl')); if ($conf['show_newsletter_subscription'] and userprefs_get_param('show_newsletter_subscription', true)) { - $template->assign( - array( - 'EMAIL' => $user['email'], - 'SUBSCRIBE_BASE_URL' => get_newsletter_subscribe_base_url($user['language']), - 'OLD_NEWSLETTERS_URL' => get_old_newsletters_base_url($user['language']), - ) - ); + $query = ' + SELECT registration_date + FROM '.USER_INFOS_TABLE.' + WHERE registration_date IS NOT NULL + ORDER BY user_id ASC + LIMIT 1 + ;'; + list($register_date) = pwg_db_fetch_row(pwg_query($query)); + + $query = ' + SELECT COUNT(*) + FROM '.CATEGORIES_TABLE.' + ;'; + list($nb_cats) = pwg_db_fetch_row(pwg_query($query)); + + $query = ' + SELECT COUNT(*) + FROM '.IMAGES_TABLE.' + ;'; + list($nb_images) = pwg_db_fetch_row(pwg_query($query)); + + include_once(PHPWG_ROOT_PATH.'include/mdetect.php'); + $uagent_obj = new uagent_info(); + // To see the newsletter promote, the account must have 2 weeks ancient, 3 albums created and 30 photos uploaded + + if (!$uagent_obj->DetectIos() and strtotime($register_date) < strtotime('2 weeks ago') and $nb_cats >= 3 and $nb_images >= 30){ + $template->assign( + array( + 'EMAIL' => $user['email'], + 'SUBSCRIBE_BASE_URL' => get_newsletter_subscribe_base_url($user['language']), + 'OLD_NEWSLETTERS_URL' => get_old_newsletters_base_url($user['language']), + ) + ); + } + } @@ -155,7 +183,7 @@ if ($conf['show_piwigo_latest_news']) if (isset($latest_news['id']) and $latest_news['posted_on'] > time()-60*60*24*30) { $page['messages'][] = sprintf( - '%s %s', + '%s %s', l10n('Latest Piwigo news'), $latest_news['url'], time_since($latest_news['posted_on'], 'year').' ('.$latest_news['posted'].')', diff --git a/admin/maintenance.php b/admin/maintenance.php index 4af358a3a..34c820152 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -49,6 +49,10 @@ $maint_actions = array( 'icon' => 'icon-info-circled-1', 'label' => l10n('Update photos information'), ), + 'empty_lounge' => array( + 'icon' => 'icon-thumbs-up', + 'label' => l10n('Empty lounge'), + ), 'delete_orphan_tags' => array( 'icon' => 'icon-tags', 'label' => l10n('Delete orphan tags'), diff --git a/admin/maintenance_actions.php b/admin/maintenance_actions.php index c001a2a1d..ea07c5564 100644 --- a/admin/maintenance_actions.php +++ b/admin/maintenance_actions.php @@ -159,6 +159,12 @@ DELETE $page['infos'][] = sprintf('%s : %s', l10n('Reinitialize check integrity'), l10n('action successfully performed.')); break; } + case 'empty_lounge': + { + $rows = empty_lounge(); + $page['infos'][] = sprintf('%d photos were moved from the upload lounge to their albums', count($rows)); + break; + } case 'search' : { $query = ' @@ -318,6 +324,16 @@ $template->assign( // graphics library switch (pwg_image::get_library()) { + case 'ext_imagick': + $library = 'External ImageMagick'; + exec($conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command().' -version', $returnarray); + if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match)) + { + $library .= ' ' . $match[1]; + } + $template->assign('GRAPHICS_LIBRARY', $library); + break; + case 'imagick': $library = 'ImageMagick'; $img = new Imagick(); @@ -328,17 +344,7 @@ switch (pwg_image::get_library()) } $template->assign('GRAPHICS_LIBRARY', $library); break; - - case 'ext_imagick': - $library = 'External ImageMagick'; - exec($conf['ext_imagick_dir'].'convert -version', $returnarray); - if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match)) - { - $library .= ' ' . $match[1]; - } - $template->assign('GRAPHICS_LIBRARY', $library); - break; - + case 'gd': $gd_info = gd_info(); $template->assign('GRAPHICS_LIBRARY', 'GD '.@$gd_info['GD Version']); @@ -362,6 +368,23 @@ else ); } +$query = ' +SELECT + COUNT(*) + FROM '.LOUNGE_TABLE.' +;'; +list($nb_lounge) = pwg_db_fetch_row(pwg_query($query)); + +if ($nb_lounge > 0) +{ + $template->assign( + array( + 'U_EMPTY_LOUNGE' => sprintf($url_format, 'empty_lounge'), + 'LOUNGE_COUNTER' => $nb_lounge, + ) + ); +} + $template->assign('isWebmaster', (is_webmaster()) ? 1 : 0); // +-----------------------------------------------------------------------+ diff --git a/admin/maintenance_env.php b/admin/maintenance_env.php index 2fd4a7440..b53a73d80 100644 --- a/admin/maintenance_env.php +++ b/admin/maintenance_env.php @@ -267,6 +267,13 @@ $php_current_timestamp = date("Y-m-d H:i:s"); $db_version = pwg_get_db_version(); list($db_current_date) = pwg_db_fetch_row(pwg_query('SELECT now();')); +list($container_name,$container_version) = get_container_info(); + +if (!in_array($container_name, ['Official','none'])) +{ + $container_name = '(unofficial) '.$container_name; +} + $template->assign( array( 'U_MAINT_CATEGORIES' => sprintf($url_format, 'categories'), @@ -289,6 +296,7 @@ $template->assign( 'PWG_VERSION' => PHPWG_VERSION, 'U_CHECK_UPGRADE' => sprintf($url_format, 'check_upgrade'), 'OS' => PHP_OS, + 'CONTAINER_INFO' => $container_name.(!empty($container_version) ? ' '.$container_version : ''), 'PHP_VERSION' => phpversion(), 'DB_ENGINE' => 'MySQL', 'DB_VERSION' => $db_version, diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php index e66fbbbc7..21fc3e372 100644 --- a/admin/photos_add_direct.php +++ b/admin/photos_add_direct.php @@ -26,7 +26,7 @@ DELETE FROM '.CADDIE_TABLE.' pwg_query($query); $inserts = array(); - foreach (explode(',', $_GET['batch']) as $image_id) + foreach (array_unique(explode(',', $_GET['batch'])) as $image_id) { $inserts[] = array( 'user_id' => $user['id'], @@ -85,6 +85,7 @@ $display_formats = $conf['enable_formats'] && isset($_GET['formats']); $have_formats_original = false; $formats_original_info = array(); +$formats_ext_info = null; // If URL parameter isn't empty if ($display_formats && $_GET['formats']) @@ -109,13 +110,16 @@ SELECT * if (!empty($formats)) { $format_strings = array(); + $formats_exts = array(); foreach ($formats as $format) { $format_strings[] = sprintf('%s (%.2fMB)', $format['ext'], $format['filesize']/1024); + $formats_exts[] = strtolower($format['ext']); } $formats_original_info['formats'] = l10n('Formats: %s', implode(', ', $format_strings)); + $formats_ext_info = json_encode($formats_exts); } $extTab = explode('.',$formats_original_info['file']); @@ -150,7 +154,8 @@ $template->assign(array( 'DISPLAY_FORMATS' => $display_formats, 'HAVE_FORMATS_ORIGINAL' => $have_formats_original, 'FORMATS_ORIGINAL_INFO' => $formats_original_info, - 'SWITCH_MODE_URL' => get_root_url().'admin.php?page=photos_add'.($display_formats ? '':'&formats'), + 'FORMATS_EXT_INFO' => $formats_ext_info, + 'SWITCH_FORMAT_MODE_URL' => get_root_url().'admin.php?page=photos_add'.($display_formats ? '':'&formats'), 'format_ext' => implode(',', $conf['format_ext']), 'str_format_ext' => implode(', ', $conf['format_ext']), )); diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 61b137e54..edf8845e7 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -19,7 +19,8 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); check_status(ACCESS_ADMINISTRATOR); check_input_parameter('image_id', $_GET, false, PATTERN_ID); -check_input_parameter('cat_id', $_GET, false, PATTERN_ID); +check_input_parameter('level', $_POST, false, '/^\d+$/'); +check_input_parameter('date_creation', $_POST, false, '/^\d\d\d\d-\d\d-\d\d( \d\d:\d\d:\d\d)?$/'); // retrieving direct information about picture. This may have been already // done on admin/photo.php but this page can also be accessed without @@ -54,37 +55,11 @@ if (isset($_GET['delete'])) // 2. else use the first reachable linked category // 3. redirect to gallery root - if (isset($_GET['cat_id']) and !empty($_GET['cat_id'])) + if ($custom_context = get_edit_context($_GET['image_id'])) { - redirect( - make_index_url( - array( - 'category' => get_cat_info($_GET['cat_id']) - ) - ) - ); - } - - $query = ' -SELECT category_id - FROM '.IMAGE_CATEGORY_TABLE.' - WHERE image_id = '.$_GET['image_id'].' -;'; - - $authorizeds = array_diff( - array_from_query($query, 'category_id'), - explode(',', calculate_permissions($user['id'], $user['status'])) - ); - - foreach ($authorizeds as $category_id) - { - redirect( - make_index_url( - array( - 'category' => get_cat_info($category_id) - ) - ) - ); + // considering we have a context available, we fake one to build the url + // and we replace it with the context found in the session for this image_id + redirect(str_replace('list/1,2', $custom_context, make_index_url(array('list'=>array(1,2))))); } redirect(make_index_url()); @@ -107,17 +82,12 @@ if (isset($_POST['submit'])) $data = array(); $data['id'] = $_GET['image_id']; - $data['name'] = $_POST['name']; - $data['author'] = $_POST['author']; $data['level'] = $_POST['level']; - if ($conf['allow_html_descriptions']) + $to_sanitize_fields = array('name', 'author', 'comment'); + foreach ($to_sanitize_fields as $field) { - $data['comment'] = @$_POST['description']; - } - else - { - $data['comment'] = strip_tags(@$_POST['description']); + $data[$field] = $conf['allow_html_descriptions'] ? @$_POST[$field] : strip_tags(@$_POST[$field]); } if (!empty($_POST['date_creation'])) @@ -230,7 +200,6 @@ $template->set_filenames( ); $admin_url_start = $admin_photo_base_url.'-properties'; -$admin_url_start.= isset($_GET['cat_id']) ? '&cat_id='.$_GET['cat_id'] : ''; $src_image = new SrcImage($row); @@ -247,6 +216,7 @@ $template->assign( 'U_SYNC' => $admin_url_start.'&sync_metadata=1', 'U_DELETE' => $admin_url_start.'&delete=1&pwg_token='.get_pwg_token(), 'U_HISTORY' => get_root_url().'admin.php?page=history&filter_image_id='.$_GET['image_id'], + 'U_ACTIVITY' => get_root_url().'admin.php?page=user_activity&photo='.$_GET['image_id'], 'PATH'=>$row['path'], @@ -276,8 +246,8 @@ $template->assign( 'DATE_CREATION' => $row['date_creation'], 'DESCRIPTION' => - htmlspecialchars( isset($_POST['description']) ? - stripslashes($_POST['description']) : (empty($row['comment']) ? '' : $row['comment'])), + htmlspecialchars( isset($_POST['comment']) ? + stripslashes($_POST['comment']) : (empty($row['comment']) ? '' : $row['comment'])), 'F_ACTION' => get_root_url().'admin.php' @@ -395,42 +365,34 @@ $template->assign('related_categories_ids', $related_categories_ids); // jump to link // -// 1. find all linked categories that are reachable for the current user. -// 2. if a category is available in the URL, use it if reachable -// 3. if URL category not available or reachable, use the first reachable -// linked category -// 4. if no category reachable, no jumpto link -// 5. if level is too high for current user, no jumpto link +// 1. if an edit_context is available, we use it (without checking permissions) +// 2. else if user level is higher than image level, randomly find an authorized category +// 3. else no jumpto link -$query = ' +if ($custom_context = get_edit_context($_GET['image_id'])) +{ + $template->assign('U_JUMPTO', make_picture_url(array('image_id' => $_GET['image_id'])).'/'.$custom_context); +} +elseif ($user['level'] >= $page['image']['level']) +{ + $query = ' SELECT category_id FROM '.IMAGE_CATEGORY_TABLE.' WHERE image_id = '.$_GET['image_id'].' ;'; -$authorizeds = array_diff( - array_from_query($query, 'category_id'), - explode( - ',', - calculate_permissions($user['id'], $user['status']) - ) - ); - -if (isset($_GET['cat_id']) - and in_array($_GET['cat_id'], $authorizeds)) -{ - $url_img = make_picture_url( - array( - 'image_id' => $_GET['image_id'], - 'image_file' => $image_file, - 'category' => $cache['cat_names'][ $_GET['cat_id'] ], + $authorizeds = array_diff( + array_from_query($query, 'category_id'), + explode( + ',', + calculate_permissions($user['id'], $user['status']) ) ); -} -else -{ - foreach ($authorizeds as $category) + + if (count($authorizeds) > 0) { + $category = $authorizeds[array_rand($authorizeds)]; + $url_img = make_picture_url( array( 'image_id' => $_GET['image_id'], @@ -438,13 +400,9 @@ else 'category' => $cache['cat_names'][ $category ], ) ); - break; - } -} -if (isset($url_img) and $user['level'] >= $page['image']['level']) -{ - $template->assign( 'U_JUMPTO', $url_img ); + $template->assign('U_JUMPTO', $url_img); + } } // associate to albums diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index cc5a09900..1613e5cb0 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -247,11 +247,17 @@ UL.thumbnails li.rank-of-image {background-color: #ddd;} font-weight: bold; } -#batchManagerGlobal #applyFilter,#batchManagerGlobal .addFilter-button { +#batchManagerGlobal #applyFilter,#batchManagerGlobal .addFilter-button, +.buttonSecondary { color: #3C3C3C; background-color: #ececec; } +.buttonSecondary:hover { + color: #3C3C3C; + background-color: #aaa; +} + #batchManagerGlobal #applyFilter:hover, #batchManagerGlobal .addFilter-button:hover { color: #111; background-color: #ff9b32 ; @@ -442,6 +448,23 @@ label>p.group_select { color:#3c3c3c; } +/* Activity Tab in user manager */ + +.activity-date-selecter{ + background-color: #f9f9f9; + color : #3C3C3C; + border: 2px solid #D3D3D3; +} + +.activity-filter-container{ + color: #777777; + background-color: #FFFFFF; +} + +.selectize-control.user-selecter.single .selectize-input, .selectize-control.action-selecter.single .selectize-input{ + border-color: #D3D3D3 !important; +} + /* Selection mode */ .slider { @@ -464,7 +487,8 @@ input:focus + .slider { box-shadow: 0 0 1px #ffa646; } -#selection-mode-block{ +#selection-mode-block, +.selection-mode { background-color: #FAFAFA; border-left:1px solid #e6e6e6; } @@ -488,12 +512,14 @@ input:focus + .slider { color:#a0a0a0; } -#selection-mode-block button{ +#selection-mode-block button, +#commentsSelection button{ border: 1px solid #e7e7e7; } -#selection-mode-block button:hover{ +#selection-mode-block button:hover, +#commentsSelection button:hover { background-color: #ffa744; border: 1px solid #ffa744; } @@ -570,10 +596,6 @@ input:focus + .slider { background-color:#f9f9f9; } -.UsernameBlock.success_message{ - border:2px solid #c2f5c2; -} - .Tooltip p.TooltipText{ background-color:#f3f3f3; @@ -582,12 +604,13 @@ input:focus + .slider { } .ValidationUserAssociated, .ValidationUserDissociated{ - color:#00aa00 !important; - background-color:#c2f5c2; + color:#6DCE5E !important; + background-color:#EEFFEB; + border:1px solid #6DCE5E; } .ValidationUserAssociated p, .ValidationUserDissociated p { - color:#00aa00 !important; + color:#254520 !important; } /*------*/ @@ -629,7 +652,6 @@ table.dataTable thead th, table.dataTable.no-footer { background: #3C3C3C; } -.font-checkbox [class*=icon-check]:before { color:#444; } #watermarkPositionBox { border:2px solid #ccc; @@ -651,8 +673,10 @@ FORM#categoryOrdering p.albumActions .userSeparator {border: 1px solid #E1E1E1;} .afterUploadActions a.secondary_button {background-color: #ECECEC;} .afterUploadActions a.secondary_button:hover {background-color: #FFA646;} -.font-checkbox:hover {color: #FFA844;} +.font-checkbox:hover {color: #3C3C3C;} .font-checkbox.selected {color: #ffa646;} +.font-checkbox:hover .icon-check-empty, .font-checkbox:hover .icon-check {color: #FF7700;} +.font-checkbox .icon-check {color: #FFA646;} LEGEND {color: #3C3C3C;} a#showPermissions {color: #5B5B5B; border: 1px solid #D6D6D6; background-color: #FAFAFA;} @@ -665,6 +689,9 @@ a#showPermissions:hover {border-color: #A5A5A5;} .plupload_filelist_footer {background-color: #F5F5F5!important;} li.plupload_delete a {background: url("images/cancel.svg")!important; background-size: cover!important;} li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; background-size: cover!important;} +li.plupload_delete a span {background: #FFF;} +li.plupload_delete a:hover span {background: #FFF;} +li.plupload_delete a.remove-format:hover{color: #474747;} .addAlbumEmpty {color: #3C3C3C;} #permitAction p {background: #FFF;} @@ -714,6 +741,13 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; #batchManagerGlobal .ui-slider-range.ui-widget-header.ui-corner-all {border: 1px solid #ffaf58;} #batchManagerGlobal .font-checkbox.selected {color: #777;} +/* Picture add */ + +.upload-options, .upload-options-content, .options-open::after { + background-color: #f5f5f5; + color: #777777; +} + /* Category List */ .categoryContainer { margin: 0; @@ -840,12 +874,6 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; background-color: #f98100; } -.eiw .messages a { - background-color: #00529b; - color: #bde5f8; - padding: 2px 7px; -} - #wImg {background-color: #e5e5e5;} .cat-move-order-popin input[name=recursiveAutoOrder] { @@ -910,4 +938,217 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; .RenameTagPopInContainer { background-color:#fff; -} \ No newline at end of file +} + +/* Filters options */ +label:has(> .filters-icon-check:disabled), span:has(+ .filters-icon-check:disabled){ + color: #D5D5D5 !important; + cursor: not-allowed; +} + +.select-views{ + background-color: #f3f3f3; +} + +.filter-manager-options-container{ + color: #474747; +} + +.filter-manager-options-container:hover{ + background-color: #EDEDED; +} + +.filter-manager-options-container.selected-filter-container{ + background-color: #777777; + color: #FFFFFF; +} + +.filter-manager-options-container.selected-filter-container:hover{ + background-color: #5D5D5D; +} + +/* ------------- +Info +-------------*/ + +/*Success message*/ +.infos, +.info-message, +.update-user-success, +#AddUserUpdated, +#AddUserSuccess label, +.groupMessage, +div.jGrowl div.jGrowl-notification.success, +.AddPluginSuccess label, +.DeactivatePluginSuccess label, +.RestorePluginSuccess label, +.update-user-success, +.update-password-success, +.update-username-success{ + color: #254520; + background-color:#EEFFEB; +} + +.infos, +#AddUserSuccess label, +#AddUserUpdated { + border-left:4px solid #6DCE5E; /*Banner*/ +} + +.info-message, +.update-user-success, +.groupMessage, +div.jGrowl div.jGrowl-notification.success, +.AddPluginSuccess label, +.DeactivatePluginSuccess label, +.RestorePluginSuccess label, +.UsernameBlock.success_message, +.update-user-success, +.update-password-success, +.update-username-success{ + border:1px solid #6DCE5E; /*Rounded*/ +} + +.infos i, +.info-message i, +.update-user-success i, +.groupMessage::before, +.info-message::before, +div.success .jGrowl-popup-icon, +.AddPluginSuccess label::before, +.DeactivatePluginSuccess label::before, +.RestorePluginSuccess label::before, +.update-username-success .icon-ok{ + color:#6DCE5E; +} + +.infos a, +#AddUserSuccess .edit-now { + color: #3C3C3C; + background-color: #F6FFF4; + border:1px solid #6DCE5E; +} + +.infos a:hover{ + color: #3C3C3C; +} + +.AddPluginSuccess span, +.RestorePluginSuccess span, +.DeactivatePluginSuccess span { + color: #254520; +} + +/*Error message*/ + +.errors, +.info-error, +.AddUserErrors, +.groupError, +div.jGrowl div.jGrowl-notification.error, +.PluginActionError label, +.update-user-fail, +.AddAlbumErrors, +.EditUserErrors, +.update-password-fail, +.icon-red-error { + color: #502421; + background-color: #FFE7EB; +} + +.errors, +.AddUserErrors, +.AddAlbumErrors{ + border-left: 6px solid #EB3D33; /*Banner*/ +} + +.info-error, +.groupError, +div.jGrowl div.jGrowl-notification.error, +.PluginActionError label +.update-user-fail, +.EditUserErrors, +.update-password-fail, +.icon-red-error, +.update-user-fail, +.AddAlbumErrors{ + border:1px solid #EB3D33; /*Rounded*/ +} + +.errors i, +.AddUserErrors:before, +.groupError::before, +div.error .jGrowl-popup-icon, +.PluginActionError label::before, +.AddAlbumErrors::before { + color: #EB3D33; +} + +.errors a{ + color: #502421; + background-color: #FFF5F7; + border:1px solid #EB3D33; +} + +.info-error a:hover +.PluginActionError span, +.errors a:hover{ + color: #502421; +} + +/*Warning message*/ + +.warnings, +.info-warning { + background-color: #FFF3DB; + color: #563F26; +} + +.warnings { + border-left:6px solid #E18C32; +} + +.info-warning { + border:1px solid #E18C32; +} + +.info-warning::before, +.info-warning a::before, +.warnings i { + color: #E18C32; +} + +.warnings a, +.info-warning a{ + color: #563F26; + background-color: #FFFAEF; + border:1px solid #E18C32; +} + +.info-warning a:hover, +.warnings a:hover{ + color: #563F26; +} + +/*announcement message*/ + +.messages { + color: #274159; + background-color:#E3F5FF; + border-left:6px solid #4182BE; +} + +.messages i{ + color: #4182BE; +} + +.messages a{ + color: #274159; + background-color: #F5FBFF; + border:1px solid #4182BE; +} + +.info-message a:hover, +.messages a:hover{ + color: #274159; +} diff --git a/admin/themes/default/css/components/general.css b/admin/themes/default/css/components/general.css index a0c39986a..7ec373584 100644 --- a/admin/themes/default/css/components/general.css +++ b/admin/themes/default/css/components/general.css @@ -261,70 +261,172 @@ a.info-framed:hover { Info ------------- +.info, .errors, .warnings, .messages .info-message.icon-*, .info-warning.icon-*, .info-error.icon-* p (a) - */ -.info-message, .info-warning, .info-error { - height: 35px; - overflow: hidden; - border-radius: 20px; - display: flex; - padding: 0px 10px 0px 0px; - font-weight: bold; - margin-left: 10px; +/***Banner messages***/ +.infos, +.errors, +.warnings, +.messages, +#photosAddContent .infos, +.AddUserErrors, +.AddAlbumErrors, +.EditUserErrors, +.update-password-fail, +.icon-red-error { + text-align: left; + margin: 20px; + padding: 10px 5px; + font-weight:600; + flex-direction: row; + display: flex; + align-items: center; + justify-content: start; + border-radius:0px; +} + +.AddUserErrors{ + margin:10px 0; +} + +.AddAlbumErrors{ + margin:0; +} + +.infos ul, +.errors ul, +.warnings ul, +.messages ul, +#photosAddContent .infos ul{ + margin:10px 0; + padding-left:0; +} + +#photosAddContent .infos ul li, +.eiw ul li{ + padding:2px; + margin-bottom:2px; + display:flex; + align-items:center; +} + +.eiw ul li p, +.UsernameBlock.success_message{ + margin-right:0px; + margin:0; +} + +#photosAddContent .infos ul li:not(:last-child), +.eiw ul li:not(:last-child){ + margin-bottom:10px; +} + +.info-message a, +.info-warning a, +.info-error a, +.messages a, +#photosAddContent .infos ul li a, +.eiw ul li a{ + border-radius:4px; + margin:0 5px; + padding: 2px 7px; + cursor:pointer; } .info.hide { - display: none; + display: none; +} + +/***Rounded messages***/ + +.info-message, +.info-warning, +.info-error, +.update-user-success, +.update-user-fail, +.groupError, +.AddAlbumErrors, +.ValidationUserDissociated +.ValidationUserAssociated, +.update-user-success, +.update-password-success, +.update-username-success { + overflow: hidden; + border-radius: 30px; + padding: 10px 15px; + font-weight: bold; + align-items: start; + text-align:left; +} + +.info-message, +.info-warning, +.info-error, +.update-user-success, +.update-user-fail{ + display: flex; + margin-left: 10px; +} + +.update-username-success{ + display: flex; + margin-bottom: 10px; } .info-message p, .info-warning p, .info-error p { - margin: auto; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - text-align: initial; + margin: auto; + white-space: nowrap; + text-overflow: ellipsis; + text-align: initial; } -.info-message::before, .info-warning::before, .info-error::before { - line-height: 35px; - margin: 0px 10px; - font-size: 16px; -} - -.info-warning { - color: #ee8800; - background-color:#ffdd99; +.info-message::before, +.info-warning::before, +.info-error::before { + font-size: 16px; } .info-message { - display: none; - background-color: #c2f5c2; - color: #0a0; + display: none; } -.info-error { - color: #f22; - background-color: #ffd5dc; - display: none; - animation-name: info-error-appear ; - animation-duration: 0.4s; - animation-timing-function: ease; -} - -.info-message a:hover, .info-warning a:hover, .info-error a:hover { - color: white; +.info-error{ + display: none; + animation-name: info-error-appear ; + animation-duration: 0.4s; + animation-timing-function: ease; } @keyframes info-error-appear { - 25% { transform: translateX(-10px)} - 50% { transform: translateX(10px)} - 75% { transform: translateX(-10px)} - 100% { transform: translateX(0px)} - } + 25% { transform: translateX(-10px)} + 50% { transform: translateX(10px)} + 75% { transform: translateX(-10px)} + 100% { transform: translateX(0px)} +} + +/*** Message Icons ***/ + +.eiw-icon, +#photosAddContent .infos ul li a i, +.eiw ul li a i, +.AddAlbumErrors::before, +.groupError::before, +.ValidationUserDissociated i, +.ValidationUserAssociated i{ + margin-right:10px; + font-size: 16px; +} + +.AddAlbumErrors::before, +.groupError::before{ + margin-top: 3px; +} + +/***/ .tree .badge-container i.icon-imagefolder-01.nb-sub-photos:before{ margin-right:0.5em!important; diff --git a/admin/themes/default/fontello/config.json b/admin/themes/default/fontello/config.json index 031d3908d..7ead6cdd3 100644 --- a/admin/themes/default/fontello/config.json +++ b/admin/themes/default/fontello/config.json @@ -959,31 +959,17 @@ "src": "fontawesome" }, { - "uid": "7411608e7611ffd477aeec7d239f87e9", - "css": "dice", - "code": 59500, + "uid": "d274ac25d9de37832102af5fe6b23f6c", + "css": "warning-circled", + "code": 61797, "src": "custom_icons", - "selected": false, + "selected": true, "svg": { - "path": "M959 251.9V748.1C959 772.7 944.8 795.1 922.6 805.7L527.5 993.8C518.8 997.9 509.4 1000 500 1000S481.2 997.9 472.5 993.8L77.4 805.7C55.2 795.1 41 772.7 41 748.1V251.9C41 239.1 44.8 226.9 51.6 216.7 57.9 207.2 66.7 199.4 77.4 194.3L472.5 6.2C489.9-2.1 510.1-2.1 527.5 6.2L922.6 194.3C933.3 199.4 942.1 207.2 948.4 216.7 955.2 226.9 959 239.1 959 251.9ZM948.4 216.7C942.1 207.2 933.3 199.4 922.6 194.3L527.5 6.2C510.1-2.1 489.9-2.1 472.5 6.2L469.8 7.5 862.2 194.3C872.9 199.4 881.7 207.2 888 216.7 894.8 226.9 898.6 239.1 898.6 251.9V748.1C898.6 772.7 884.4 795.1 862.2 805.7L469.8 992.5 472.5 993.8C481.2 997.9 490.6 1000 500 1000S518.8 997.9 527.5 993.8L922.6 805.7C944.8 795.1 959 772.7 959 748.1V251.9C959 239.1 955.2 226.9 948.4 216.7ZM500 430.2V1000C490.6 1000 481.2 997.9 472.5 993.8L77.4 805.7C55.2 795.1 41 772.7 41 748.1V251.9C41 239.1 44.8 226.9 51.6 216.7ZM959 251.9V748.1C959 772.4 945.1 794.7 923.3 805.4 923 805.5 922.8 805.6 922.6 805.7L527.5 993.8C518.8 997.9 509.4 1000 500 1000V430.2L948.4 216.7C955.2 226.9 959 239.1 959 251.9ZM948.4 216.7L897.6 240.9C898.2 244.5 898.6 248.2 898.6 251.9V748.1C898.6 772.4 884.7 794.7 862.9 805.4 862.6 805.5 862.4 805.6 862.2 805.7L500 978.1V1000C509.4 1000 518.8 997.9 527.5 993.8L922.6 805.7C922.8 805.6 923 805.5 923.3 805.4 945.1 794.7 959 772.4 959 748.1V251.9C959 239.1 955.2 226.9 948.4 216.7Z", + "path": "M500 1000C776.2 1000 1000 776.2 1000 500 1000 223.8 776.2 0 500 0 223.8 0 0 223.8 0 500 0 776.2 223.8 1000 500 1000ZM500 250C526 250 546.9 270.9 546.9 296.9V515.6C546.9 541.6 526 562.5 500 562.5 474 562.5 453.1 541.6 453.1 515.6V296.9C453.1 270.9 474 250 500 250ZM562.5 687.5C562.5 722.1 534.6 750 500 750 465.4 750 437.5 722.1 437.5 687.5 437.5 652.9 465.4 625 500 625 534.6 625 562.5 652.9 562.5 687.5Z", "width": 1000 }, "search": [ - "dice" - ] - }, - { - "uid": "2dcb438d02f429cbd49c94515bc39498", - "css": "dice", - "code": 59402, - "src": "custom_icons", - "selected": false, - "svg": { - "path": "M959 251.9V748.1C959 772.7 944.8 795.1 922.6 805.7L527.5 993.8C518.8 997.9 509.4 1000 500 1000S481.2 997.9 472.5 993.8L77.4 805.7C55.2 795.1 41 772.7 41 748.1V251.9C41 239.1 44.8 226.9 51.6 216.7 57.9 207.2 66.7 199.4 77.4 194.3L472.5 6.2C489.9-2.1 510.1-2.1 527.5 6.2L922.6 194.3C933.3 199.4 942.1 207.2 948.4 216.7 955.2 226.9 959 239.1 959 251.9ZM948.4 216.7C942.1 207.2 933.3 199.4 922.6 194.3L527.5 6.2C510.1-2.1 489.9-2.1 472.5 6.2L469.8 7.5 862.2 194.3C872.9 199.4 881.7 207.2 888 216.7 894.8 226.9 898.6 239.1 898.6 251.9V748.1C898.6 772.7 884.4 795.1 862.2 805.7L469.8 992.5 472.5 993.8C481.2 997.9 490.6 1000 500 1000S518.8 997.9 527.5 993.8L922.6 805.7C944.8 795.1 959 772.7 959 748.1V251.9C959 239.1 955.2 226.9 948.4 216.7ZM500 430.2V1000C490.6 1000 481.2 997.9 472.5 993.8L77.4 805.7C55.2 795.1 41 772.7 41 748.1V251.9C41 239.1 44.8 226.9 51.6 216.7ZM959 251.9V748.1C959 772.4 945.1 794.7 923.3 805.4 923 805.5 922.8 805.6 922.6 805.7L527.5 993.8C518.8 997.9 509.4 1000 500 1000V430.2L948.4 216.7C955.2 226.9 959 239.1 959 251.9ZM948.4 216.7L897.6 240.9C898.2 244.5 898.6 248.2 898.6 251.9V748.1C898.6 772.4 884.7 794.7 862.9 805.4 862.6 805.5 862.4 805.6 862.2 805.7L500 978.1V1000C509.4 1000 518.8 997.9 527.5 993.8L922.6 805.7C922.8 805.6 923 805.5 923.3 805.4 945.1 794.7 959 772.4 959 748.1V251.9C959 239.1 955.2 226.9 948.4 216.7Z", - "width": 1000 - }, - "search": [ - "dice" + "warning-circled" ] } ] diff --git a/admin/themes/default/fontello/css/fontello-codes.css b/admin/themes/default/fontello/css/fontello-codes.css index 8e6d7f5f5..df0062b33 100644 --- a/admin/themes/default/fontello/css/fontello-codes.css +++ b/admin/themes/default/fontello/css/fontello-codes.css @@ -123,6 +123,7 @@ .icon-sort-alt-down:before { content: '\f161'; } /* '' */ .icon-sort-number-up:before { content: '\f162'; } /* '' */ .icon-thumbs-up:before { content: '\f164'; } /* '' */ +.icon-warning-circled:before { content: '\f165'; } /* '' */ .icon-down:before { content: '\f175'; } /* '' */ .icon-up:before { content: '\f176'; } /* '' */ .icon-right:before { content: '\f178'; } /* '' */ diff --git a/admin/themes/default/fontello/css/fontello-embedded.css b/admin/themes/default/fontello/css/fontello-embedded.css index 7ef9de534..fff9eb019 100644 --- a/admin/themes/default/fontello/css/fontello-embedded.css +++ b/admin/themes/default/fontello/css/fontello-embedded.css @@ -1,15 +1,15 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?89794999'); - src: url('../font/fontello.eot?89794999#iefix') format('embedded-opentype'), - url('../font/fontello.svg?89794999#fontello') format('svg'); + src: url('../font/fontello.eot?62408649'); + src: url('../font/fontello.eot?62408649#iefix') format('embedded-opentype'), + url('../font/fontello.svg?62408649#fontello') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'fontello'; - src: url('data:application/octet-stream;base64,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') format('woff'), - url('data:application/octet-stream;base64,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6CUAAAApAADoJgAA6CYAAAAqAADoJwAA6CcAAAArAADoKAAA6CgAAAAsAADoKQAA6CkAAAAtAADoKgAA6CoAAAAuAADoKwAA6CsAAAAvAADoLAAA6CwAAAAwAADoLQAA6C0AAAAxAADoLgAA6C4AAAAyAADoLwAA6C8AAAAzAADoMAAA6DAAAAA0AADoMQAA6DEAAAA1AADoMgAA6DIAAAA2AADoMwAA6DMAAAA3AADoNAAA6DQAAAA4AADoNQAA6DUAAAA5AADoNgAA6DYAAAA6AADoNwAA6DcAAAA7AADoOAAA6DgAAAA8AADoOQAA6DkAAAA9AADoOgAA6DoAAAA+AADoOwAA6DsAAAA/AADoPAAA6DwAAABAAADoPQAA6D0AAABBAADoPgAA6D4AAABCAADoPwAA6D8AAABDAADoQAAA6EAAAABEAADoQQAA6EEAAABFAADoQgAA6EIAAABGAADoQwAA6EMAAABHAADoRAAA6EQAAABIAADoRQAA6EUAAABJAADoRgAA6EYAAABKAADoRwAA6EcAAABLAADoSAAA6EgAAABMAADoSQAA6EkAAABNAADoSgAA6EoAAABOAADoSwAA6EsAAABPAADoTAAA6EwAAABQAADoTQAA6E0AAABRAADoTgAA6E4AAABSAADoTwAA6E8AAABTAADoUAAA6FAAAABUAADoUQAA6FEAAABVAADoUgAA6FIAAABWAADoUwAA6FMAAABXAADoVAAA6FQAAABYAADoVQAA6FUAAABZAADoVgAA6FYAAABaAADoVwAA6FcAAABbAADoWAAA6FgAAABcAADoWQAA6FkAAABdAADoWgAA6FoAAABeAADoWwAA6FsAAABfAADoXAAA6FwAAABgAADoXQAA6F0AAABhAADoXgAA6F4AAABiAADoXwAA6F8AAABjAADobAAA6GwAAABkAADobQAA6G0AAABlAADofgAA6H4AAABmAADofwAA6H8AAABnAADojgAA6I4AAABoAADojwAA6I8AAABpAADongAA6J4AAABqAADpmQAA6ZkAAABrAADwoAAA8KAAAABsAADwrgAA8K4AAABtAADwsAAA8LAAAABuAADwxQAA8MUAAABvAADwygAA8MoAAABwAADw4AAA8OAAAABxAADw6AAA8OgAAAByAADw8wAA8PMAAABzAADxDAAA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AUMBRAFFAUYBRwFIAUkBSgFLAUwBTQFOAU8BUAFRAVIBUwFUAVUBVgFXAVgBWQFaAVsBXAFdAV4BXwFgAWEBYgFjAWQBZQFmAWcBaAFpAWoBawFsAW0BbgFvAXABcQFyAXMBdAF1AXYBdwF4AXkBegF7AXwBfQF+AX8BgAGBAYIBgwGEAYUBhgGHAYgBiQGKAARjb2RlCWFkZC1hbGJ1bQZwdXp6bGUIbGFuZ3VhZ2UGc2lnbmFsBXVzZXJzBXRvb2xzCWFycm93cy1jdwhleGNoYW5nZQtmb2xkZXItb3BlbgVicnVzaAtmbG93LWJyYW5jaARtZW51CXN0YXItaGFsZgh1c2VyLWFkZAJjdwVncm91cAVnbG9iZQllcXVhbGl6ZXIGbWFpbC0xBnNlYXJjaARtb3ZlBnVwbG9hZAx1cGxvYWQtY2xvdWQDa2V5B25ldHdvcmsOaW5mby1jaXJjbGVkLTEIY2FsZW5kYXICb2sMaGVscC1jaXJjbGVkBmxvZ291dARmbGFnBXNwaW42CWhvdXJnbGFzcwVjaGVjawtjaGVjay1lbXB0eQ5jYW5jZWwtY2lyY2xlZAZjYW5jZWwEcGx1cwpvay1jaXJjbGVkDGhlYXJ0LWJyb2tlbghkb3dubG9hZAd6b29tLWluCHpvb20tb3V0CWF0dGVudGlvbgxiYWNrLWluLXRpbWUDY2N3B2V5ZS1vZmYEdXNlcghtb29uLWludgdzdW4taW52BGJvb2sJY2hhcnQtYmFyBmZsb3BweQJ0aAd0aC1saXN0CWRvd24tb3BlbglsZWZ0LW9wZW4LYXJyb3ctY29tYm8EdGgtMQlmbG93LXRyZWUGbGluay0xBWhlYXJ0BGhvbWUHdXNlcnMtMQVjbG9uZQxvYmplY3QtZ3JvdXAKZWxsaXBzaXMtdgl1c2Vycy1jb2cHdHJhc2gtMQt6b29tLXNxdWFyZRNncmlwLXZlcnRpY2FsLXNvbGlkCmRpY2Utc29saWQEbWFpbARzdGFyCnN0YXItZW1wdHkHcGljdHVyZQxwbHVzLWNpcmNsZWQEbGluawRsb2NrA2V5ZQR0YWdzBnBlbmNpbARjaGF0BXRyYXNoA2NvZwdjb2ctYWx0BndyZW5jaAZiYXNrZXQFY2xvY2sFYmxvY2sHc2h1ZmZsZQNhc2wFcGF1c2UIdGgt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') format('truetype'); + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,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AADoJQAAACkAAOgmAADoJgAAACoAAOgnAADoJwAAACsAAOgoAADoKAAAACwAAOgpAADoKQAAAC0AAOgqAADoKgAAAC4AAOgrAADoKwAAAC8AAOgsAADoLAAAADAAAOgtAADoLQAAADEAAOguAADoLgAAADIAAOgvAADoLwAAADMAAOgwAADoMAAAADQAAOgxAADoMQAAADUAAOgyAADoMgAAADYAAOgzAADoMwAAADcAAOg0AADoNAAAADgAAOg1AADoNQAAADkAAOg2AADoNgAAADoAAOg3AADoNwAAADsAAOg4AADoOAAAADwAAOg5AADoOQAAAD0AAOg6AADoOgAAAD4AAOg7AADoOwAAAD8AAOg8AADoPAAAAEAAAOg9AADoPQAAAEEAAOg+AADoPgAAAEIAAOg/AADoPwAAAEMAAOhAAADoQAAAAEQAAOhBAADoQQAAAEUAAOhCAADoQgAAAEYAAOhDAADoQwAAAEcAAOhEAADoRAAAAEgAAOhFAADoRQAAAEkAAOhGAADoRgAAAEoAAOhHAADoRwAAAEsAAOhIAADoSAAAAEwAAOhJAADoSQAAAE0AAOhKAADoSgAAAE4AAOhLAADoSwAAAE8AAOhMAADoTAAAAFAAAOhNAADoTQAAAFEAAOhOAADoTgAAAFIAAOhPAADoTwAAAFMAAOhQAADoUAAAAFQAAOhRAADoUQAAAFUAAOhSAADoUgAAAFYAAOhTAADoUwAAAFcAAOhUAADoVAAAAFgAAOhVAADoVQAAAFkAAOhWAADoVgAAAFoAAOhXAADoVwAAAFsAAOhYAADoWAAAAFwAAOhZAADoWQAAAF0AAOhaAADoWgAAAF4AAOhbAADoWwAAAF8AAOhcAADoXAAAAGAAAOhdAADoXQAAAGEAAOheAADoXgAAAGIAAOhfAADoXwAAAGMAAOhsAADobAAAAGQAAOhtAADobQAAAGUAAOh+AADofgAAAGYAAOh/AADofwAAAGcAAOiOAADojgAAAGgAAOiPAADojwAAAGkAAOieAADongAAAGoAAOmZAADpmQAAAGsAAPCgAADwoAAAAGwAAPCuAADwrgAAAG0AAPCwAADwsAAAAG4AAPDFAADwxQAAAG8AAPDKAADwygAAAHAAAPDgAADw4AAAAHEAAPDoAADw6AAAAHIAAPDzAADw8wAAAHMAAPEM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bABsAG8AIABwAHIAbwBqAGUAYwB0AC4AaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIoBAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAFFAUYBRwFIAUkBSgFLAUwBTQFOAU8BUAFRAVIBUwFUAVUBVgFXAVgBWQFaAVsBXAFdAV4BXwFgAWEBYgFjAWQBZQFmAWcBaAFpAWoBawFsAW0BbgFvAXABcQFyAXMBdAF1AXYBdwF4AXkBegF7AXwBfQF+AX8BgAGBAYIBgwGEAYUBhgGHAYgBiQGKAYsABGNvZGUJYWRkLWFsYnVtBnB1enpsZQhsYW5ndWFnZQZzaWduYWwFdXNlcnMFdG9vbHMJYXJyb3dzLWN3CGV4Y2hhbmdlC2ZvbGRlci1vcGVuBWJydXNoC2Zsb3ctYnJhbmNoBG1lbnUJc3Rhci1oYWxmCHVzZXItYWRkAmN3BWdyb3VwBWdsb2JlCWVxdWFsaXplcgZtYWlsLTEGc2VhcmNoBG1vdmUGdXBsb2FkDHVwbG9hZC1jbG91ZANrZXkHbmV0d29yaw5pbmZvLWNpcmNsZWQtMQhjYWxlbmRhcgJvawxoZWxwLWNpcmNsZWQGbG9nb3V0BGZsYWcFc3BpbjYJaG91cmdsYXNzBWNoZWNrC2NoZWNrLWVtcHR5DmNhbmNlbC1jaXJjbGVkBmNhbmNlbARwbHVzCm9rLWNpcmNsZWQMaGVhcnQtYnJva2VuCGRvd25sb2FkB3pvb20taW4Iem9vbS1vdXQJYXR0ZW50aW9uDGJhY2staW4tdGltZQNjY3cHZXllLW9mZgR1c2VyCG1vb24taW52B3N1bi1pbnYEYm9vawljaGFydC1iYXIGZmxvcHB5AnRoB3RoLWxpc3QJZG93bi1vcGVuCWxlZnQtb3BlbgthcnJvdy1jb21ibwR0aC0xCWZsb3ctdHJlZQZsaW5rLTEFaGVhcnQEaG9tZQd1c2Vycy0xBWNsb25lDG9iamVjdC1ncm91cAplbGxpcHNpcy12CXVzZXJzLWNvZwd0cmFzaC0xC3pvb20tc3F1YXJlE2dyaXAtdmVydGljYWwtc29saWQKZGljZS1zb2xpZARtYWlsBHN0YXIKc3Rhci1lbXB0eQdwaWN0dXJlDHBsdXMtY2lyY2xlZARsaW5rBGxvY2sDZXllBHRhZ3MGcGVuY2lsBGNoYXQFdHJhc2gDY29nB2NvZy1hbHQGd3JlbmNoBmJhc2tldAVjbG9jawVibG9jawdzaHVmZmxlA2FzbAVwYXVzZQh0aC1sYXJnZQl0aC1saXN0LTEEZmlyZQRjb25lBGtpbmcGdXNlci0xCnVzZXItbWludXMKcm9ib3QtaGVhZAVwdWxzZQtyZXNpemUtZnVsbAxyZXNpemUtc21hbGwGcGl3aWdvDmltYWdlZm9sZGVyLTAxA2hkZAV0YXNrcwZmaWx0ZXIEZG9jcwtsaXN0LWJ1bGxldAhtYWlsLWFsdAdzaXRlbWFwBGJlbGwMY2lyY2xlLWVtcHR5BGNyb3AIZWxsaXBzaXMNZWxsaXBzaXMtdmVydAxzb3J0LW5hbWUtdXALc29ydC1hbHQtdXANc29ydC1hbHQtZG93bg5zb3J0LW51bWJlci11cAl0aHVtYnMtdXAPd2FybmluZy1jaXJjbGVkBGRvd24CdXAFcmlnaHQLZG90LWNpcmNsZWQIZGF0YWJhc2UKZmlsZS1pbWFnZQlmaWxlLWNvZGUIbGlmZWJ1b3kKdG9nZ2xlLW9mZgl0b2dnbGUtb24LdXNlci1zZWNyZXQKdGVsZXZpc2lvbgAAAAAAAQAB//8ADwAAAAAAAAAAAAAAAAAAAACwACwgsABVWEVZICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWG5CAAIAGNjI2IbISGwAFmwAEMjRLIAAQBDYEItsAEssCBgZi2wAiwjISMhLbADLCBkswMUFQBCQ7ATQyBgYEKxAhRDQrElA0OwAkNUeCCwDCOwAkNDYWSwBFB4sgICAkNgQrAhZRwhsAJDQ7IOFQFCHCCwAkMjQrITARNDYEIjsABQWGVZshYBAkNgQi2wBCywAyuwFUNYIyEjIbAWQ0MjsABQWGVZGyBkILDAULAEJlqyKAENQ0VjRbAGRVghsAMlWVJbWCEjIRuKWCCw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') format('truetype'); } /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ @@ -17,7 +17,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?89794999#fontello') format('svg'); + src: url('../font/fontello.svg?62408649#fontello') format('svg'); } } */ @@ -181,6 +181,7 @@ .icon-sort-alt-down:before { content: '\f161'; } /* '' */ .icon-sort-number-up:before { content: '\f162'; } /* '' */ .icon-thumbs-up:before { content: '\f164'; } /* '' */ +.icon-warning-circled:before { content: '\f165'; } /* '' */ .icon-down:before { content: '\f175'; } /* '' */ .icon-up:before { content: '\f176'; } /* '' */ .icon-right:before { content: '\f178'; } /* '' */ diff --git a/admin/themes/default/fontello/css/fontello-ie7-codes.css b/admin/themes/default/fontello/css/fontello-ie7-codes.css index 70a5c3397..84f35557c 100644 --- a/admin/themes/default/fontello/css/fontello-ie7-codes.css +++ b/admin/themes/default/fontello/css/fontello-ie7-codes.css @@ -123,6 +123,7 @@ .icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-sort-number-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-thumbs-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-warning-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/admin/themes/default/fontello/css/fontello-ie7.css b/admin/themes/default/fontello/css/fontello-ie7.css index 4ce596efc..367d3e85c 100644 --- a/admin/themes/default/fontello/css/fontello-ie7.css +++ b/admin/themes/default/fontello/css/fontello-ie7.css @@ -134,6 +134,7 @@ .icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-sort-number-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-thumbs-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-warning-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/admin/themes/default/fontello/css/fontello.css b/admin/themes/default/fontello/css/fontello.css index cda6790b0..b2928e324 100644 --- a/admin/themes/default/fontello/css/fontello.css +++ b/admin/themes/default/fontello/css/fontello.css @@ -1,11 +1,11 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?78376652'); - src: url('../font/fontello.eot?78376652#iefix') format('embedded-opentype'), - url('../font/fontello.woff2?78376652') format('woff2'), - url('../font/fontello.woff?78376652') format('woff'), - url('../font/fontello.ttf?78376652') format('truetype'), - url('../font/fontello.svg?78376652#fontello') format('svg'); + src: url('../font/fontello.eot?65700183'); + src: url('../font/fontello.eot?65700183#iefix') format('embedded-opentype'), + url('../font/fontello.woff2?65700183') format('woff2'), + url('../font/fontello.woff?65700183') format('woff'), + url('../font/fontello.ttf?65700183') format('truetype'), + url('../font/fontello.svg?65700183#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -15,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?78376652#fontello') format('svg'); + src: url('../font/fontello.svg?65700183#fontello') format('svg'); } } */ @@ -178,6 +178,7 @@ .icon-sort-alt-down:before { content: '\f161'; } /* '' */ .icon-sort-number-up:before { content: '\f162'; } /* '' */ .icon-thumbs-up:before { content: '\f164'; } /* '' */ +.icon-warning-circled:before { content: '\f165'; } /* '' */ .icon-down:before { content: '\f175'; } /* '' */ .icon-up:before { content: '\f176'; } /* '' */ .icon-right:before { content: '\f178'; } /* '' */ diff --git a/admin/themes/default/fontello/demo.html b/admin/themes/default/fontello/demo.html index b50647898..0f97b9f90 100644 --- a/admin/themes/default/fontello/demo.html +++ b/admin/themes/default/fontello/demo.html @@ -146,11 +146,11 @@ } @font-face { font-family: 'fontello'; - src: url('./font/fontello.eot?33455480'); - src: url('./font/fontello.eot?33455480#iefix') format('embedded-opentype'), - url('./font/fontello.woff?33455480') format('woff'), - url('./font/fontello.ttf?33455480') format('truetype'), - url('./font/fontello.svg?33455480#fontello') format('svg'); + src: url('./font/fontello.eot?73593940'); + src: url('./font/fontello.eot?73593940#iefix') format('embedded-opentype'), + url('./font/fontello.woff?73593940') format('woff'), + url('./font/fontello.ttf?73593940') format('truetype'), + url('./font/fontello.svg?73593940#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -645,6 +645,9 @@
+
+ icon-warning-circled0xf165 +
icon-down0xf175
@@ -654,11 +657,11 @@
icon-right0xf178
+
+
icon-dot-circled0xf192
-
-
icon-database0xf1c0
@@ -668,11 +671,11 @@
icon-file-code0xf1c9
+
+
icon-lifebuoy0xf1cd
-
-
icon-toggle-off0xf204
@@ -682,6 +685,8 @@
icon-user-secret0xf21b
+
+
icon-television0xf26c
diff --git a/admin/themes/default/fontello/font/fontello.eot b/admin/themes/default/fontello/font/fontello.eot index 0110a2f8f..5fb5c58ed 100644 Binary files a/admin/themes/default/fontello/font/fontello.eot and b/admin/themes/default/fontello/font/fontello.eot differ diff --git a/admin/themes/default/fontello/font/fontello.svg b/admin/themes/default/fontello/font/fontello.svg index 98f0ebc3c..e8d9ca437 100644 --- a/admin/themes/default/fontello/font/fontello.svg +++ b/admin/themes/default/fontello/font/fontello.svg @@ -1,7 +1,7 @@ -Copyright (C) 2024 by original authors @ fontello.com +Copyright (C) 2026 by original authors @ fontello.com @@ -254,6 +254,8 @@ + + diff --git a/admin/themes/default/fontello/font/fontello.ttf b/admin/themes/default/fontello/font/fontello.ttf index d9f6ec806..86b484d2a 100644 Binary files a/admin/themes/default/fontello/font/fontello.ttf and b/admin/themes/default/fontello/font/fontello.ttf differ diff --git a/admin/themes/default/fontello/font/fontello.woff b/admin/themes/default/fontello/font/fontello.woff index a2e3c178b..22c0a7409 100644 Binary files a/admin/themes/default/fontello/font/fontello.woff and b/admin/themes/default/fontello/font/fontello.woff differ diff --git a/admin/themes/default/fontello/font/fontello.woff2 b/admin/themes/default/fontello/font/fontello.woff2 index b3be1ea25..4018eaf54 100644 Binary files a/admin/themes/default/fontello/font/fontello.woff2 and b/admin/themes/default/fontello/font/fontello.woff2 differ diff --git a/admin/themes/default/js/batchManagerFilter.js b/admin/themes/default/js/batchManagerFilter.js index 594cf3d4f..8e2bbf6ec 100644 --- a/admin/themes/default/js/batchManagerFilter.js +++ b/admin/themes/default/js/batchManagerFilter.js @@ -129,5 +129,13 @@ $(document).ready(function () { } } }); + + $('.help-popin-search').on('click', function() { + $('#modalQuickSearch').fadeIn(); + }); + + $('#closeModalQuickSearch').on('click', function() { + $('#modalQuickSearch').fadeOut(); + }); }) diff --git a/admin/themes/default/js/comments.js b/admin/themes/default/js/comments.js new file mode 100644 index 000000000..ca4844ffc --- /dev/null +++ b/admin/themes/default/js/comments.js @@ -0,0 +1,618 @@ +const commentsContainer = $('#comments'); +const advancedFilters = $('#advancedFilters'); +const switchMode = $('#toggleSelectionMode'); +const commentContainer = $('#commentContainer'); +const commentsAll = $('#commentsAll'); +const commentsValidated = $('#commentsValidated'); +const commentsPending = $('#commentsPending'); +const commentsList = $('#commentsList'); +const commentsNb = $('#commentsNb a'); +const filterAuthor = $('#filter_author'); +const filterDateStart = $('#filter_date_start'); +const filterDateEnd = $('#filter_date_end'); +const commentsSelectController = $('#commentsSelectController'); +const tabFilters = $('#tabFilters'); +const commentsSelectedArea = $('#commentsSelected'); +const commentsSelectedOthers = $('#commentsSelectedOthers'); +const modalViewComment = $('#modalViewComment'); + +const commentsPaginElipsis = '...'; +const commentsPaginItems = '%d'; +const commentsPaginItemsCurrent = '%d'; +const commentsOptionsFiltersAuthor = ''; +const commentsSelectedList = '

#%d

'; + +let commentsState = {}; +let commentsParams = { + status: 'all', + page: 0, + per_page: 5, +} + +let updateAuthorId = true; +let searchTimeOut = null; +let selectionMode = false; +let commentsSelected = []; + +$(function() { + $('#commentFilters').on('click', function() { + $(this).toggleClass('advanced-filter-open'); + advancedFilters.toggle(); + }); + + switchMode.on('change', function() { + $('#contentSelectMode').toggle(); + $('#headerSelectMode, #contentSelectMode').toggleClass('selection-mode'); + commentContainer.toggleClass('active'); + + if (!commentContainer.hasClass('active')) { + selectionMode = false; + $('.comment-select-checkbox').hide(); + + $('.comment-buttons').show(); + commentsSelectController.removeClass('show'); + tabFilters.show(); + commentsUnselectAll(); + } else { + selectionMode = true; + $('.comment-select-checkbox').show(); + + $('.comment-buttons').hide(); + tabFilters.hide(); + commentsSelectController.addClass('show'); + } + }); + + $('#selectAll').on('click', function() { + commentsSelectAll(); + }); + + $('#selectNone').on('click', function() { + commentsUnselectAll(); + }); + + $('#selectInvert').on('click', function() { + commentsInvertSelect(); + }); + + $('.tab-filters input').on('change', function() { + commentsParams.status = $(this).attr('data-status'); + commentsParams.page = 0; + getComments(commentsParams); + }); + + commentsNb.on('click', function() { + const nb = $(this).text(); + updateNbComments(nb); + commentsParams.page = 0; + getComments(commentsParams); + }); + + $('#closeModalViewComment').on('click', function() { + closeModalViewComment(); + }); + + $('#commentSearchInput').on('input', function() { + clearTimeout(searchTimeOut); + searchTimeOut = setTimeout(() => { + const search = $(this).val(); + + delete commentsParams.author_id; + delete commentsParams.f_min_date; + delete commentsParams.f_max_date; + + commentsParams.search = search; + getComments(commentsParams); + }, 300); + }); + + $('#commentsResetFilters').on('click', function() { + commentsClearFilters(); + }); + + $(window).on('keydown', function(e) { + if (e.key === 'Escape') { + closeModalViewComment(); + } + }); + + // get comments and set display + commentsParams.per_page = window.localStorage.getItem('adminCommentsNB') ?? 5 + updateNbComments(commentsParams.per_page); + getComments(commentsParams); +}); + + +function getComments(params) { + $.ajax({ + url: 'ws.php?format=json&method=pwg.userComments.getList', + type: 'GET', + dataType: 'json', + data: params, + success: (data) => { + if (data.stat === 'ok') { + // for debug + // console.log(data.result); + commentsState = {...data.result}; + commentsDisplaySummary(data.result.summary); + displayComments(data.result.comments); + commentsDiplayPagination(data.result.paging); + commentsDisplayFilters(data.result.filters); + + delete commentsParams.search; + } + }, + error: (e) => { + console.log(e); + $.alert({ title: str_an_error_has, content: "" , ...jConfirm_warning_options}); + } + }) +} + +function commentsDisplaySummary(summary) { + commentsAll.text(summary.all_comments); + commentsValidated.text(summary.validated); + commentsPending.text(summary.pending); +} + +function displayComments(comments) { + commentsList.empty(); + comments.forEach((comment) => { + const clone = $('.comment-template').clone(); + clone.removeClass('comment-template').addClass('comment'); + + clone.attr('id', comment.id); + clone.find('.comment-img').attr('src', comment.medium_url); + const raw_lenght = comment.raw_content.length; + const preview = raw_lenght > 50 ? comment.raw_content.substring(0, 50) + '...' : comment.raw_content; + clone.find('.comment-msg').text('"' + preview + '"'); + clone.find('.comment-author-name').text(comment.author); + clone.find('.comment-datetime').text(comment.date); + clone.find('.comment-delete').data('idx', comment.id); + clone.find('.comment-validate').data('idx', comment.id); + clone.find('.comment-content').data('idx', comment.id); + clone.find('.comment-hash').text(`#${comment.id}`); + clone.find('.comment-select-checkbox').val(comment.id); + clone.find('.comment-link').attr('href', comment.admin_link); + const authorIcons = clone.find('.comment-author-icon'); + + switch (comment.author_status) { + case "guest": + authorIcons.addClass('icon-user-secret icon-yellow'); + break; + + case "webmaster": + authorIcons.addClass('icon-user icon-purple'); + break; + + case "admin": + authorIcons.addClass('icon-user icon-green'); + break; + + case "main_user": + authorIcons.addClass('icon-king icon-blue'); + break; + + default: + authorIcons.addClass('icon-user icon-yellow'); + break; + } + + if (comment.is_pending) { + clone.find('.comment-validate').show(); + } else { + clone.find('.comment-container').addClass('comment-validated'); + } + + commentsList.append(clone); + }); + + $('.comment-delete').off('click').on('click', function(e) { + e.stopPropagation(); + const id = $(this).data('idx'); + deleteComment([id]); + }); + + $('.comment-validate').off('click').on('click', function(e) { + e.stopPropagation(); + const id = $(this).data('idx'); + validateComment([id]); + }); + + $('.comment-content').off('click').on('click', function() { + const id = $(this).data('idx'); + if (selectionMode) { + const checkbox = $(this).find('.comment-select-checkbox'); + + if (checkbox.hasClass('icon-circle-empty')) { + checkbox.removeClass('icon-circle-empty').addClass('icon-ok-circled'); + $(`#${id}`).addClass('comment-selected'); + commentsSelected.push(id); + + } else { + checkbox.removeClass('icon-ok-circled').addClass('icon-circle-empty'); + $(`#${id}`).removeClass('comment-selected'); + + commentsSelected = commentsSelected.filter((idx) => idx != id); + } + + commentsUpdateSelection(); + return; + } + + showModalViewComment(id); + }); +} + +function commentsDiplayPagination(paging) { + const container = $('.pagination-item-container'); + container.empty(); + + if (paging.total_pages == 0) { + const pageNumbers = paging.total_pages + 1; + const page = commentsPaginItems.replace(/%d/g, pageNumbers); + $(page).addClass('actual').appendTo(container); + + } else if (paging.total_pages <= 2) { + Array.from(Array(paging.total_pages + 1)).forEach((_, i) => { + const page = commentsPaginItems.replace(/%d/g, i + 1); + $(page).appendTo(container); + }); + $(`#comments_page_${paging.page + 1}`).addClass('actual'); + + } else { + const pageOne = commentsPaginItems.replace(/%d/g, 1); + const pageLast = commentsPaginItems.replace(/%d/g, paging.total_pages + 1); + const pageCurrent = commentsPaginItemsCurrent.replace(/%d/g, paging.page + 1); + + switch (paging.page) { + case 0: + container.append([ + pageCurrent, + commentsPaginElipsis, + pageLast + ]); + break; + + case paging.total_pages: + container.append([ + pageOne, + commentsPaginElipsis, + pageCurrent + ]); + break; + + default: + container.append([ + pageOne, + commentsPaginElipsis, + pageCurrent, + commentsPaginElipsis, + pageLast + ]); + break; + } + + $('.pagination-arrow').removeClass('unavailable') + .off('click').on('click', function() { + let newPage = commentsParams.page; + if ($(this).hasClass('left')) { + newPage = newPage - 1; + } else { + newPage = newPage + 1; + } + + if (newPage == -1 || newPage > commentsState.paging.total_pages) { + return; + } + commentsParams.page = newPage; + getComments(commentsParams); + }); + } + + $('.comments-paging').off('click').on('click', function() { + const newPage = $(this).attr('data-page') - 1; + commentsParams.page = newPage; + getComments(commentsParams); + }); + + +} + +function commentsDisplayFilters(filters) { + if (updateAuthorId) { + commentsDisplayAuthors(filters.nb_authors); + } + // reset here to let decide filterAuthor onChange + updateAuthorId = true; + + const minDate = filters.started_at?.split(' ')[0] ?? ''; + const maxDate = filters.ended_at?.split(' ')[0] ?? '' + filterDateStart.val(minDate).attr({ 'min': minDate, 'max': maxDate }); + filterDateEnd.val(maxDate).attr({ 'max': maxDate, 'min': minDate }); + + + filterDateStart.off('change').on('change', function() { + const min = $(this).val(); + + if (!min) { + delete commentsParams.f_min_date; + } else { + commentsParams.f_min_date = min; + } + + filterDateEnd.attr({ 'min': min }); + commentsParams.page = 0; + getComments(commentsParams); + }); + + filterDateEnd.off('change').on('change', function() { + const max = $(this).val(); + + if (!max) { + delete commentsParams.f_max_date; + } else { + commentsParams.f_max_date = max; + } + + filterDateStart.attr({ 'max': max }); + commentsParams.page = 0; + getComments(commentsParams); + }); +} + +function commentsDisplayAuthors(nb_authors) { + filterAuthor.empty(); + filterAuthor.append(commentsOptionsFiltersAuthor); + + nb_authors.forEach((a) => { + filterAuthor.append(` + + `); + }); + + filterAuthor.off('change').on('change', function() { + const authorId = $(this).val(); + + if (!authorId) { + delete commentsParams.author_id; + } else { + commentsParams.author_id = authorId; + } + + commentsParams.page = 0; + updateAuthorId = false; + getComments(commentsParams); + }); +} + +function updateNbComments(nb) { + commentsNb.removeClass('selected-pagination'); + $(`#pagination-per-page-${nb}`).addClass('selected-pagination'); + + commentsParams.per_page = nb; + window.localStorage.setItem('adminCommentsNB', nb); +} + +function showModalViewComment(id) { + const comment = commentsState.comments.filter((c) => c.id == id)[0] ?? null; + if (!comment) return; + + const item = $(`#${id}`); + modalViewComment.find('.comment-datetime').text(comment.date); + modalViewComment.find('.comment-author').remove(); + modalViewComment.find('.comments-modal-infos').prepend(item.find('.comment-author').clone()); + modalViewComment.find('.comments-modal-img').attr('src', comment.medium_url); + modalViewComment.find('.comments-modal-img-i').empty() + .append(` +

${comment.file}

+

${comment.image_date_available}

+ `); + modalViewComment.find('.comments-modal-body').html(comment.content) + + const validBtn = modalViewComment.find('.comments-modal-validate'); + if (comment.is_pending) { + validBtn.show(); + $('#commentsModalValidate').off('click').on('click', function() { + validateComment([id]); + closeModalViewComment(); + }); + } else { + validBtn.hide(); + } + + $('#commentsModalDelete').off('click').on('click', function() { + deleteComment([id]); + closeModalViewComment(); + }); + + modalViewComment.fadeIn(); +} + +function closeModalViewComment() { + modalViewComment.fadeOut(); + $('#commentsModalValidate').off('click'); + $('#commentsModalDelete').off('click') +} + +function validateComment(id) { + const idLenght = id.length ?? 1; + + $.ajax({ + url: 'ws.php?format=json&method=pwg.userComments.validate', + type: 'POST', + dataType: 'json', + data: { + comment_id: id, + pwg_token: pwg_token + }, + success: function (res) { + if (res.stat === 'ok') { + $.alert({ + ...{ + title: idLenght > 1 ? str_comments_validated : str_comment_validated, + content: "", + }, + ...jConfirm_alert_options + }); + getComments(commentsParams); + return; + } + $.alert({ + ...{ + title: str_an_error_has, + content: "", + }, + ...jConfirm_warning_options + }); + }, + error: function (e) { + console.log(e) + $.alert({ + ...{ + title: str_an_error_has, + content: "", + }, + ...jConfirm_warning_options + }); + } + }); +} + +function deleteComment(id) { + const idLenght = id.length ?? 1; + + $.confirm({ + title: idLenght > 1 ? str_deletes.replace("%d", idLenght) : str_delete.replace("%s", id), + draggable: false, + titleClass: "jconfirmDeleteConfirm", + theme: "modern", + content: "", + animation: "zoom", + boxWidth: '30%', + useBootstrap: false, + type: 'red', + animateFromElement: false, + backgroundDismiss: true, + typeAnimated: false, + buttons: { + confirm: { + text: str_yes_delete_confirmation, + btnClass: 'btn-red', + action: function () { + $.ajax({ + url: 'ws.php?format=json&method=pwg.userComments.delete', + type: 'POST', + dataType: 'json', + data: { + comment_id: id, + pwg_token + }, + success: function(res) { + if (res.stat === 'ok') { + getComments(commentsParams); + } + }, + error: function(e) { + console.log(e) + } + }) + } + }, + cancel: { + text: str_no_delete_confirmation + } + } + }); +} + +function commentsUnselectAll() { + $('.comment').removeClass('comment-selected'); + $('.comment-select-checkbox') + .removeClass('icon-ok-circled') + .addClass('icon-circle-empty'); + + commentsSelected = []; + commentsUpdateSelection(); +} + +function commentsSelectAll(){ + $('.comment').addClass('comment-selected'); + $('.comment-select-checkbox') + .removeClass('icon-circle-empty') + .addClass('icon-ok-circled'); + + commentsSelected = []; + $('.comment-selected').each((i, el) => { + const id = $(el).attr('id'); + commentsSelected.push(id); + }); + commentsUpdateSelection(); +} + +function commentsInvertSelect() { + $('.comment').toggleClass('comment-selected'); + $('.comment-select-checkbox') + .toggleClass('icon-ok-circled') + .toggleClass('icon-circle-empty'); + + commentsSelected = []; + $('.comment-selected').each((i, el) => { + const id = $(el).attr('id'); + commentsSelected.push(id); + }); + commentsUpdateSelection(); +} + +function commentsUpdateSelection() { + if (commentsSelected.length === 0) { + $('#commentsSelection').hide(); + $('#commentsNoSelection').show(); + $('.comments-selected-remove').off('click'); + $('#ValisateSelectionMode').off('click'); + $('#DeleteSelectionMode').off('click'); + + return; + } + + commentsSelectedArea.empty(); + let count = 0; + commentsSelected.forEach((id) => { + if (count === 5) { + commentsSelectedOthers.text(str_and_others.replace(/%s/g, commentsSelected.length - 5)); + return; + } + commentsSelectedOthers.text(''); + const item = commentsSelectedList.replace(/%d/g, id); + commentsSelectedArea.append(item); + count++ + }); + + $('.comments-selected-remove').off('click').on('click', function() { + const id = $(this).attr('id').split('_')[1]; + if (!id) return; + $(`#${id} .comment-content`).trigger('click'); + }); + + $('#ValisateSelectionMode').off('click').on('click', function() { + validateComment(commentsSelected); + commentsUnselectAll(); + }); + + $('#DeleteSelectionMode').off('click').on('click', function() { + deleteComment(commentsSelected); + commentsUnselectAll(); + }); + + $('#commentsNoSelection').hide(); + $('#commentsSelection').show(); +} + +function commentsClearFilters() { + delete commentsParams.author_id; + delete commentsParams.image_id; + delete commentsParams.search; + delete commentsParams.f_min_date; + delete commentsParams.f_max_date; + getComments(commentsParams); +} \ No newline at end of file diff --git a/admin/themes/default/js/group_list.js b/admin/themes/default/js/group_list.js index 9751956a1..65a557ec0 100644 --- a/admin/themes/default/js/group_list.js +++ b/admin/themes/default/js/group_list.js @@ -105,7 +105,7 @@ jQuery(document).ready(function () { updateBadge(); } else { $("#addGroupForm .groupError").html(str_name_not_empty); - $("#addGroupForm .groupError").fadeIn(); + $("#addGroupForm .groupError").css('display','flex').fadeIn(); $("#addGroupForm .groupError").delay(DELAY_FEEDBACK).fadeOut(); } }, @@ -116,7 +116,7 @@ jQuery(document).ready(function () { } else { loadState.reverse(); $("#addGroupForm .groupError").html(str_name_not_empty); - $("#addGroupForm .groupError").fadeIn(); + $("#addGroupForm .groupError").css('display','flex').fadeIn(); $("#addGroupForm .groupError").delay(DELAY_FEEDBACK).fadeOut(); } }); @@ -349,7 +349,7 @@ var renameGroup = function(id, newName) { } else { //Display error message $("#group-" + id).find(".groupError").html(str_name_taken); - $("#group-" + id).find(".groupError").fadeIn(); + $("#group-" + id).find(".groupError").css('display','flex').fadeIn(); $("#group-" + id).find(".groupError").delay(DELAY_FEEDBACK).fadeOut(); } }, @@ -360,7 +360,7 @@ var renameGroup = function(id, newName) { } else { loadState.reverse(); $("#group-" + id).find(".groupError").html(str_name_not_empty); - $("#group-" + id).find(".groupError").fadeIn(); + $("#group-" + id).find(".groupError").css('display','flex').fadeIn(); $("#group-" + id).find(".groupError").delay(DELAY_FEEDBACK).fadeOut(); } } @@ -722,11 +722,11 @@ var usersInGroup = []; var maxOffsetUserCont = 322; var dissociateUserInfo = $("
" - + "

" + + "

" + "
").appendTo(".group-name-block").hide(); var associateUserInfo = $("
" -+ "

" ++ "

" + "
"); // Setup the user research bar diff --git a/admin/themes/default/js/photos_add_direct.js b/admin/themes/default/js/photos_add_direct.js index 975052ff8..5fae9aaaa 100644 --- a/admin/themes/default/js/photos_add_direct.js +++ b/admin/themes/default/js/photos_add_direct.js @@ -16,6 +16,8 @@ const selectedAlbumEdit = $('#selectedAlbumEdit'); const btnAddFiles = $('#addFiles'); const chooseAlbumFirst = $('#chooseAlbumFirst'); const uploaderPhotos = $('#uploader'); +const formatsUpdated = []; +const formats = []; /*-------------- On DOM load @@ -85,6 +87,13 @@ $(function () { return false; }); + $("#uploadOptionsContent").hide(); + $("#uploadOptions").on("click", function(){ + $("#uploadOptionsContent").slideToggle(); + $("#uploadOptions").toggleClass('options-open'); + $(".moxie-shim-html5").css("display", "none"); + }) + $("#uploader").pluploadQueue({ // General settings browse_button: 'addFiles', @@ -153,11 +162,37 @@ $(function () { FilesAdded: async function (up, files) { // Création de la liste avec plupload_id : image_name fileNames = {}; + exts = {}; files.forEach((file) => { fileNames[file.id] = file.name; + exts[file.id] = file.name.substr(file.name.lastIndexOf('.') + 1); }); if (formatMode) { + formats.forEach((forms) => { + $("#"+forms[0]+" > .plupload_file_name").append(` + + + + `); + if(formatsUpdated.includes(forms[0])){ + $("#"+forms[0]+" > .plupload_file_name").after(` + + + ${format_update_warning} + + + + + + ${format_remove} + `); + $("#remove_"+forms[0]).on("click", function(){ + up.removeFile(forms[0]); + }); + } + }); + // If no original image is specified if (!haveFormatsOriginal) { const images_search = await new Promise((res, rej) => { @@ -166,8 +201,6 @@ $(function () { url: "ws.php?format=json&method=pwg.images.formats.searchImage", type: "POST", data: { - // category_id: $("select[name=category] option:selected").val(), // id category to modify - category_id: ab.get_selected_albums()[0], filename_list: JSON.stringify(fileNames), }, success: function (result) { @@ -182,8 +215,33 @@ $(function () { files.forEach((f) => { const search = images_search[f.id]; - if (search.status == "found") + if (search.status == "found"){ f.format_of = search.image_id; + formats.push([f.id,f.format_of]); + $("#"+f.id+" > .plupload_file_name").append(` + + + + `); + if (search.format_exist) + { + $("#"+f.id+" > .plupload_file_name").after(` + + + ${format_update_warning} + + + + + + ${format_remove} + `); + formatsUpdated.push(f.id); + $("#remove_"+f.id).on("click", function(){ + up.removeFile(f.id); + }); + } + } else { if (search.status == "multiple") multiple.push(f.name); @@ -218,14 +276,72 @@ $(function () { ...jConfirm_warning_options }) } - } else { //If an original image is specified + } else { + if (imageFormatsExtensions) + { + $forms_exts = JSON.parse(imageFormatsExtensions); + } + else + { + $forms_exts = []; + } files.forEach((f) => { f.format_of = originalImageId; + formats.push([f.id,f.format_of]); + $("#"+f.id+" > .plupload_file_name").append(` + + + + `); + if ($forms_exts.indexOf(exts[f.id]) != -1) + { + $("#"+f.id+" > .plupload_file_name").after(` + + + ${format_update_warning} + + + + + + ${format_remove} + `); + formatsUpdated.push(f.id); + $("#remove_"+f.id).on("click", function(){ + up.removeFile(f.id); + }); + } }) } } }, + FilesRemoved: function(up, file){ + formats.forEach((forms) => { + $("#"+forms[0]+" > .plupload_file_name").append(` + + + + `); + if(formatsUpdated.includes(forms[0])){ + $("#"+forms[0]+" > .plupload_file_name").after(` + + + ${format_update_warning} + + + + + + ${format_remove} + `); + $("#remove_"+forms[0]).on("click", function(){ + up.removeFile(forms[0]); + }); + } + }); + }, + UploadProgress: function (up, file) { $('#uploadingActions .progressbar').width(up.total.percent + '%'); Piecon.setProgress(up.total.percent); @@ -265,6 +381,8 @@ $(function () { options.name = file.name; } + options.update_mode = $('#toggleUpdateMode').is(':checked'); + up.setOption('multipart_params', options); }, @@ -289,6 +407,12 @@ $(function () { // do not remove file, or it will reset the progress bar :-/ // up.removeFile(file); uploadedPhotos.push(parseInt(data.result.image_id)); + if(data.result.add_status=="add"){ + addedPhotos.push(parseInt(data.result.image_id)); + } + else{ + updatedPhotos.push(parseInt(data.result.image_id)); + } if (!formatMode) uploadCategory = data.result.category; }, @@ -322,21 +446,32 @@ $(function () { $("#uploadForm, #permissions, .showFieldset").hide(); - const infoText = formatMode ? - sprintf(formatsUploaded_label, uploadedPhotos.length, [...new Set(files.map(f => f.format_of))].length) - : sprintf(photosUploaded_label, uploadedPhotos.length) + const infoTextAdd = formatMode ? + sprintf(formatsAdded_label, addedPhotos.length, [...new Set(addedPhotos)].length) + : sprintf(photosAdded_label, addedPhotos.length); - $(".infos").append(''); + const infoTextUpdate = formatMode ? + sprintf(formatsUpdated_label, updatedPhotos.length, [...new Set(updatedPhotos)].length) + : sprintf(photosUpdated_label, updatedPhotos.length); + if (addedPhotos.length && updatedPhotos.length) + { + $(".infos").append( ''); + } + else + { + const infoText = addedPhotos.length ? infoTextAdd : infoTextUpdate; + $(".infos").append(''); + } if (!formatMode) { html = sprintf( albumSummary_label, - '' + uploadCategory.label + '', + ' ' + uploadCategory.label + '', parseInt(uploadCategory.nb_photos) ); - $(".infos ul").append('
  • ' + html + '
    • '); + $(".infos ul").append('
  • ' + html + '
    • '); } $(".infos").show(); @@ -345,7 +480,7 @@ $(function () { // pwg.caddie.add(uploadedPhotos) instead of relying on huge GET parameter // (and remove useless code from admin/photos_add_direct.php) - $(".batchLink").attr("href", "admin.php?page=photos_add§ion=direct&batch=" + uploadedPhotos.join(",")); + $(".batchLink").attr("href", "admin.php?page=photos_add§ion=direct&batch=" + [...new Set(uploadedPhotos)].join(",")); $(".batchLink").html(sprintf(batch_Label, uploadedPhotos.length)); $(".afterUploadActions").show(); @@ -357,7 +492,6 @@ $(function () { } } }); - }); /*-------------- diff --git a/admin/themes/default/js/tags.js b/admin/themes/default/js/tags.js index e4c503fba..e76a301ea 100644 --- a/admin/themes/default/js/tags.js +++ b/admin/themes/default/js/tags.js @@ -250,7 +250,11 @@ function setupTagbox(tagBox) { //Edit Name tagBox.find('.dropdown-option.edit').on('click', function() { - set_up_popin(tagBox.data('id'), tagBox.find('.tag-name').html()); + const id = $(this).closest('.tag-box').data('id'); + const tagIndex = dataTags.findIndex((tag) => tag.id == id); + const tagRawName = dataTags[tagIndex].raw_name ?? tagBox.find('.tag-name').data('rawname'); + const tagName = dataTags[tagIndex].name ?? tagBox.find('.tag-name').html(); + set_up_popin(tagBox.data('id'), tagRawName, tagName); rename_tag_open() }) @@ -276,14 +280,14 @@ function setupTagbox(tagBox) { //Duplicate Tag tagBox.find('.dropdown-option.duplicate').on('click', function () { - duplicateTag(tagBox.data('id'), tagBox.find('.tag-name').html()).then((data) => { + duplicateTag(tagBox.data('id'), tagBox.find('.tag-name').data('rawname')).then((data) => { showMessage(str_tag_created.replace('%s',data.result.name)) }) }) } -function set_up_popin(id, tagName) { +function set_up_popin(id, tagRawName, tagName) { $(".RenameTagPopInContainer").find(".tag-property-input").attr("id", id); @@ -292,7 +296,7 @@ function set_up_popin(id, tagName) { rename_tag_close() }); $(".TagSubmit").html(str_yes_rename_confirmation); - $(".RenameTagPopInContainer").find(".tag-property-input").val(tagName); + $(".RenameTagPopInContainer").find(".tag-property-input").val(tagRawName); } function rename_tag_close() { @@ -348,16 +352,17 @@ function renameTag(id, new_name) { }, success: function (raw_data) { data = jQuery.parseJSON(raw_data); - console.log(data); if (data.stat === "ok") { $('.tag-box[data-id='+id+'] p, .tag-box[data-id='+id+'] .tag-dropdown-header b').html(data.result.name); $('.tag-box[data-id='+id+'] .tag-name-editable').attr('value', data.result.name); + $('.tag-box[data-id='+id+'] .tag-name').attr('data-rawname', data.result.raw_name); let u_view = 'index.php?/tags/'+id+'-'+data.result.url_name; $('.dropdown-option.view').attr('href', u_view); //Update the data index = dataTags.findIndex((tag) => tag.id == id); dataTags[index].name = data.result.name; + dataTags[index].raw_name = data.result.raw_name; dataTags[index].url_name = data.result.url_name; resolve(data); diff --git a/admin/themes/default/js/user_activity.js b/admin/themes/default/js/user_activity.js new file mode 100644 index 000000000..33f84e7fc --- /dev/null +++ b/admin/themes/default/js/user_activity.js @@ -0,0 +1,723 @@ +//{*<-- Getting and Displaying Activities -->*} + +if (additional_filt_type) +{ + object_filter = additional_filt_type; +} + +get_user_activity(activity_page, uid_filter, action_filter, object_filter, [date_min_filter, date_max_filter], additional_filt_value); + +function get_user_activity(page, uid, action, object, date, id) { + + $.ajax({ + url: "ws.php?format=json&method=pwg.activity.getList", + type: "POST", + dataType: "json", + data: { + page: page - 1, + uid: uid, + action : action, + object : object, + offset : page_offsets[page - 1], + date_min : date[0], + date_max : date[1], + id : additional_filt_value + }, + beforeSend: () => { + $('.tab').contents(':not(#-1):not(.loading)').remove(); + $(".loading").show(); + $('.pagination-arrow.rigth').addClass('unavailable'); + $('.pagination-arrow.left').addClass('unavailable'); + $(".pagination-item-container").hide(); + $(".user-update-spinner").addClass("icon-spin6"); + }, + success: (data) => { + /* console log to help debug + {* console.log(data); *}*/ + uid_filter = uid; + action_filter = action; + object_filter = object; + date_min_filter = date[0]; + date_max_filter = date[1]; + + //setCreationDate(data.result['result_lines'][data.result['result_lines'].length-1].date, data.result['result_lines'][0].date); + $(".loading").hide(); + + if (data.result['result_lines'].length > 0) + { + data.result['result_lines'].forEach(line => { + lineConstructor(line); + }); + } + else + { + emptyLine(); + } + + current_page_offset = page_offsets[page - 1]; + end_page = data.result['end_page']; + if (!(page_offsets.includes(data.result['page_offset']))) + { + page_offsets.push(data.result['page_offset']); + } + + $(".user-update-spinner").removeClass("icon-spin6"); + $(".pagination-item-container").show(); + update_pagination_menu(); + }, + error: (e) => { + console.log("ajax call failed"); + console.log(e); + } + }) +} + +function lineConstructor(line) { + let newLine = $("#-1").clone(); + + $(".tab-title").show(); + $(".activity-noresult").hide(); + newLine.removeClass("hide"); + + /* console log to help debug + {* console.log(line); *}*/ + newLine.attr("id", line.id); + + var final_albumInfos; + + //{* Determines wich string need to be placed in the line constructed *} + + if (line.counter > 1) { + // pluriel + switch (line.action) { + case "edit": + newLine.find(".action-type").addClass("icon-blue"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-pencil"); + + newLine.find(".action-name").html(actionType_edit); + switch (line.object) { + case "user": + final_albumInfos = actionInfos_users_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-user-1"); + + break; + case "album": + final_albumInfos = actionInfos_albums_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_groups_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photos_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tags_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + break; + + case "add": + newLine.find(".action-type").addClass("icon-green"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-plus"); + + newLine.find(".action-name").html(actionType_add); + switch (line.object) { + case "user": + final_albumInfos = actionInfos_users_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-user-1"); + + break; + case "album": + final_albumInfos = actionInfos_albums_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_groups_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photos_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tags_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + break; + + case "delete": + newLine.find(".action-type").addClass("icon-red"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-trash-1"); + + newLine.find(".action-name").html(actionType_delete); + switch (line.object) { + case "user": + final_albumInfos = actionInfos_users_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-user-1"); + + break; + case "album": + final_albumInfos = actionInfos_albums_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_groups_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photos_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tags_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + break; + + case "move": + newLine.find(".action-type").addClass("icon-yellow"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-move"); + + newLine.find(".action-name").html(actionType_move); + switch (line.object) { + case "album": + final_albumInfos = actionInfos_albums_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_groups_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photos_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tags_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + break; + + case "login": + newLine.find(".action-type").addClass("icon-purple"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-key"); + newLine.find(".action-section").addClass("icon-user-1"); + + newLine.find(".action-name").html(actionType_login); + + final_albumInfos = actionInfos_users_logged_in.replace('%d', line.counter); + + break; + + case "logout": + newLine.find(".action-type").addClass("icon-purple"); + if (line.user_id != 2) { + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + } else { + newLine.find(".user-pic").addClass(color_icons[line.object_id[0] % 5]); + } + newLine.find(".action-icon").addClass("icon-logout"); + newLine.find(".action-section").addClass("icon-user-1"); + + newLine.find(".action-name").html(actionType_logout); + + final_albumInfos = actionInfos_users_logged_out.replace('%d', line.counter); + + break; + + default: + newLine.find(".action-type").addClass("icon-purple"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-section").addClass("icon-user-1"); + newLine.find(".action-name").html(line.action); + final_albumInfos = 'x' + line.counter; + break; + } + } else { + // singulier + switch (line.action) { + case "edit": + newLine.find(".action-type").addClass("icon-blue"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-pencil"); + + newLine.find(".action-name").html(actionType_edit); + switch (line.object) { + case "user": + final_albumInfos = actionInfos_user_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-user-1"); + + break; + case "album": + final_albumInfos = actionInfos_album_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_group_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photo_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tag_edited.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + + break; + case "add": + newLine.find(".action-type").addClass("icon-green"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-plus"); + + newLine.find(".action-name").html(actionType_add); + switch (line.object) { + case "user": + final_albumInfos = actionInfos_user_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-user-1"); + + break; + case "album": + final_albumInfos = actionInfos_album_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_group_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photo_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tag_added.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + + break; + } + + break; + case "delete": + newLine.find(".action-type").addClass("icon-red"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-trash-1"); + + newLine.find(".action-name").html(actionType_delete); + switch (line.object) { + case "user": + final_albumInfos = actionInfos_user_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-user-1"); + + break; + case "album": + final_albumInfos = actionInfos_album_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_group_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photo_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tag_deleted.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + break; + case "move": + newLine.find(".action-type").addClass("icon-yellow"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-move"); + + newLine.find(".action-name").html(actionType_move); + switch (line.object) { + case "album": + final_albumInfos = actionInfos_album_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-folder-open"); + + break; + case "group": + final_albumInfos = actionInfos_group_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-users-1"); + + break; + case "photo": + final_albumInfos = actionInfos_photo_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-picture"); + + break; + case "tag": + final_albumInfos = actionInfos_tag_moved.replace('%d', line.counter); + newLine.find(".action-section").addClass("icon-tags"); + + break; + default: + final_albumInfos = line.counter + " " +line.object + " " + line.action; + break; + } + + break; + case "login": + newLine.find(".action-type").addClass("icon-purple"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-icon").addClass("icon-key"); + newLine.find(".action-section").addClass("icon-user-1"); + + newLine.find(".action-name").html(actionType_login); + + final_albumInfos = actionInfos_user_logged_in.replace('%d', line.counter); + + break; + case "logout": + newLine.find(".action-type").addClass("icon-purple"); + if (line.user_id != 2) { + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + } else { + newLine.find(".user-pic").addClass(color_icons[line.object_id[0] % 5]); + } + newLine.find(".action-icon").addClass("icon-logout"); + newLine.find(".action-section").addClass("icon-user-1"); + + newLine.find(".action-name").html(actionType_logout); + + final_albumInfos = actionInfos_user_logged_out.replace('%d', line.counter); + + break; + + default: + newLine.find(".action-type").addClass("icon-purple"); + newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]); + newLine.find(".action-section").addClass("icon-user-1"); + newLine.find(".action-name").html(line.action); + final_albumInfos = 'x' + line.counter; + break; + } + } + + newLine.find(".action-infos-test").html(final_albumInfos); + + /* Action_section */ + newLine.find(".nb_items").html(line.counter); + + /* Date_section */ + newLine.find(".date-day").html(line.date); + newLine.find(".date-hour").html(line.hour); + + /* User _Section */ + newLine.find(".user-name").html(line.username); + newLine.find(".user-pic").html(get_initials(line.username)); + + /* Detail_section */ + newLine.find(".detail-item-1").html(line.ip_address); + newLine.find(".detail-item-1").attr("title", "IP: " + line.ip_address); + + if (line.detailsType == "script") { + newLine.find(".detail-item-2").html(line.details.script); + newLine.find(".detail-item-2").attr('title', 'Script'); + } else if (line.detailsType == "method") { + newLine.find(".detail-item-2").html(line.details.method); + newLine.find(".detail-item-2").attr('title', 'API Method'); + } + + if (line.details.agent) { + const api_key = line.details.connected_with ? 'API Key, ' : ''; + const details = line.details.connected_with ? '' + line.details.agent : line.details.agent; + newLine.find(".detail-item-3").html(details); + newLine.find(".detail-item-3").attr('title', api_key + 'User-Agent: ' + line.details.agent); + } else if (line.details.users && line.action != "logout" && line.action != "login") { + const user_string = [...new Set(line.details.users)].toString(); + newLine.find(".detail-item-3").html(user_string); + newLine.find(".detail-item-3").attr('title', users_key + ": " + user_string); + } else { + newLine.find(".detail-item-3").remove(); + } + + newLine.addClass("uid-" + line.user_id); + + displayLine(newLine); +} + +function displayLine(line) { + $(".tab").append(line); +} + +function emptyLine() { + $(".tab-title").hide(); + $(".activity-noresult").show(); +} + +function get_initials(username) { + let words = username.toUpperCase().split(" "); + let res = words[0][0]; + + if (words.length > 1 && words[1][0] !== undefined ) { + res += words[1][0]; + } + return res; +} + +function setCreationDate(startDate, endDate) { + $(".start-date").html(startDate) + + $(".end-date").html(endDate) +} + +//{* Pagination *} + +function move_to_page(page) { + if (page < 0) + return; + actual_page = page; + update_pagination_menu(page); + get_user_activity(page, uid_filter, action_filter, object_filter, [date_min_filter, date_max_filter], additional_filt_value); +} + +$('.pagination-arrow.rigth').on('click', () => { + move_to_page(actual_page + 1); +}) + +$('.pagination-arrow.left').on('click', () => { + move_to_page(actual_page - 1); +}) + +function update_pagination_menu(page) { + updateArrows(); + update_pagination_items(); + if (end_page && actual_page == 1) { + $('.pagination-container').hide(); + } else { + $('.pagination-container').show(); + } +} + +function updateArrows() { + if (actual_page == 1) { + $('.pagination-arrow.left').addClass('unavailable'); + } else { + $('.pagination-arrow.left').removeClass('unavailable'); + } + if (end_page) { + $('.pagination-arrow.rigth').addClass('unavailable'); + } else { + $('.pagination-arrow.rigth').removeClass('unavailable'); + } +} + +function update_pagination_items() { + $('.pagination-item-container a').remove(); + $('.pagination-item-container span').remove(); + + append_pagination_item(1); + + if (actual_page > 2) { + append_pagination_item(); + } + if (actual_page != 1) { + append_pagination_item(actual_page) + } + if (!end_page) { + append_pagination_item(); + } +} + +function append_pagination_item(page = null) { + if (page != null) { + let new_tag = $(page_item.replace(/%d/g, page)); + $('.pagination-item-container').append(new_tag); + if (actual_page == page) { + new_tag.addClass('actual'); + } + new_tag.on('click', () => { + move_to_page(new_tag.data('page')); + }) + } else { + $('.pagination-item-container').append($(page_ellipsis)); + } +} + +function page_reset(){ + activity_page = 1; + current_page_offset = 0; + page_offsets = [0]; + actual_page = 1; + end_page = false; +} + + +$(document).ready(function () { + $("h1").append(``+ (nb_users - 1) +``); + + $('select.user-selecter').on('change', function (user) { + if ($(".user-selecter .selectize-input").hasClass("full")) { + page_reset(); + if ($(".user-selecter .selectize-input .item").data("value") == 'none') + { + //{* call ajax sur activity list sans uid *} + get_user_activity(1, undefined, action_filter, object_filter, [date_min_filter, date_max_filter], additional_filt_value); + } + else + { + //{* call ajax sur activity list avec uid en param *} + get_user_activity(1, $(".user-selecter .selectize-input .item").data("value"), action_filter, object_filter, [date_min_filter, date_max_filter], additional_filt_value); + } + } + }); + + $('select.action-selecter').on('change', function (user) { + if ($(".action-selecter .selectize-input").hasClass("full")) { + page_reset(); + if ($(".action-selecter .selectize-input .item").data("value") == 'none') + { + //{* call ajax sur activity list sans action et object *} + if (additional_filt_type) + { + get_user_activity(1, uid_filter, undefined, object_filter, [date_min_filter, date_max_filter], additional_filt_value); + } + else + { + get_user_activity(1, uid_filter, undefined, undefined, [date_min_filter, date_max_filter], additional_filt_value); + } + } + else + { + //{* call ajax sur activity list avec action et object en param *} + object = $(".action-selecter .selectize-input .item").data("value").split("/")[0]; + action = $(".action-selecter .selectize-input .item").data("value").split("/")[1]; + get_user_activity(1, uid_filter, action, object, [date_min_filter, date_max_filter], additional_filt_value); + } + } + }); + + $('#date_min_activity').on('change', function(user) { + page_reset(); + if ($('#date_min_activity').val()=='') + { + document.getElementById('date_max_activity').setAttribute("min", date_min); + } + else + { + document.getElementById('date_max_activity').setAttribute("min", $('#date_min_activity').val()); + } + get_user_activity(activity_page, uid_filter, action_filter, object_filter, [$('#date_min_activity').val(), date_max_filter], additional_filt_value); + }) + + $('#date_max_activity').on('change', function(user) { + page_reset(); + if ($('#date_max_activity').val()=='') + { + document.getElementById('date_min_activity').setAttribute("max", date_max); + } + else + { + document.getElementById('date_min_activity').setAttribute("max", $('#date_max_activity').val()); + } + get_user_activity(activity_page, uid_filter, action_filter, object_filter, [date_min_filter, $('#date_max_activity').val()], additional_filt_value); + }) + + jQuery('.user-selecter').selectize(); + jQuery('.user-selecter')[0].selectize.setValue(null); + + jQuery('.action-selecter').selectize(); + jQuery('.action-selecter')[0].selectize.setValue(null); + + if (additional_filt_type) + { + $("#activityMoreFilters").addClass("extend-padding"); + } + else + { + $("#activityMoreFiltersContent").hide(); + } + //var used to prevent the user to interfere with the collapsible when it's toggling, to avoid some problems + var toggleTriggered = false; + $("#activityMoreFilters").on("click", function(){ + if ($("#activityMoreFiltersContent").css('display') == 'none' && toggleTriggered == false) + { + toggleTriggered = true; + $("#activityMoreFilters").addClass("extend-padding"); + $("#activityMoreFiltersContent").slideToggle(function(){ + toggleTriggered = false; + }); + } + else if ($("#activityMoreFiltersContent").css('display') == 'flex' && toggleTriggered == false) + { + toggleTriggered = true; + $("#activityMoreFiltersContent").slideToggle(function(){ + $("#activityMoreFilters").removeClass("extend-padding"); + toggleTriggered = false; + }); + } + }) +}); \ No newline at end of file diff --git a/admin/themes/default/js/user_list.js b/admin/themes/default/js/user_list.js index 94ce2b476..c3c8eee29 100644 --- a/admin/themes/default/js/user_list.js +++ b/admin/themes/default/js/user_list.js @@ -175,6 +175,11 @@ $( document ).ready(function() { $('#edit_user_conf_password').val(password); hide_error_edit_user(); }); + $('.AddUserGenPassword span').on('click', function() { + const password = gen_password(); + $('#add_user_pass').val(password); + $('#add_user_confpass').val(password); + }); $('.AddUserSubmit').click(add_user); $('.AddUserCancel').click(add_user_close); $(".CloseAddUser").click(add_user_close); @@ -806,9 +811,19 @@ function add_user_open() { $('#AddUserSuccessContainer').hide(); $('#AddUserFieldContainer').show(); $('#AddUser :input').val(''); + $('#add_user_password').hide(); fill_new_user(); $("#AddUser").fadeIn(); $(".AddUserLabelUsername input").first().focus(); + $('#AddUser .user-property-status .user-property-select').off('change').on('change', function() { + const status = $(this).val(); + $('#add_user_pass ,#add_user_confpass').val(''); + if ('generic' === status) { + $('#add_user_password').show(); + return; + } + $('#add_user_password').hide(); + }); } /*------------------ @@ -1650,6 +1665,8 @@ function fill_user_edit(user_to_edit) { fill_user_edit_update(user_to_edit, pop_in); fill_user_edit_permissions(user_to_edit, pop_in); fill_who_is_the_king(user_to_edit, pop_in); + + // show/hide password button depending on permissions // plugins get function if (Object.keys(plugins_get_functions).length > 0) { @@ -2134,20 +2151,27 @@ function add_user() { ajax_data.level = $(".AddUserInputContainer .user-property-level select").val(); ajax_data.enabled_high = $(".AddUserInputContainer .user-list-checkbox[name=\"hd_enabled\"]").attr('data-selected') == '1' ? true : false; ajax_data.group_id = groups_selected; - ajax_data.auto_password = true; // for debug // console.log(ajax_data); + const data = { + username: ajax_data.username, + email: ajax_data.email, + pwg_token, + } + + if ('generic' === ajax_data.status) { + data.password = $('#add_user_pass').val(); + data.password_confirm = $('#add_user_confpass').val(); + } else { + data.auto_password = true; + } + $.ajax({ url: "ws.php?format=json&method=pwg.users.add", type:"POST", - data: { - username: ajax_data.username, - auto_password: true, - email: ajax_data.email, - pwg_token - }, + data: data, beforeSend: function() { $("#AddUser .AddUserErrors").css("visibility", "hidden"); if ($(".AddUserLabelUsername .user-property-input").val() == "") { @@ -2155,6 +2179,26 @@ function add_user() { $("#AddUser .AddUserErrors").css("visibility", "visible"); return false; } + if ('generic' === ajax_data.status) { + const pass = $('#add_user_pass').val(); + const confPass = $('#add_user_confpass').val(); + if ('' == pass) { + $("#AddUser .AddUserErrors").html(missingPassword); + $("#AddUser .AddUserErrors").css("visibility", "visible"); + return false; + } + if ('' == confPass) { + $("#AddUser .AddUserErrors").html(missingConfPassword); + $("#AddUser .AddUserErrors").css("visibility", "visible"); + return false; + } + if (pass !== confPass) { + $("#AddUser .AddUserErrors").html(noMatchPassword); + $("#AddUser .AddUserErrors").css("visibility", "visible"); + return false; + } + + } }, success: (raw_data) => { let data = jQuery.parseJSON(raw_data); @@ -2190,9 +2234,14 @@ function add_infos_to_new_user(user_id, ajax_data) { let new_user_id = data.result.users[0].id; update_user_list(); // add_user_close(); - $('#AddUserUpdated').removeClass('icon-red icon-cancel').addClass('icon-green border-green icon-ok'); + $('#AddUserUpdated').removeClass('icon-red icon-cancel-circled').addClass('icon-green icon-ok-circled'); $('#AddUserUpdatedText').html(user_added_str.replace("%s", ajax_data.username)); - send_new_user_password(new_user_id, ajax_data.email); + const status = ['webmaster', 'admin', 'normal']; + if (status.includes(ajax_data.status)) { + send_new_user_password(new_user_id, ajax_data.email); + } else { + add_user_close(); + } $("#AddUser .user-property-input").val(""); $("#AddUserSuccess .edit-now").off("click").on("click", () => { last_user_id = new_user_id; @@ -2240,7 +2289,7 @@ function send_new_user_password(user_id, mail) { : sprintf(validLinkWithoutMail, response.result.time_validation)); if(send_by_mail && !response.result.send_by_mail) { - $('#AddUserUpdated').removeClass('icon-green border-green icon-ok').addClass('icon-red-error icon-cancel'); + $('#AddUserUpdated').removeClass('icon-green icon-ok-circled').addClass('icon-red-error icon-cancel-circled'); $('#AddUserUpdatedText').html(errorMailSent); $('#AddUserTextField').html(sprintf(errorMailSentMsg, response.result.time_validation)); } else if (send_by_mail && response.result.send_by_mail) { @@ -2252,7 +2301,7 @@ function send_new_user_password(user_id, mail) { const successMsg = $('#AddUserUpdatedText'); successMsg.fadeOut(); copyToClipboard(response.result.generated_link); - $('#AddUserUpdated').removeClass('icon-red icon-cancel').addClass('icon-green border-green icon-ok'); + $('#AddUserUpdated').removeClass('icon-red icon-cancel-circled').addClass('icon-green icon-ok-circled'); successMsg.html(copyLinkStr); successMsg.fadeIn(); }); @@ -2261,12 +2310,12 @@ function send_new_user_password(user_id, mail) { add_user_close(); }); } else { - $('#AddUserUpdated').removeClass('icon-green border-green icon-ok').addClass('icon-red-error icon-cancel'); + $('#AddUserUpdated').removeClass('icon-green icon-ok-circled').addClass('icon-red-error icon-cancel-circled'); $('#AddUserUpdatedText').html(response.message); } }, error: function(response) { - $('#AddUserUpdated').removeClass('icon-green border-green icon-ok').addClass('icon-red-error icon-cancel'); + $('#AddUserUpdated').removeClass('icon-green icon-ok-circled').addClass('icon-red-error icon-cancel-circled'); $('#AddUserUpdatedText').html(response.message); } }); diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index fce39334d..b34a6352b 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -412,10 +412,9 @@ let username = '{$USERNAME}'
    {if isset($errors)}
    -
      {foreach from=$errors item=error} -
    • {$error}
      • +
    • {$error}
      • {/foreach}
    @@ -423,10 +422,9 @@ let username = '{$USERNAME}' {if isset($infos)}
    -
      {foreach from=$infos item=info} -
    • {$info}
      • +
    • {$info}
      • {/foreach}
    @@ -434,10 +432,9 @@ let username = '{$USERNAME}' {if isset($warnings)}
    -
      {foreach from=$warnings item=warning} -
    • {$warning}
      • +
    • {$warning}
      • {/foreach}
    @@ -445,10 +442,9 @@ let username = '{$USERNAME}' {if isset($messages)}
    -
      {foreach from=$messages item=message} -
    • {$message}
      • +
    • {$message}
      • {/foreach}
    diff --git a/admin/themes/default/template/album_notification.tpl b/admin/themes/default/template/album_notification.tpl index b97fa3304..cfb976caa 100644 --- a/admin/themes/default/template/album_notification.tpl +++ b/admin/themes/default/template/album_notification.tpl @@ -61,6 +61,7 @@ span.errors { {/html_style}
    +
    {'Send mail to users'|@translate} @@ -125,7 +126,7 @@ span.errors { {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/albums.tpl b/admin/themes/default/template/albums.tpl index 5b8f4780e..b4a736c7a 100644 --- a/admin/themes/default/template/albums.tpl +++ b/admin/themes/default/template/albums.tpl @@ -187,7 +187,7 @@ const tiptip_locked_album = "{'Locked album'|translate|escape:javascript}";
    -
    +
    diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index c24db8242..38bec6c9c 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -64,7 +64,7 @@ jQuery(document).ready(function() { var nb_thumbs_page = {$nb_thumbs_page}; var nb_thumbs_set = {$nb_thumbs_set}; var applyOnDetails_pattern = "{'on the %d selected photos'|@translate}"; -var all_elements = [{if !empty($all_elements)}{','|@implode:$all_elements}{/if}]; +var all_elements = [{if !empty($all_elements)}{$all_elements|join:","}{/if}]; var selectedMessage_pattern = "{'%d of %d photos selected'|@translate}"; var selectedMessage_none = "{'No photo selected, %d photos in current set'|@translate}"; @@ -73,8 +73,6 @@ const str_add_alb_associate = "{"Add Album"|@translate}"; const str_select_alb_associate = "{"Select an album"|@translate}"; $(document).ready(function() { - jQuery('.help-popin-search').colorbox({ width:"600px" }); - function checkPermitAction() { var nbSelected = 0; if ($("input[name=setSelected]").is(':checked')) { diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl index e10f95b2e..41f7dacfc 100644 --- a/admin/themes/default/template/batch_manager_unit.tpl +++ b/admin/themes/default/template/batch_manager_unit.tpl @@ -74,13 +74,6 @@ str_meta_warning = "{'Warning ! Unsaved changes will be lost'|translate|escape:j str_meta_yes = "{'I want to continue'|translate|escape:javascript}"; const str_title_ab = "{'Associate to album'|@translate}"; -const strs_privacy = { - "0" : "{$level_options[8]}", - "1" : "{$level_options[4]}", - "2" : "{$level_options[2]}", - "3" : "{$level_options[1]}", - "4" : "{$level_options[0]}", -}; let b_current_picture_id; {* Check Skeleton extension for more details about extensibility *} pluginValues = []; @@ -139,7 +132,7 @@ pluginValues = [];
    @@ -150,9 +143,10 @@ pluginValues = []; imagename
    - - - + + + + {if !url_is_remote($element.PATH)} @@ -235,7 +229,7 @@ pluginValues = []; {/if}
    - {foreach from=$element.related_categories item=$cat_path key=$key} + {foreach from=$element.related_categories item=cat_path key=key}
    {$cat_path['name']} {if $cat_path['unlinkable']} @@ -276,7 +270,7 @@ pluginValues = [];
    @@ -318,7 +312,7 @@ pluginValues = [];
    diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index d68a98ef4..0d7853074 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -57,7 +57,7 @@ jQuery(document).ready(function(){ {'Edit'|@translate} {'sub-albums'|@translate} {'Move'|@translate} - {if cat_admin_access($category.ID)} + {if $CAT_ADMIN_ACCESS} {'Visit Gallery'|@translate} {else} {'Visit Gallery'|@translate} diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index 7ce02d13f..20ef16365 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -45,6 +45,8 @@ const str_modal_ab = '{'New parent album'|@translate}';
    + + {if isset($U_MANAGE_ELEMENTS) } {/if} @@ -99,7 +101,7 @@ const str_modal_ab = '{'New parent album'|@translate}';
    {if isset($U_SYNC) }
    - {'Directory'} + {'Directory'|@translate} {$CAT_DIR_NAME} {$CAT_MIN_DIR}
    @@ -174,15 +176,15 @@ const str_modal_ab = '{'New parent album'|@translate}';
    - {if cat_admin_access($CAT_ID)} + {if $CAT_ADMIN_ACCESS} {'Open in gallery'|translate} {else} {'Open in gallery'|translate} {/if}
    -
    {'Album updated'|@translate}
    -
    {'An error has occured while saving album settings'|@translate}
    +
    {'Album updated'|@translate}
    +
    {'An error has occured while saving album settings'|@translate}
    {'Save Settings'|@translate}
    diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl index 816ffcf6b..35723a1c9 100644 --- a/admin/themes/default/template/cat_perm.tpl +++ b/admin/themes/default/template/cat_perm.tpl @@ -185,7 +185,7 @@ jQuery("#selectStatus").change(function() { {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/comments.tpl b/admin/themes/default/template/comments.tpl index 9fda8f142..7070b31e6 100644 --- a/admin/themes/default/template/comments.tpl +++ b/admin/themes/default/template/comments.tpl @@ -1,117 +1,212 @@ +{combine_script id="comments" load="footer" path="admin/themes/default/js/comments.js"} +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} +{combine_script id='jquery.confirm' load='footer' require='jquery' path='themes/default/js/plugins/jquery-confirm.min.js'} +{combine_css path="themes/default/js/plugins/jquery-confirm.min.css"} {footer_script} -jQuery(document).ready(function(){ - $("h1").append(""+{$nb_total}+""); - - function highlighComments() { - jQuery(".checkComment").each(function() { - var parent = jQuery(this).parent('tr'); - if (jQuery(this).children("input[type=checkbox]").is(':checked')) { - jQuery(parent).addClass('selectedComment'); - } - else { - jQuery(parent).removeClass('selectedComment'); - } - }); - } - - jQuery(".checkComment").click(function(event) { - var checkbox = jQuery(this).children("input[type=checkbox]"); - if (event.target.type !== 'checkbox') { - jQuery(checkbox).prop('checked', !jQuery(checkbox).prop('checked')); - } - highlighComments(); - }); - - jQuery("#commentSelectAll").click(function () { - jQuery(".checkComment input[type=checkbox]").prop('checked', true); - highlighComments(); - return false; - }); - - jQuery("#commentSelectNone").click(function () { - jQuery(".checkComment input[type=checkbox]").prop('checked', false); - highlighComments(); - return false; - }); - - jQuery("#commentSelectInvert").click(function () { - jQuery(".checkComment input[type=checkbox]").each(function() { - jQuery(this).prop('checked', !$(this).prop('checked')); - }); - highlighComments(); - return false; - }); - -}); +const str_yes_delete_confirmation = "{'Yes, delete'|@translate|@escape:'javascript'}" +const str_no_delete_confirmation = "{"No, I have changed my mind"|@translate|@escape:'javascript'}" +const str_delete = "{'Are you sure you want to delete comment #%s?'|@translate|@escape:'javascript'}" +const str_deletes = "{'Are you sure you want to delete "%d" comments?'|@translate|@escape:'javascript'}" +const str_no_comments_selected = "{'No comments selected, no actions possible.'|@translate|@escape:'javascript'}" +const pwg_token = "{$PWG_TOKEN}" +const str_an_error_has = "{"An error has occured"|@translate|@escape:'javascript'}" +const str_comment_validated = "{"The comment has been validated."|@translate|@escape:'javascript'}" +const str_comments_validated = "{"The comments have been validated."|@translate|@escape:'javascript'}" +const str_and_others = "{"and %s others"|@translate}" {/footer_script} + +
    +
    +
    +
    + + -
    - {'All'|@translate} ({$nb_total}) - | {'Waiting'|@translate} ({$nb_pending}) -{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} + + + + + +
    + +
    +

    {'Select'|@translate}

    +

    {'All'|@translate}

    +

    {'None'|@translate}

    +

    {'Invert'|@translate}

    +
    + +
    +
    + {"Filters"|@translate} +
    +
    + + + +
    +
    +
    + +
    +
    + + {'Selection mode'|@translate} +
    +
    +
    + +
    +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +

    {"Clear"|translate} +

    +

    +
    + +
    + +
    +
    + {"Display"|translate} + 5 + 10 + 25 + 50 +
    + +
    +
    + +
    +
    + {* 1 *} +
    + +
    + +
    +
    +
    +
    + +
    +

    {"No comments selected, no actions possible."|translate} +

    +
    +

    {'Your selection'|@translate}

    + +
    + +
    + +
    +
    + + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +

    +
    +
    -{if !empty($comments) } - - - - {foreach from=$comments item=comment name=comment} - - - - - {/foreach} -
    - - -
    - -

    {if $comment.IS_PENDING}{'Waiting'|@translate} - {/if}{if !empty($comment.IP)}{$comment.IP} - {/if}{$comment.AUTHOR} - {$comment.DATE}

    -
    {$comment.CONTENT}
    -
    -
    - -

    - {'Select:'|@translate} - {'All'|@translate}, - {'None'|@translate}, - {'Invert'|@translate} -

    - -
    -
    -
    -
    -{if isset($save_success)} -
    -
    - {$save_success} +
    +
    + +
    +
    -{/if} -{if isset($save_error)} -
    -
    - {$save_error} + +
    + +
    + +
    + + +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +

    + +
    +
    + +

    +
    +
    + +

    -{/if} -{if isset($save_warning)} -
    -
    - {$save_warning} -
    -
    -{/if} -
    - - + +
    +

    +
    + + +
    - - - -{/if} +
    \ No newline at end of file diff --git a/admin/themes/default/template/configuration_comments.tpl b/admin/themes/default/template/configuration_comments.tpl index bddfd7fef..ec14b8254 100644 --- a/admin/themes/default/template/configuration_comments.tpl +++ b/admin/themes/default/template/configuration_comments.tpl @@ -157,7 +157,7 @@ {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl index fe31f857d..5fa5e04a8 100644 --- a/admin/themes/default/template/configuration_display.tpl +++ b/admin/themes/default/template/configuration_display.tpl @@ -325,7 +325,7 @@ {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/configuration_main.tpl b/admin/themes/default/template/configuration_main.tpl index 19910ecb9..6322af6b5 100644 --- a/admin/themes/default/template/configuration_main.tpl +++ b/admin/themes/default/template/configuration_main.tpl @@ -252,18 +252,6 @@ jQuery("input[name='email_admin_on_new_user_filter']").change(function() { -
  • - - - -
    • - - -
  • @@ -298,7 +286,7 @@ jQuery("input[name='email_admin_on_new_user_filter']").change(function() { {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/configuration_search.tpl b/admin/themes/default/template/configuration_search.tpl new file mode 100644 index 000000000..2677c4610 --- /dev/null +++ b/admin/themes/default/template/configuration_search.tpl @@ -0,0 +1,245 @@ +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +{footer_script} + +const filters_names = {$search.filters_names|json_encode}; + +for(const filter_name of filters_names){ + if(!$("input#"+filter_name+"Filters").is(':checked')){ + $("#f"+filter_name+"Select, #"+filter_name+"Arrow").hide(); + $("#default_"+filter_name).parent().hide(); + } + + if($("#f"+filter_name+"Select").val()!="admins-only"){ + $("#"+filter_name+"AdminIcon").hide(); + } + + if($("#default_"+filter_name).is(':checked')){ + $("#default_"+filter_name).parent().addClass("selected-filter-container"); + } + + $("#"+filter_name+"Filters").on("click", function(){ + if($("input#"+filter_name+"Filters").is(':checked')){ + $("#f"+filter_name+"Select, #"+filter_name+"Arrow").show(); + $("#default_"+filter_name).parent().show(); + if($("#f"+filter_name+"Select").val()=="admins-only"){ + $("#"+filter_name+"AdminIcon").show(); + } + } + else{ + $("#f"+filter_name+"Select, #"+filter_name+"Arrow, #"+filter_name+"AdminIcon").hide(); + $("#default_"+filter_name).parent().hide(); + } + }) + + $("#f"+filter_name+"Select").on("click", function(){ + if($("#f"+filter_name+"Select").val()=="admins-only"){ + $("#"+filter_name+"AdminIcon").show(); + } + else{ + $("#"+filter_name+"AdminIcon").hide(); + } + }) + + $("#default_"+filter_name).on("click", function(){ + if($("#default_"+filter_name).is(':checked')){ + $("#default_"+filter_name).parent().addClass("selected-filter-container"); + } + else{ + $("#default_"+filter_name).parent().removeClass("selected-filter-container"); + } + }) +} + +{/footer_script} + +{combine_css path="themes/default/vendor/fontello/css/gallery-icon.css" order=-10} + +
    + +
    + +
    + {'Filters'|translate} +
      + {foreach from=$search.filters_names item=filter_name} +
    • + +
      + +
      +
      • + {/foreach} +
    +
    + +
    + {'Default filters'|translate} + +
    + + +
    + + + + + + + + + + + + + + + +
    + +
    + +
    +
    +
    +
    +{if isset($save_success)} +
    +
    + {$save_success} +
    +
    +{/if} +
    + +
    +
    + +
    + +
    \ No newline at end of file diff --git a/admin/themes/default/template/configuration_sizes.tpl b/admin/themes/default/template/configuration_sizes.tpl index 9df0cff92..b723bfa2a 100644 --- a/admin/themes/default/template/configuration_sizes.tpl +++ b/admin/themes/default/template/configuration_sizes.tpl @@ -228,7 +228,7 @@ $(".restore-settings-button").each(function() { {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/configuration_watermark.tpl b/admin/themes/default/template/configuration_watermark.tpl index 8ea6f187e..da55d072c 100644 --- a/admin/themes/default/template/configuration_watermark.tpl +++ b/admin/themes/default/template/configuration_watermark.tpl @@ -136,7 +136,7 @@ {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl index 3fe8eeb11..33d439981 100644 --- a/admin/themes/default/template/element_set_ranks.tpl +++ b/admin/themes/default/template/element_set_ranks.tpl @@ -109,7 +109,7 @@ jQuery('.thumbnail').tipTip({ {if isset($save_success)}
    - {$save_success} + {$save_success}
    {/if} diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl index e0d7d9940..f1ae3c676 100644 --- a/admin/themes/default/template/footer.tpl +++ b/admin/themes/default/template/footer.tpl @@ -37,31 +37,32 @@
    • {* *}
    {* *} +{if (isset($SHOW_WHATS_NEW) and $SHOW_WHATS_NEW) or (isset($DISPLAY_BELL) and $DISPLAY_BELL)}

    {'What\'s new in version %s'|translate:$WHATS_NEW_MAJOR_VERSION}

    -
    -

    {'A new interface for user management'|translate}

    +
    +

    {'Brand new login & preferences with Standard pages !'|translate}

    -
    -

    {'Brand new features : Activities logs and PDF reader'|translate}

    +
    +

    {'Two factor authentication is here'|translate}

    -
    -

    {'Enhanced interface for batch manager and album selector'|translate}

    +
    +

    {'UI redesigns that make a difference'|translate}

    -
    + {*

    {'Even more filters for the gallery search engine'|translate}

    -
    +
    *}
    @@ -69,6 +70,7 @@
    +{/if} +


            '; + echo join("
            ", $frame); + echo '





    '; + + } else { + + foreach ($frame as &$frameLine) { + $frameLine = join(' ', explode("\xc0", $frameLine)); + $frameLine = join('▒', explode("\xc1", $frameLine)); + $frameLine = join(' ', explode("\xa0", $frameLine)); + $frameLine = join('▒', explode("\xa1", $frameLine)); + $frameLine = join('◇', explode("\x84", $frameLine)); //format 0 + $frameLine = join('◆', explode("\x85", $frameLine)); //format 1 + $frameLine = join('☢', explode("\x81", $frameLine)); //special bit + $frameLine = join(' ', explode("\x90", $frameLine)); //clock 0 + $frameLine = join('◷', explode("\x91", $frameLine)); //clock 1 + $frameLine = join(' ', explode("\x88", $frameLine)); //version + $frameLine = join('▒', explode("\x89", $frameLine)); //version + $frameLine = join('♦', explode("\x01", $frameLine)); + $frameLine = join('⋅', explode("\0", $frameLine)); + } + + ?> + + "; + echo join("
    ", $frame); + echo "    "; + + } + } + + //---------------------------------------------------------------------- + public static function serial($frame) + { + return gzcompress(join("\n", $frame), 9); + } + + //---------------------------------------------------------------------- + public static function unserial($code) + { + return explode("\n", gzuncompress($code)); + } + + //---------------------------------------------------------------------- + public static function newFrame($version) + { + if($version < 1 || $version > QRSPEC_VERSION_MAX) + return null; + + if(!isset(self::$frames[$version])) { + + $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat'; + + if (QR_CACHEABLE) { + if (file_exists($fileName)) { + self::$frames[$version] = self::unserial(file_get_contents($fileName)); + } else { + self::$frames[$version] = self::createFrame($version); + file_put_contents($fileName, self::serial(self::$frames[$version])); + } + } else { + self::$frames[$version] = self::createFrame($version); + } + } + + if(is_null(self::$frames[$version])) + return null; + + return self::$frames[$version]; + } + + //---------------------------------------------------------------------- + public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; } + public static function rsBlockNum1($spec) { return $spec[0]; } + public static function rsDataCodes1($spec) { return $spec[1]; } + public static function rsEccCodes1($spec) { return $spec[2]; } + public static function rsBlockNum2($spec) { return $spec[3]; } + public static function rsDataCodes2($spec) { return $spec[4]; } + public static function rsEccCodes2($spec) { return $spec[2]; } + public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); } + public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; } + + } + + + +//---- qrimage.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Image output of code using GD2 + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + define('QR_IMAGE', true); + + class QRimage { + + //---------------------------------------------------------------------- + public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) + { + $image = self::image($frame, $pixelPerPoint, $outerFrame); + + if ($filename === false) { + Header("Content-type: image/png"); + ImagePng($image); + } else { + if($saveandprint===TRUE){ + ImagePng($image, $filename); + header("Content-type: image/png"); + ImagePng($image); + }else{ + ImagePng($image, $filename); + } + } + + ImageDestroy($image); + } + + //---------------------------------------------------------------------- + public static function jpg($frame, $filename = false, $pixelPerPoint = 8, $outerFrame = 4, $q = 85) + { + $image = self::image($frame, $pixelPerPoint, $outerFrame); + + if ($filename === false) { + Header("Content-type: image/jpeg"); + ImageJpeg($image, null, $q); + } else { + ImageJpeg($image, $filename, $q); + } + + ImageDestroy($image); + } + + //---------------------------------------------------------------------- + private static function image($frame, $pixelPerPoint = 4, $outerFrame = 4) + { + $h = count($frame); + $w = strlen($frame[0]); + + $imgW = $w + 2*$outerFrame; + $imgH = $h + 2*$outerFrame; + + $base_image =ImageCreate($imgW, $imgH); + + $col[0] = ImageColorAllocate($base_image,255,255,255); + $col[1] = ImageColorAllocate($base_image,0,0,0); + + imagefill($base_image, 0, 0, $col[0]); + + for($y=0; $y<$h; $y++) { + for($x=0; $x<$w; $x++) { + if ($frame[$y][$x] == '1') { + ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); + } + } + } + + $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint); + ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH); + ImageDestroy($base_image); + + return $target_image; + } + } + + + +//---- qrinput.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Input encoding class + * + * Based on libqrencode C library distributed under LGPL 2.1 + * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + define('STRUCTURE_HEADER_BITS', 20); + define('MAX_STRUCTURED_SYMBOLS', 16); + + class QRinputItem { + + public $mode; + public $size; + public $data; + public $bstream; + + public function __construct($mode, $size, $data, $bstream = null) + { + $setData = array_slice($data, 0, $size); + + if (count($setData) < $size) { + $setData = array_merge($setData, array_fill(0,$size-count($setData),0)); + } + + if(!QRinput::check($mode, $size, $setData)) { + throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData)); + return null; + } + + $this->mode = $mode; + $this->size = $size; + $this->data = $setData; + $this->bstream = $bstream; + } + + //---------------------------------------------------------------------- + public function encodeModeNum($version) + { + try { + + $words = (int)($this->size / 3); + $bs = new QRbitstream(); + + $val = 0x1; + $bs->appendNum(4, $val); + $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size); + + for($i=0; $i<$words; $i++) { + $val = (ord($this->data[$i*3 ]) - ord('0')) * 100; + $val += (ord($this->data[$i*3+1]) - ord('0')) * 10; + $val += (ord($this->data[$i*3+2]) - ord('0')); + $bs->appendNum(10, $val); + } + + if($this->size - $words * 3 == 1) { + $val = ord($this->data[$words*3]) - ord('0'); + $bs->appendNum(4, $val); + } else if($this->size - $words * 3 == 2) { + $val = (ord($this->data[$words*3 ]) - ord('0')) * 10; + $val += (ord($this->data[$words*3+1]) - ord('0')); + $bs->appendNum(7, $val); + } + + $this->bstream = $bs; + return 0; + + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + public function encodeModeAn($version) + { + try { + $words = (int)($this->size / 2); + $bs = new QRbitstream(); + + $bs->appendNum(4, 0x02); + $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size); + + for($i=0; $i<$words; $i++) { + $val = (int)QRinput::lookAnTable(ord($this->data[$i*2 ])) * 45; + $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1])); + + $bs->appendNum(11, $val); + } + + if($this->size & 1) { + $val = QRinput::lookAnTable(ord($this->data[$words * 2])); + $bs->appendNum(6, $val); + } + + $this->bstream = $bs; + return 0; + + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + public function encodeMode8($version) + { + try { + $bs = new QRbitstream(); + + $bs->appendNum(4, 0x4); + $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size); + + for($i=0; $i<$this->size; $i++) { + $bs->appendNum(8, ord($this->data[$i])); + } + + $this->bstream = $bs; + return 0; + + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + public function encodeModeKanji($version) + { + try { + + $bs = new QRbitrtream(); + + $bs->appendNum(4, 0x8); + $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2)); + + for($i=0; $i<$this->size; $i+=2) { + $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]); + if($val <= 0x9ffc) { + $val -= 0x8140; + } else { + $val -= 0xc140; + } + + $h = ($val >> 8) * 0xc0; + $val = ($val & 0xff) + $h; + + $bs->appendNum(13, $val); + } + + $this->bstream = $bs; + return 0; + + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + public function encodeModeStructure() + { + try { + $bs = new QRbitstream(); + + $bs->appendNum(4, 0x03); + $bs->appendNum(4, ord($this->data[1]) - 1); + $bs->appendNum(4, ord($this->data[0]) - 1); + $bs->appendNum(8, ord($this->data[2])); + + $this->bstream = $bs; + return 0; + + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + public function estimateBitStreamSizeOfEntry($version) + { + $bits = 0; + + if($version == 0) + $version = 1; + + switch($this->mode) { + case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; + case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; + case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; + case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size);break; + case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS; + default: + return 0; + } + + $l = QRspec::lengthIndicator($this->mode, $version); + $m = 1 << $l; + $num = (int)(($this->size + $m - 1) / $m); + + $bits += $num * (4 + $l); + + return $bits; + } + + //---------------------------------------------------------------------- + public function encodeBitStream($version) + { + try { + + unset($this->bstream); + $words = QRspec::maximumWords($this->mode, $version); + + if($this->size > $words) { + + $st1 = new QRinputItem($this->mode, $words, $this->data); + $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words)); + + $st1->encodeBitStream($version); + $st2->encodeBitStream($version); + + $this->bstream = new QRbitstream(); + $this->bstream->append($st1->bstream); + $this->bstream->append($st2->bstream); + + unset($st1); + unset($st2); + + } else { + + $ret = 0; + + switch($this->mode) { + case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; + case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; + case QR_MODE_8: $ret = $this->encodeMode8($version); break; + case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version);break; + case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; + + default: + break; + } + + if($ret < 0) + return -1; + } + + return $this->bstream->size(); + + } catch (Exception $e) { + return -1; + } + } + }; + + //########################################################################## + + class QRinput { + + public $items; + + private $version; + private $level; + + //---------------------------------------------------------------------- + public function __construct($version = 0, $level = QR_ECLEVEL_L) + { + if ($version < 0 || $version > QRSPEC_VERSION_MAX || $level > QR_ECLEVEL_H) { + throw new Exception('Invalid version no'); + return NULL; + } + + $this->version = $version; + $this->level = $level; + } + + //---------------------------------------------------------------------- + public function getVersion() + { + return $this->version; + } + + //---------------------------------------------------------------------- + public function setVersion($version) + { + if($version < 0 || $version > QRSPEC_VERSION_MAX) { + throw new Exception('Invalid version no'); + return -1; + } + + $this->version = $version; + + return 0; + } + + //---------------------------------------------------------------------- + public function getErrorCorrectionLevel() + { + return $this->level; + } + + //---------------------------------------------------------------------- + public function setErrorCorrectionLevel($level) + { + if($level > QR_ECLEVEL_H) { + throw new Exception('Invalid ECLEVEL'); + return -1; + } + + $this->level = $level; + + return 0; + } + + //---------------------------------------------------------------------- + public function appendEntry(QRinputItem $entry) + { + $this->items[] = $entry; + } + + //---------------------------------------------------------------------- + public function append($mode, $size, $data) + { + try { + $entry = new QRinputItem($mode, $size, $data); + $this->items[] = $entry; + return 0; + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + + public function insertStructuredAppendHeader($size, $index, $parity) + { + if( $size > MAX_STRUCTURED_SYMBOLS ) { + throw new Exception('insertStructuredAppendHeader wrong size'); + } + + if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) { + throw new Exception('insertStructuredAppendHeader wrong index'); + } + + $buf = array($size, $index, $parity); + + try { + $entry = new QRinputItem(QR_MODE_STRUCTURE, 3, buf); + array_unshift($this->items, $entry); + return 0; + } catch (Exception $e) { + return -1; + } + } + + //---------------------------------------------------------------------- + public function calcParity() + { + $parity = 0; + + foreach($this->items as $item) { + if($item->mode != QR_MODE_STRUCTURE) { + for($i=$item->size-1; $i>=0; $i--) { + $parity ^= $item->data[$i]; + } + } + } + + return $parity; + } + + //---------------------------------------------------------------------- + public static function checkModeNum($size, $data) + { + for($i=0; $i<$size; $i++) { + if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){ + return false; + } + } + + return true; + } + + //---------------------------------------------------------------------- + public static function estimateBitsModeNum($size) + { + $w = (int)$size / 3; + $bits = $w * 10; + + switch($size - $w * 3) { + case 1: + $bits += 4; + break; + case 2: + $bits += 7; + break; + default: + break; + } + + return $bits; + } + + //---------------------------------------------------------------------- + public static $anTable = array( + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, + -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + ); + + //---------------------------------------------------------------------- + public static function lookAnTable($c) + { + return (($c > 127)?-1:self::$anTable[$c]); + } + + //---------------------------------------------------------------------- + public static function checkModeAn($size, $data) + { + for($i=0; $i<$size; $i++) { + if (self::lookAnTable(ord($data[$i])) == -1) { + return false; + } + } + + return true; + } + + //---------------------------------------------------------------------- + public static function estimateBitsModeAn($size) + { + $w = (int)($size / 2); + $bits = $w * 11; + + if($size & 1) { + $bits += 6; + } + + return $bits; + } + + //---------------------------------------------------------------------- + public static function estimateBitsMode8($size) + { + return $size * 8; + } + + //---------------------------------------------------------------------- + public function estimateBitsModeKanji($size) + { + return (int)(($size / 2) * 13); + } + + //---------------------------------------------------------------------- + public static function checkModeKanji($size, $data) + { + if($size & 1) + return false; + + for($i=0; $i<$size; $i+=2) { + $val = (ord($data[$i]) << 8) | ord($data[$i+1]); + if( $val < 0x8140 + || ($val > 0x9ffc && $val < 0xe040) + || $val > 0xebbf) { + return false; + } + } + + return true; + } + + /*********************************************************************** + * Validation + **********************************************************************/ + + public static function check($mode, $size, $data) + { + if($size <= 0) + return false; + + switch($mode) { + case QR_MODE_NUM: return self::checkModeNum($size, $data); break; + case QR_MODE_AN: return self::checkModeAn($size, $data); break; + case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break; + case QR_MODE_8: return true; break; + case QR_MODE_STRUCTURE: return true; break; + + default: + break; + } + + return false; + } + + + //---------------------------------------------------------------------- + public function estimateBitStreamSize($version) + { + $bits = 0; + + foreach($this->items as $item) { + $bits += $item->estimateBitStreamSizeOfEntry($version); + } + + return $bits; + } + + //---------------------------------------------------------------------- + public function estimateVersion() + { + $version = 0; + $prev = 0; + do { + $prev = $version; + $bits = $this->estimateBitStreamSize($prev); + $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level); + if ($version < 0) { + return -1; + } + } while ($version > $prev); + + return $version; + } + + //---------------------------------------------------------------------- + public static function lengthOfCode($mode, $version, $bits) + { + $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version); + switch($mode) { + case QR_MODE_NUM: + $chunks = (int)($payload / 10); + $remain = $payload - $chunks * 10; + $size = $chunks * 3; + if($remain >= 7) { + $size += 2; + } else if($remain >= 4) { + $size += 1; + } + break; + case QR_MODE_AN: + $chunks = (int)($payload / 11); + $remain = $payload - $chunks * 11; + $size = $chunks * 2; + if($remain >= 6) + $size++; + break; + case QR_MODE_8: + $size = (int)($payload / 8); + break; + case QR_MODE_KANJI: + $size = (int)(($payload / 13) * 2); + break; + case QR_MODE_STRUCTURE: + $size = (int)($payload / 8); + break; + default: + $size = 0; + break; + } + + $maxsize = QRspec::maximumWords($mode, $version); + if($size < 0) $size = 0; + if($size > $maxsize) $size = $maxsize; + + return $size; + } + + //---------------------------------------------------------------------- + public function createBitStream() + { + $total = 0; + + foreach($this->items as $item) { + $bits = $item->encodeBitStream($this->version); + + if($bits < 0) + return -1; + + $total += $bits; + } + + return $total; + } + + //---------------------------------------------------------------------- + public function convertData() + { + $ver = $this->estimateVersion(); + if($ver > $this->getVersion()) { + $this->setVersion($ver); + } + + for(;;) { + $bits = $this->createBitStream(); + + if($bits < 0) + return -1; + + $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level); + if($ver < 0) { + throw new Exception('WRONG VERSION'); + return -1; + } else if($ver > $this->getVersion()) { + $this->setVersion($ver); + } else { + break; + } + } + + return 0; + } + + //---------------------------------------------------------------------- + public function appendPaddingBit(&$bstream) + { + $bits = $bstream->size(); + $maxwords = QRspec::getDataLength($this->version, $this->level); + $maxbits = $maxwords * 8; + + if ($maxbits == $bits) { + return 0; + } + + if ($maxbits - $bits < 5) { + return $bstream->appendNum($maxbits - $bits, 0); + } + + $bits += 4; + $words = (int)(($bits + 7) / 8); + + $padding = new QRbitstream(); + $ret = $padding->appendNum($words * 8 - $bits + 4, 0); + + if($ret < 0) + return $ret; + + $padlen = $maxwords - $words; + + if($padlen > 0) { + + $padbuf = array(); + for($i=0; $i<$padlen; $i++) { + $padbuf[$i] = ($i&1)?0x11:0xec; + } + + $ret = $padding->appendBytes($padlen, $padbuf); + + if($ret < 0) + return $ret; + + } + + $ret = $bstream->append($padding); + + return $ret; + } + + //---------------------------------------------------------------------- + public function mergeBitStream() + { + if($this->convertData() < 0) { + return null; + } + + $bstream = new QRbitstream(); + + foreach($this->items as $item) { + $ret = $bstream->append($item->bstream); + if($ret < 0) { + return null; + } + } + + return $bstream; + } + + //---------------------------------------------------------------------- + public function getBitStream() + { + + $bstream = $this->mergeBitStream(); + + if($bstream == null) { + return null; + } + + $ret = $this->appendPaddingBit($bstream); + if($ret < 0) { + return null; + } + + return $bstream; + } + + //---------------------------------------------------------------------- + public function getByteStream() + { + $bstream = $this->getBitStream(); + if($bstream == null) { + return null; + } + + return $bstream->toByte(); + } + } + + + + + + +//---- qrbitstream.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Bitstream class + * + * Based on libqrencode C library distributed under LGPL 2.1 + * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + class QRbitstream { + + public $data = array(); + + //---------------------------------------------------------------------- + public function size() + { + return count($this->data); + } + + //---------------------------------------------------------------------- + public function allocate($setLength) + { + $this->data = array_fill(0, $setLength, 0); + return 0; + } + + //---------------------------------------------------------------------- + public static function newFromNum($bits, $num) + { + $bstream = new QRbitstream(); + $bstream->allocate($bits); + + $mask = 1 << ($bits - 1); + for($i=0; $i<$bits; $i++) { + if($num & $mask) { + $bstream->data[$i] = 1; + } else { + $bstream->data[$i] = 0; + } + $mask = $mask >> 1; + } + + return $bstream; + } + + //---------------------------------------------------------------------- + public static function newFromBytes($size, $data) + { + $bstream = new QRbitstream(); + $bstream->allocate($size * 8); + $p=0; + + for($i=0; $i<$size; $i++) { + $mask = 0x80; + for($j=0; $j<8; $j++) { + if($data[$i] & $mask) { + $bstream->data[$p] = 1; + } else { + $bstream->data[$p] = 0; + } + $p++; + $mask = $mask >> 1; + } + } + + return $bstream; + } + + //---------------------------------------------------------------------- + public function append(QRbitstream $arg) + { + if (is_null($arg)) { + return -1; + } + + if($arg->size() == 0) { + return 0; + } + + if($this->size() == 0) { + $this->data = $arg->data; + return 0; + } + + $this->data = array_values(array_merge($this->data, $arg->data)); + + return 0; + } + + //---------------------------------------------------------------------- + public function appendNum($bits, $num) + { + if ($bits == 0) + return 0; + + $b = QRbitstream::newFromNum($bits, $num); + + if(is_null($b)) + return -1; + + $ret = $this->append($b); + unset($b); + + return $ret; + } + + //---------------------------------------------------------------------- + public function appendBytes($size, $data) + { + if ($size == 0) + return 0; + + $b = QRbitstream::newFromBytes($size, $data); + + if(is_null($b)) + return -1; + + $ret = $this->append($b); + unset($b); + + return $ret; + } + + //---------------------------------------------------------------------- + public function toByte() + { + + $size = $this->size(); + + if($size == 0) { + return array(); + } + + $data = array_fill(0, (int)(($size + 7) / 8), 0); + $bytes = (int)($size / 8); + + $p = 0; + + for($i=0; $i<$bytes; $i++) { + $v = 0; + for($j=0; $j<8; $j++) { + $v = $v << 1; + $v |= $this->data[$p]; + $p++; + } + $data[$i] = $v; + } + + if($size & 7) { + $v = 0; + for($j=0; $j<($size & 7); $j++) { + $v = $v << 1; + $v |= $this->data[$p]; + $p++; + } + $data[$bytes] = $v; + } + + return $data; + } + + } + + + + +//---- qrsplit.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Input splitting classes + * + * Based on libqrencode C library distributed under LGPL 2.1 + * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * The following data / specifications are taken from + * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004) + * or + * "Automatic identification and data capture techniques -- + * QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + class QRsplit { + + public $dataStr = ''; + public $input; + public $modeHint; + + //---------------------------------------------------------------------- + public function __construct($dataStr, $input, $modeHint) + { + $this->dataStr = $dataStr; + $this->input = $input; + $this->modeHint = $modeHint; + } + + //---------------------------------------------------------------------- + public static function isdigitat($str, $pos) + { + if ($pos >= strlen($str)) + return false; + + return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9'))); + } + + //---------------------------------------------------------------------- + public static function isalnumat($str, $pos) + { + if ($pos >= strlen($str)) + return false; + + return (QRinput::lookAnTable(ord($str[$pos])) >= 0); + } + + //---------------------------------------------------------------------- + public function identifyMode($pos) + { + if ($pos >= strlen($this->dataStr)) + return QR_MODE_NUL; + + $c = $this->dataStr[$pos]; + + if(self::isdigitat($this->dataStr, $pos)) { + return QR_MODE_NUM; + } else if(self::isalnumat($this->dataStr, $pos)) { + return QR_MODE_AN; + } else if($this->modeHint == QR_MODE_KANJI) { + + if ($pos+1 < strlen($this->dataStr)) + { + $d = $this->dataStr[$pos+1]; + $word = (ord($c) << 8) | ord($d); + if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) { + return QR_MODE_KANJI; + } + } + } + + return QR_MODE_8; + } + + //---------------------------------------------------------------------- + public function eatNum() + { + $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion()); + + $p = 0; + while(self::isdigitat($this->dataStr, $p)) { + $p++; + } + + $run = $p; + $mode = $this->identifyMode($p); + + if($mode == QR_MODE_8) { + $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln + + QRinput::estimateBitsMode8(1) // + 4 + l8 + - QRinput::estimateBitsMode8($run + 1); // - 4 - l8 + if($dif > 0) { + return $this->eat8(); + } + } + if($mode == QR_MODE_AN) { + $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln + + QRinput::estimateBitsModeAn(1) // + 4 + la + - QRinput::estimateBitsModeAn($run + 1);// - 4 - la + if($dif > 0) { + return $this->eatAn(); + } + } + + $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr)); + if($ret < 0) + return -1; + + return $run; + } + + //---------------------------------------------------------------------- + public function eatAn() + { + $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion()); + $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion()); + + $p = 0; + + while(self::isalnumat($this->dataStr, $p)) { + if(self::isdigitat($this->dataStr, $p)) { + $q = $p; + while(self::isdigitat($this->dataStr, $q)) { + $q++; + } + + $dif = QRinput::estimateBitsModeAn($p) // + 4 + la + + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln + - QRinput::estimateBitsModeAn($q); // - 4 - la + + if($dif < 0) { + break; + } else { + $p = $q; + } + } else { + $p++; + } + } + + $run = $p; + + if(!self::isalnumat($this->dataStr, $p)) { + $dif = QRinput::estimateBitsModeAn($run) + 4 + $la + + QRinput::estimateBitsMode8(1) // + 4 + l8 + - QRinput::estimateBitsMode8($run + 1); // - 4 - l8 + if($dif > 0) { + return $this->eat8(); + } + } + + $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr)); + if($ret < 0) + return -1; + + return $run; + } + + //---------------------------------------------------------------------- + public function eatKanji() + { + $p = 0; + + while($this->identifyMode($p) == QR_MODE_KANJI) { + $p += 2; + } + + $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr)); + if($ret < 0) + return -1; + + return $run; + } + + //---------------------------------------------------------------------- + public function eat8() + { + $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion()); + $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion()); + + $p = 1; + $dataStrLen = strlen($this->dataStr); + + while($p < $dataStrLen) { + + $mode = $this->identifyMode($p); + if($mode == QR_MODE_KANJI) { + break; + } + if($mode == QR_MODE_NUM) { + $q = $p; + while(self::isdigitat($this->dataStr, $q)) { + $q++; + } + $dif = QRinput::estimateBitsMode8($p) // + 4 + l8 + + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln + - QRinput::estimateBitsMode8($q); // - 4 - l8 + if($dif < 0) { + break; + } else { + $p = $q; + } + } else if($mode == QR_MODE_AN) { + $q = $p; + while(self::isalnumat($this->dataStr, $q)) { + $q++; + } + $dif = QRinput::estimateBitsMode8($p) // + 4 + l8 + + QRinput::estimateBitsModeAn($q - $p) + 4 + $la + - QRinput::estimateBitsMode8($q); // - 4 - l8 + if($dif < 0) { + break; + } else { + $p = $q; + } + } else { + $p++; + } + } + + $run = $p; + $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr)); + + if($ret < 0) + return -1; + + return $run; + } + + //---------------------------------------------------------------------- + public function splitString() + { + while (strlen($this->dataStr) > 0) + { + if($this->dataStr == '') + return 0; + + $mode = $this->identifyMode(0); + + switch ($mode) { + case QR_MODE_NUM: $length = $this->eatNum(); break; + case QR_MODE_AN: $length = $this->eatAn(); break; + case QR_MODE_KANJI: + if ($hint == QR_MODE_KANJI) + $length = $this->eatKanji(); + else $length = $this->eat8(); + break; + default: $length = $this->eat8(); break; + + } + + if($length == 0) return 0; + if($length < 0) return -1; + + $this->dataStr = substr($this->dataStr, $length); + } + } + + //---------------------------------------------------------------------- + public function toUpper() + { + $stringLen = strlen($this->dataStr); + $p = 0; + + while ($p<$stringLen) { + $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint); + if($mode == QR_MODE_KANJI) { + $p += 2; + } else { + if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) { + $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32); + } + $p++; + } + } + + return $this->dataStr; + } + + //---------------------------------------------------------------------- + public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true) + { + if(is_null($string) || $string == '\0' || $string == '') { + throw new Exception('empty string!!!'); + } + + $split = new QRsplit($string, $input, $modeHint); + + if(!$casesensitive) + $split->toUpper(); + + return $split->splitString(); + } + } + + + +//---- qrrscode.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Reed-Solomon error correction support + * + * Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q + * (libfec is released under the GNU Lesser General Public License.) + * + * Based on libqrencode C library distributed under LGPL 2.1 + * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + class QRrsItem { + + public $mm; // Bits per symbol + public $nn; // Symbols per block (= (1<= $this->nn) { + $x -= $this->nn; + $x = ($x >> $this->mm) + ($x & $this->nn); + } + + return $x; + } + + //---------------------------------------------------------------------- + public static function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) + { + // Common code for intializing a Reed-Solomon control block (char or int symbols) + // Copyright 2004 Phil Karn, KA9Q + // May be used under the terms of the GNU Lesser General Public License (LGPL) + + $rs = null; + + // Check parameter ranges + if($symsize < 0 || $symsize > 8) return $rs; + if($fcr < 0 || $fcr >= (1<<$symsize)) return $rs; + if($prim <= 0 || $prim >= (1<<$symsize)) return $rs; + if($nroots < 0 || $nroots >= (1<<$symsize)) return $rs; // Can't have more roots than symbol values! + if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding + + $rs = new QRrsItem(); + $rs->mm = $symsize; + $rs->nn = (1<<$symsize)-1; + $rs->pad = $pad; + + $rs->alpha_to = array_fill(0, $rs->nn+1, 0); + $rs->index_of = array_fill(0, $rs->nn+1, 0); + + // PHP style macro replacement ;) + $NN =& $rs->nn; + $A0 =& $NN; + + // Generate Galois field lookup tables + $rs->index_of[0] = $A0; // log(zero) = -inf + $rs->alpha_to[$A0] = 0; // alpha**-inf = 0 + $sr = 1; + + for($i=0; $i<$rs->nn; $i++) { + $rs->index_of[$sr] = $i; + $rs->alpha_to[$i] = $sr; + $sr <<= 1; + if($sr & (1<<$symsize)) { + $sr ^= $gfpoly; + } + $sr &= $rs->nn; + } + + if($sr != 1){ + // field generator polynomial is not primitive! + $rs = NULL; + return $rs; + } + + /* Form RS code generator polynomial from its roots */ + $rs->genpoly = array_fill(0, $nroots+1, 0); + + $rs->fcr = $fcr; + $rs->prim = $prim; + $rs->nroots = $nroots; + $rs->gfpoly = $gfpoly; + + /* Find prim-th root of 1, used in decoding */ + for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn) + ; // intentional empty-body loop! + + $rs->iprim = (int)($iprim / $prim); + $rs->genpoly[0] = 1; + + for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) { + $rs->genpoly[$i+1] = 1; + + // Multiply rs->genpoly[] by @**(root + x) + for ($j = $i; $j > 0; $j--) { + if ($rs->genpoly[$j] != 0) { + $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)]; + } else { + $rs->genpoly[$j] = $rs->genpoly[$j-1]; + } + } + // rs->genpoly[0] can never be zero + $rs->genpoly[0] = $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[0]] + $root)]; + } + + // convert rs->genpoly[] to index form for quicker encoding + for ($i = 0; $i <= $nroots; $i++) + $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]]; + + return $rs; + } + + //---------------------------------------------------------------------- + public function encode_rs_char($data, &$parity) + { + $MM =& $this->mm; + $NN =& $this->nn; + $ALPHA_TO =& $this->alpha_to; + $INDEX_OF =& $this->index_of; + $GENPOLY =& $this->genpoly; + $NROOTS =& $this->nroots; + $FCR =& $this->fcr; + $PRIM =& $this->prim; + $IPRIM =& $this->iprim; + $PAD =& $this->pad; + $A0 =& $NN; + + $parity = array_fill(0, $NROOTS, 0); + + for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) { + + $feedback = $INDEX_OF[$data[$i] ^ $parity[0]]; + if($feedback != $A0) { + // feedback term is non-zero + + // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must + // always be for the polynomials constructed by init_rs() + $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback); + + for($j=1;$j<$NROOTS;$j++) { + $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])]; + } + } + + // Shift + array_shift($parity); + if($feedback != $A0) { + array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]); + } else { + array_push($parity, 0); + } + } + } + } + + //########################################################################## + + class QRrs { + + public static $items = array(); + + //---------------------------------------------------------------------- + public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) + { + foreach(self::$items as $rs) { + if($rs->pad != $pad) continue; + if($rs->nroots != $nroots) continue; + if($rs->mm != $symsize) continue; + if($rs->gfpoly != $gfpoly) continue; + if($rs->fcr != $fcr) continue; + if($rs->prim != $prim) continue; + + return $rs; + } + + $rs = QRrsItem::init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad); + array_unshift(self::$items, $rs); + + return $rs; + } + } + + + +//---- qrmask.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Masking + * + * Based on libqrencode C library distributed under LGPL 2.1 + * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + define('N1', 3); + define('N2', 3); + define('N3', 40); + define('N4', 10); + + class QRmask { + + public $runLength = array(); + + //---------------------------------------------------------------------- + public function __construct() + { + $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0); + } + + //---------------------------------------------------------------------- + public function writeFormatInformation($width, &$frame, $mask, $level) + { + $blacks = 0; + $format = QRspec::getFormatInfo($mask, $level); + + for($i=0; $i<8; $i++) { + if($format & 1) { + $blacks += 2; + $v = 0x85; + } else { + $v = 0x84; + } + + $frame[8][$width - 1 - $i] = chr($v); + if($i < 6) { + $frame[$i][8] = chr($v); + } else { + $frame[$i + 1][8] = chr($v); + } + $format = $format >> 1; + } + + for($i=0; $i<7; $i++) { + if($format & 1) { + $blacks += 2; + $v = 0x85; + } else { + $v = 0x84; + } + + $frame[$width - 7 + $i][8] = chr($v); + if($i == 0) { + $frame[8][7] = chr($v); + } else { + $frame[8][6 - $i] = chr($v); + } + + $format = $format >> 1; + } + + return $blacks; + } + + //---------------------------------------------------------------------- + public function mask0($x, $y) { return ($x+$y)&1; } + public function mask1($x, $y) { return ($y&1); } + public function mask2($x, $y) { return ($x%3); } + public function mask3($x, $y) { return ($x+$y)%3; } + public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; } + public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3; } + public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1; } + public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1; } + + //---------------------------------------------------------------------- + private function generateMaskNo($maskNo, $width, $frame) + { + $bitMask = array_fill(0, $width, array_fill(0, $width, 0)); + + for($y=0; $y<$width; $y++) { + for($x=0; $x<$width; $x++) { + if(ord($frame[$y][$x]) & 0x80) { + $bitMask[$y][$x] = 0; + } else { + $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y); + $bitMask[$y][$x] = ($maskFunc == 0)?1:0; + } + + } + } + + return $bitMask; + } + + //---------------------------------------------------------------------- + public static function serial($bitFrame) + { + $codeArr = array(); + + foreach ($bitFrame as $line) + $codeArr[] = join('', $line); + + return gzcompress(join("\n", $codeArr), 9); + } + + //---------------------------------------------------------------------- + public static function unserial($code) + { + $codeArr = array(); + + $codeLines = explode("\n", gzuncompress($code)); + foreach ($codeLines as $line) + $codeArr[] = str_split($line); + + return $codeArr; + } + + //---------------------------------------------------------------------- + public function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) + { + $b = 0; + $bitMask = array(); + + $fileName = QR_CACHE_DIR.'mask_'.$maskNo.DIRECTORY_SEPARATOR.'mask_'.$width.'_'.$maskNo.'.dat'; + + if (QR_CACHEABLE) { + if (file_exists($fileName)) { + $bitMask = self::unserial(file_get_contents($fileName)); + } else { + $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); + if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) + mkdir(QR_CACHE_DIR.'mask_'.$maskNo); + file_put_contents($fileName, self::serial($bitMask)); + } + } else { + $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); + } + + if ($maskGenOnly) + return; + + $d = $s; + + for($y=0; $y<$width; $y++) { + for($x=0; $x<$width; $x++) { + if($bitMask[$y][$x] == 1) { + $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]); + } + $b += (int)(ord($d[$y][$x]) & 1); + } + } + + return $b; + } + + //---------------------------------------------------------------------- + public function makeMask($width, $frame, $maskNo, $level) + { + $masked = array_fill(0, $width, str_repeat("\0", $width)); + $this->makeMaskNo($maskNo, $width, $frame, $masked); + $this->writeFormatInformation($width, $masked, $maskNo, $level); + + return $masked; + } + + //---------------------------------------------------------------------- + public function calcN1N3($length) + { + $demerit = 0; + + for($i=0; $i<$length; $i++) { + + if($this->runLength[$i] >= 5) { + $demerit += (N1 + ($this->runLength[$i] - 5)); + } + if($i & 1) { + if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) { + $fact = (int)($this->runLength[$i] / 3); + if(($this->runLength[$i-2] == $fact) && + ($this->runLength[$i-1] == $fact) && + ($this->runLength[$i+1] == $fact) && + ($this->runLength[$i+2] == $fact)) { + if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) { + $demerit += N3; + } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) { + $demerit += N3; + } + } + } + } + } + return $demerit; + } + + //---------------------------------------------------------------------- + public function evaluateSymbol($width, $frame) + { + $head = 0; + $demerit = 0; + + for($y=0; $y<$width; $y++) { + $head = 0; + $this->runLength[0] = 1; + + $frameY = $frame[$y]; + + if ($y>0) + $frameYM = $frame[$y-1]; + + for($x=0; $x<$width; $x++) { + if(($x > 0) && ($y > 0)) { + $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]); + $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]); + + if(($b22 | ($w22 ^ 1))&1) { + $demerit += N2; + } + } + if(($x == 0) && (ord($frameY[$x]) & 1)) { + $this->runLength[0] = -1; + $head = 1; + $this->runLength[$head] = 1; + } else if($x > 0) { + if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) { + $head++; + $this->runLength[$head] = 1; + } else { + $this->runLength[$head]++; + } + } + } + + $demerit += $this->calcN1N3($head+1); + } + + for($x=0; $x<$width; $x++) { + $head = 0; + $this->runLength[0] = 1; + + for($y=0; $y<$width; $y++) { + if($y == 0 && (ord($frame[$y][$x]) & 1)) { + $this->runLength[0] = -1; + $head = 1; + $this->runLength[$head] = 1; + } else if($y > 0) { + if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) { + $head++; + $this->runLength[$head] = 1; + } else { + $this->runLength[$head]++; + } + } + } + + $demerit += $this->calcN1N3($head+1); + } + + return $demerit; + } + + + //---------------------------------------------------------------------- + public function mask($width, $frame, $level) + { + $minDemerit = PHP_INT_MAX; + $bestMaskNum = 0; + $bestMask = array(); + + $checked_masks = array(0,1,2,3,4,5,6,7); + + if (QR_FIND_FROM_RANDOM !== false) { + + $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9); + for ($i = 0; $i < $howManuOut; $i++) { + $remPos = rand (0, count($checked_masks)-1); + unset($checked_masks[$remPos]); + $checked_masks = array_values($checked_masks); + } + + } + + $bestMask = $frame; + + foreach($checked_masks as $i) { + $mask = array_fill(0, $width, str_repeat("\0", $width)); + + $demerit = 0; + $blacks = 0; + $blacks = $this->makeMaskNo($i, $width, $frame, $mask); + $blacks += $this->writeFormatInformation($width, $mask, $i, $level); + $blacks = (int)(100 * $blacks / ($width * $width)); + $demerit = (int)((int)(abs($blacks - 50) / 5) * N4); + $demerit += $this->evaluateSymbol($width, $mask); + + if($demerit < $minDemerit) { + $minDemerit = $demerit; + $bestMask = $mask; + $bestMaskNum = $i; + } + } + + return $bestMask; + } + + //---------------------------------------------------------------------- + } + + + + +//---- qrencode.php ----------------------------- + + + + +/* + * PHP QR Code encoder + * + * Main encoder classes. + * + * Based on libqrencode C library distributed under LGPL 2.1 + * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi + * + * PHP QR Code is distributed under LGPL 3 + * Copyright (C) 2010 Dominik Dzienia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + class QRrsblock { + public $dataLength; + public $data = array(); + public $eccLength; + public $ecc = array(); + + public function __construct($dl, $data, $el, &$ecc, QRrsItem $rs) + { + $rs->encode_rs_char($data, $ecc); + + $this->dataLength = $dl; + $this->data = $data; + $this->eccLength = $el; + $this->ecc = $ecc; + } + }; + + //########################################################################## + + class QRrawcode { + public $version; + public $datacode = array(); + public $ecccode = array(); + public $blocks; + public $rsblocks = array(); //of RSblock + public $count; + public $dataLength; + public $eccLength; + public $b1; + + //---------------------------------------------------------------------- + public function __construct(QRinput $input) + { + $spec = array(0,0,0,0,0); + + $this->datacode = $input->getByteStream(); + if(is_null($this->datacode)) { + throw new Exception('null imput string'); + } + + QRspec::getEccSpec($input->getVersion(), $input->getErrorCorrectionLevel(), $spec); + + $this->version = $input->getVersion(); + $this->b1 = QRspec::rsBlockNum1($spec); + $this->dataLength = QRspec::rsDataLength($spec); + $this->eccLength = QRspec::rsEccLength($spec); + $this->ecccode = array_fill(0, $this->eccLength, 0); + $this->blocks = QRspec::rsBlockNum($spec); + + $ret = $this->init($spec); + if($ret < 0) { + throw new Exception('block alloc error'); + return null; + } + + $this->count = 0; + } + + //---------------------------------------------------------------------- + public function init(array $spec) + { + $dl = QRspec::rsDataCodes1($spec); + $el = QRspec::rsEccCodes1($spec); + $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); + + + $blockNo = 0; + $dataPos = 0; + $eccPos = 0; + for($i=0; $iecccode,$eccPos); + $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs); + $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc); + + $dataPos += $dl; + $eccPos += $el; + $blockNo++; + } + + if(QRspec::rsBlockNum2($spec) == 0) + return 0; + + $dl = QRspec::rsDataCodes2($spec); + $el = QRspec::rsEccCodes2($spec); + $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); + + if($rs == NULL) return -1; + + for($i=0; $iecccode,$eccPos); + $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs); + $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc); + + $dataPos += $dl; + $eccPos += $el; + $blockNo++; + } + + return 0; + } + + //---------------------------------------------------------------------- + public function getCode() + { + $ret; + + if($this->count < $this->dataLength) { + $row = $this->count % $this->blocks; + $col = $this->count / $this->blocks; + if($col >= $this->rsblocks[0]->dataLength) { + $row += $this->b1; + } + $ret = $this->rsblocks[$row]->data[$col]; + } else if($this->count < $this->dataLength + $this->eccLength) { + $row = ($this->count - $this->dataLength) % $this->blocks; + $col = ($this->count - $this->dataLength) / $this->blocks; + $ret = $this->rsblocks[$row]->ecc[$col]; + } else { + return 0; + } + $this->count++; + + return $ret; + } + } + + //########################################################################## + + class QRcode { + + public $version; + public $width; + public $data; + + //---------------------------------------------------------------------- + public function encodeMask(QRinput $input, $mask) + { + if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) { + throw new Exception('wrong version'); + } + if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) { + throw new Exception('wrong level'); + } + + $raw = new QRrawcode($input); + + QRtools::markTime('after_raw'); + + $version = $raw->version; + $width = QRspec::getWidth($version); + $frame = QRspec::newFrame($version); + + $filler = new FrameFiller($width, $frame); + if(is_null($filler)) { + return NULL; + } + + // inteleaved data and ecc codes + for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) { + $code = $raw->getCode(); + $bit = 0x80; + for($j=0; $j<8; $j++) { + $addr = $filler->next(); + $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0)); + $bit = $bit >> 1; + } + } + + QRtools::markTime('after_filler'); + + unset($raw); + + // remainder bits + $j = QRspec::getRemainder($version); + for($i=0; $i<$j; $i++) { + $addr = $filler->next(); + $filler->setFrameAt($addr, 0x02); + } + + $frame = $filler->frame; + unset($filler); + + + // masking + $maskObj = new QRmask(); + if($mask < 0) { + + if (QR_FIND_BEST_MASK) { + $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel()); + } else { + $masked = $maskObj->makeMask($width, $frame, (intval(QR_DEFAULT_MASK) % 8), $input->getErrorCorrectionLevel()); + } + } else { + $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel()); + } + + if($masked == NULL) { + return NULL; + } + + QRtools::markTime('after_mask'); + + $this->version = $version; + $this->width = $width; + $this->data = $masked; + + return $this; + } + + //---------------------------------------------------------------------- + public function encodeInput(QRinput $input) + { + return $this->encodeMask($input, -1); + } + + //---------------------------------------------------------------------- + public function encodeString8bit($string, $version, $level) + { + if(string == NULL) { + throw new Exception('empty string!'); + return NULL; + } + + $input = new QRinput($version, $level); + if($input == NULL) return NULL; + + $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string)); + if($ret < 0) { + unset($input); + return NULL; + } + return $this->encodeInput($input); + } + + //---------------------------------------------------------------------- + public function encodeString($string, $version, $level, $hint, $casesensitive) + { + + if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) { + throw new Exception('bad hint'); + return NULL; + } + + $input = new QRinput($version, $level); + if($input == NULL) return NULL; + + $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive); + if($ret < 0) { + return NULL; + } + + return $this->encodeInput($input); + } + + //---------------------------------------------------------------------- + public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) + { + $enc = QRencode::factory($level, $size, $margin); + return $enc->encodePNG($text, $outfile, $saveandprint=false); + } + + //---------------------------------------------------------------------- + public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) + { + $enc = QRencode::factory($level, $size, $margin); + return $enc->encode($text, $outfile); + } + + //---------------------------------------------------------------------- + public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) + { + $enc = QRencode::factory($level, $size, $margin); + return $enc->encodeRAW($text, $outfile); + } + } + + //########################################################################## + + class FrameFiller { + + public $width; + public $frame; + public $x; + public $y; + public $dir; + public $bit; + + //---------------------------------------------------------------------- + public function __construct($width, &$frame) + { + $this->width = $width; + $this->frame = $frame; + $this->x = $width - 1; + $this->y = $width - 1; + $this->dir = -1; + $this->bit = -1; + } + + //---------------------------------------------------------------------- + public function setFrameAt($at, $val) + { + $this->frame[$at['y']][$at['x']] = chr($val); + } + + //---------------------------------------------------------------------- + public function getFrameAt($at) + { + return ord($this->frame[$at['y']][$at['x']]); + } + + //---------------------------------------------------------------------- + public function next() + { + do { + + if($this->bit == -1) { + $this->bit = 0; + return array('x'=>$this->x, 'y'=>$this->y); + } + + $x = $this->x; + $y = $this->y; + $w = $this->width; + + if($this->bit == 0) { + $x--; + $this->bit++; + } else { + $x++; + $y += $this->dir; + $this->bit--; + } + + if($this->dir < 0) { + if($y < 0) { + $y = 0; + $x -= 2; + $this->dir = 1; + if($x == 6) { + $x--; + $y = 9; + } + } + } else { + if($y == $w) { + $y = $w - 1; + $x -= 2; + $this->dir = -1; + if($x == 6) { + $x--; + $y -= 8; + } + } + } + if($x < 0 || $y < 0) return null; + + $this->x = $x; + $this->y = $y; + + } while(ord($this->frame[$y][$x]) & 0x80); + + return array('x'=>$x, 'y'=>$y); + } + + } ; + + //########################################################################## + + class QRencode { + + public $casesensitive = true; + public $eightbit = false; + + public $version = 0; + public $size = 3; + public $margin = 4; + + public $structured = 0; // not supported yet + + public $level = QR_ECLEVEL_L; + public $hint = QR_MODE_8; + + //---------------------------------------------------------------------- + public static function factory($level = QR_ECLEVEL_L, $size = 3, $margin = 4) + { + $enc = new QRencode(); + $enc->size = $size; + $enc->margin = $margin; + + switch ($level.'') { + case '0': + case '1': + case '2': + case '3': + $enc->level = $level; + break; + case 'l': + case 'L': + $enc->level = QR_ECLEVEL_L; + break; + case 'm': + case 'M': + $enc->level = QR_ECLEVEL_M; + break; + case 'q': + case 'Q': + $enc->level = QR_ECLEVEL_Q; + break; + case 'h': + case 'H': + $enc->level = QR_ECLEVEL_H; + break; + } + + return $enc; + } + + //---------------------------------------------------------------------- + public function encodeRAW($intext, $outfile = false) + { + $code = new QRcode(); + + if($this->eightbit) { + $code->encodeString8bit($intext, $this->version, $this->level); + } else { + $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive); + } + + return $code->data; + } + + //---------------------------------------------------------------------- + public function encode($intext, $outfile = false) + { + $code = new QRcode(); + + if($this->eightbit) { + $code->encodeString8bit($intext, $this->version, $this->level); + } else { + $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive); + } + + QRtools::markTime('after_encode'); + + if ($outfile!== false) { + file_put_contents($outfile, join("\n", QRtools::binarize($code->data))); + } else { + return QRtools::binarize($code->data); + } + } + + //---------------------------------------------------------------------- + public function encodePNG($intext, $outfile = false,$saveandprint=false) + { + try { + + ob_start(); + $tab = $this->encode($intext); + $err = ob_get_contents(); + ob_end_clean(); + + if ($err != '') + QRtools::log($outfile, $err); + + $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin)); + + QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint); + + } catch (Exception $e) { + + QRtools::log($outfile, $e->getMessage()); + + } + } + } + + diff --git a/include/random_compat/byte_safe_strings.php b/include/random_compat/byte_safe_strings.php deleted file mode 100644 index dec5d3062..000000000 --- a/include/random_compat/byte_safe_strings.php +++ /dev/null @@ -1,181 +0,0 @@ - RandomCompat_strlen($binary_string)) { - return false; - } - - return mb_substr($binary_string, $start, $length, '8bit'); - } - - } else { - - /** - * substr() implementation that isn't brittle to mbstring.func_overload - * - * This version just uses the default substr() - * - * @param string $binary_string - * @param int $start - * @param int $length (optional) - * - * @throws TypeError - * - * @return string - */ - function RandomCompat_substr($binary_string, $start, $length = null) - { - if (!is_string($binary_string)) { - throw new TypeError( - 'RandomCompat_substr(): First argument should be a string' - ); - } - - if (!is_int($start)) { - throw new TypeError( - 'RandomCompat_substr(): Second argument should be an integer' - ); - } - - if ($length !== null) { - if (!is_int($length)) { - throw new TypeError( - 'RandomCompat_substr(): Third argument should be an integer, or omitted' - ); - } - - return substr($binary_string, $start, $length); - } - - return substr($binary_string, $start); - } - } -} diff --git a/include/random_compat/cast_to_int.php b/include/random_compat/cast_to_int.php deleted file mode 100644 index f441c5d98..000000000 --- a/include/random_compat/cast_to_int.php +++ /dev/null @@ -1,71 +0,0 @@ - operators might accidentally let a float - * through. - * - * @param int|float $number The number we want to convert to an int - * @param boolean $fail_open Set to true to not throw an exception - * - * @return int (or float if $fail_open) - * - * @throws TypeError - */ - function RandomCompat_intval($number, $fail_open = false) - { - if (is_numeric($number)) { - $number += 0; - } - - if ( - is_float($number) - && - $number > ~PHP_INT_MAX - && - $number < PHP_INT_MAX - ) { - $number = (int) $number; - } - - if (is_int($number) || $fail_open) { - return $number; - } - - throw new TypeError( - 'Expected an integer.' - ); - } -} diff --git a/include/random_compat/error_polyfill.php b/include/random_compat/error_polyfill.php deleted file mode 100644 index 57cfefdcd..000000000 --- a/include/random_compat/error_polyfill.php +++ /dev/null @@ -1,42 +0,0 @@ -GetRandom() - * 5. openssl_random_pseudo_bytes() (absolute last resort) - * - * See ERRATA.md for our reasoning behind this particular order - */ - if (extension_loaded('libsodium')) { - // See random_bytes_libsodium.php - if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) { - require_once $RandomCompatDIR.'/random_bytes_libsodium.php'; - } elseif (method_exists('Sodium', 'randombytes_buf')) { - require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php'; - } - } - - /** - * Reading directly from /dev/urandom: - */ - if (DIRECTORY_SEPARATOR === '/') { - // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast - // way to exclude Windows. - $RandomCompatUrandom = true; - $RandomCompat_basedir = ini_get('open_basedir'); - - if (!empty($RandomCompat_basedir)) { - $RandomCompat_open_basedir = explode( - PATH_SEPARATOR, - strtolower($RandomCompat_basedir) - ); - $RandomCompatUrandom = (array() !== array_intersect( - array('/dev', '/dev/', '/dev/urandom'), - $RandomCompat_open_basedir - )); - $RandomCompat_open_basedir = null; - } - - if ( - !function_exists('random_bytes') - && - $RandomCompatUrandom - && - @is_readable('/dev/urandom') - ) { - // Error suppression on is_readable() in case of an open_basedir - // or safe_mode failure. All we care about is whether or not we - // can read it at this point. If the PHP environment is going to - // panic over trying to see if the file can be read in the first - // place, that is not helpful to us here. - - // See random_bytes_dev_urandom.php - require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php'; - } - // Unset variables after use - $RandomCompat_basedir = null; - } else { - $RandomCompatUrandom = false; - } - - /** - * mcrypt_create_iv() - */ - if ( - !function_exists('random_bytes') - && - PHP_VERSION_ID >= 50307 - && - extension_loaded('mcrypt') - && - (DIRECTORY_SEPARATOR !== '/' || $RandomCompatUrandom) - ) { - // Prevent this code from hanging indefinitely on non-Windows; - // see https://bugs.php.net/bug.php?id=69833 - if ( - DIRECTORY_SEPARATOR !== '/' || - (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) - ) { - // See random_bytes_mcrypt.php - require_once $RandomCompatDIR.'/random_bytes_mcrypt.php'; - } - } - $RandomCompatUrandom = null; - - if ( - !function_exists('random_bytes') - && - extension_loaded('com_dotnet') - && - class_exists('COM') - ) { - $RandomCompat_disabled_classes = preg_split( - '#\s*,\s*#', - strtolower(ini_get('disable_classes')) - ); - - if (!in_array('com', $RandomCompat_disabled_classes)) { - try { - $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); - if (method_exists($RandomCompatCOMtest, 'GetRandom')) { - // See random_bytes_com_dotnet.php - require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php'; - } - } catch (com_exception $e) { - // Don't try to use it. - } - } - $RandomCompat_disabled_classes = null; - $RandomCompatCOMtest = null; - } - - /** - * throw new Exception - */ - if (!function_exists('random_bytes')) { - /** - * We don't have any more options, so let's throw an exception right now - * and hope the developer won't let it fail silently. - */ - function random_bytes($length) - { - throw new Exception( - 'There is no suitable CSPRNG installed on your system' - ); - } - } - } - - if (!function_exists('random_int')) { - require_once $RandomCompatDIR.'/random_int.php'; - } - - $RandomCompatDIR = null; -} diff --git a/include/random_compat/random_bytes_com_dotnet.php b/include/random_compat/random_bytes_com_dotnet.php deleted file mode 100644 index 342282549..000000000 --- a/include/random_compat/random_bytes_com_dotnet.php +++ /dev/null @@ -1,81 +0,0 @@ -GetRandom($bytes, 0)); - if (RandomCompat_strlen($buf) >= $bytes) { - /** - * Return our random entropy buffer here: - */ - return RandomCompat_substr($buf, 0, $bytes); - } - ++$execCount; - } while ($execCount < $bytes); - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/include/random_compat/random_bytes_dev_urandom.php b/include/random_compat/random_bytes_dev_urandom.php deleted file mode 100644 index db93b0757..000000000 --- a/include/random_compat/random_bytes_dev_urandom.php +++ /dev/null @@ -1,148 +0,0 @@ - 0); - - /** - * Is our result valid? - */ - if ($buf !== false) { - if (RandomCompat_strlen($buf) === $bytes) { - /** - * Return our random entropy buffer here: - */ - return $buf; - } - } - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Error reading from source device' - ); -} diff --git a/include/random_compat/random_bytes_libsodium.php b/include/random_compat/random_bytes_libsodium.php deleted file mode 100644 index f802d4e12..000000000 --- a/include/random_compat/random_bytes_libsodium.php +++ /dev/null @@ -1,86 +0,0 @@ - 2147483647) { - $buf = ''; - for ($i = 0; $i < $bytes; $i += 1073741824) { - $n = ($bytes - $i) > 1073741824 - ? 1073741824 - : $bytes - $i; - $buf .= \Sodium\randombytes_buf($n); - } - } else { - $buf = \Sodium\randombytes_buf($bytes); - } - - if ($buf !== false) { - if (RandomCompat_strlen($buf) === $bytes) { - return $buf; - } - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/include/random_compat/random_bytes_libsodium_legacy.php b/include/random_compat/random_bytes_libsodium_legacy.php deleted file mode 100644 index 44fddbf6f..000000000 --- a/include/random_compat/random_bytes_libsodium_legacy.php +++ /dev/null @@ -1,86 +0,0 @@ - 2147483647) { - $buf = ''; - for ($i = 0; $i < $bytes; $i += 1073741824) { - $n = ($bytes - $i) > 1073741824 - ? 1073741824 - : $bytes - $i; - $buf .= Sodium::randombytes_buf($n); - } - } else { - $buf = Sodium::randombytes_buf($bytes); - } - - if ($buf !== false) { - if (RandomCompat_strlen($buf) === $bytes) { - return $buf; - } - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/include/random_compat/random_bytes_mcrypt.php b/include/random_compat/random_bytes_mcrypt.php deleted file mode 100644 index 7ac9d9105..000000000 --- a/include/random_compat/random_bytes_mcrypt.php +++ /dev/null @@ -1,76 +0,0 @@ - operators might accidentally let a float - * through. - */ - - try { - $min = RandomCompat_intval($min); - } catch (TypeError $ex) { - throw new TypeError( - 'random_int(): $min must be an integer' - ); - } - - try { - $max = RandomCompat_intval($max); - } catch (TypeError $ex) { - throw new TypeError( - 'random_int(): $max must be an integer' - ); - } - - /** - * Now that we've verified our weak typing system has given us an integer, - * let's validate the logic then we can move forward with generating random - * integers along a given range. - */ - if ($min > $max) { - throw new Error( - 'Minimum value must be less than or equal to the maximum value' - ); - } - - if ($max === $min) { - return $min; - } - - /** - * Initialize variables to 0 - * - * We want to store: - * $bytes => the number of random bytes we need - * $mask => an integer bitmask (for use with the &) operator - * so we can minimize the number of discards - */ - $attempts = $bits = $bytes = $mask = $valueShift = 0; - - /** - * At this point, $range is a positive number greater than 0. It might - * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to - * a float and we will lose some precision. - */ - $range = $max - $min; - - /** - * Test for integer overflow: - */ - if (!is_int($range)) { - - /** - * Still safely calculate wider ranges. - * Provided by @CodesInChaos, @oittaa - * - * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 - * - * We use ~0 as a mask in this case because it generates all 1s - * - * @ref https://eval.in/400356 (32-bit) - * @ref http://3v4l.org/XX9r5 (64-bit) - */ - $bytes = PHP_INT_SIZE; - $mask = ~0; - - } else { - - /** - * $bits is effectively ceil(log($range, 2)) without dealing with - * type juggling - */ - while ($range > 0) { - if ($bits % 8 === 0) { - ++$bytes; - } - ++$bits; - $range >>= 1; - $mask = $mask << 1 | 1; - } - $valueShift = $min; - } - - /** - * Now that we have our parameters set up, let's begin generating - * random integers until one falls between $min and $max - */ - do { - /** - * The rejection probability is at most 0.5, so this corresponds - * to a failure probability of 2^-128 for a working RNG - */ - if ($attempts > 128) { - throw new Exception( - 'random_int: RNG is broken - too many rejections' - ); - } - - /** - * Let's grab the necessary number of random bytes - */ - $randomByteString = random_bytes($bytes); - if ($randomByteString === false) { - throw new Exception( - 'Random number generator failure' - ); - } - - /** - * Let's turn $randomByteString into an integer - * - * This uses bitwise operators (<< and |) to build an integer - * out of the values extracted from ord() - * - * Example: [9F] | [6D] | [32] | [0C] => - * 159 + 27904 + 3276800 + 201326592 => - * 204631455 - */ - $val = 0; - for ($i = 0; $i < $bytes; ++$i) { - $val |= ord($randomByteString[$i]) << ($i * 8); - } - - /** - * Apply mask - */ - $val &= $mask; - $val += $valueShift; - - ++$attempts; - /** - * If $val overflows to a floating point number, - * ... or is larger than $max, - * ... or smaller than $min, - * then try again. - */ - } while (!is_int($val) || $val > $max || $val < $min); - - return (int) $val; -} diff --git a/include/search_filters.inc.php b/include/search_filters.inc.php index 82e6591c2..11ec3198a 100644 --- a/include/search_filters.inc.php +++ b/include/search_filters.inc.php @@ -6,11 +6,31 @@ // | file that was distributed with this source code. | // +-----------------------------------------------------------------------+ +$filters_views = safe_unserialize(conf_get_param('filters_views', $conf['default_filters_views'])); + +$template->assign('display_filter', $filters_views); + // we add isset($page['search_details']) in this condition because it only // applies to regular search, not the legacy qsearch. As Piwigo 14 will still // be able to show an old quicksearch result, we must check this condtion too. if ('search' == $page['section'] and isset($page['search_details'])) { + $display_filters = $filters_views; + + foreach($filters_views as $filt_name => $filt_conf){ + if(isset($filt_conf['access'])) + { + if ($filt_conf['access'] == 'everybody' or ($filt_conf['access'] == 'admins-only' and is_admin()) or ($filt_conf['access'] == 'registered-users' and is_classic_user())) + { + $display_filters[$filt_name]['access'] = true; + } + else + { + $display_filters[$filt_name]['access'] = false; + } + } + } + include_once(PHPWG_ROOT_PATH.'include/functions_search.inc.php'); $my_search = get_search_array($page['search']); @@ -40,7 +60,12 @@ if ('search' == $page['section'] and isset($page['search_details'])) $search_items_clause = '1=1'; } - if (isset($my_search['fields']['tags'])) + if (isset($my_search['fields']['allwords']) and !($display_filters['words']['access'])) + { + unset($my_search['fields']['allwords']); + } + + if (isset($my_search['fields']['tags']) and $display_filters['tags']['access']) { $filter_tags = array(); @@ -77,7 +102,24 @@ if ('search' == $page['section'] and isset($page['search_details'])) $my_search['fields']['tags']['words'] = array_intersect($my_search['fields']['tags']['words'], $filter_tag_ids); } - if (isset($my_search['fields']['author'])) + else if (isset($my_search['fields']['tags']) and !($display_filters['tags']['access'])) + { + unset($my_search['fields']['tags']); + } + + if (isset($my_search['fields']['expert'])) + { + if (!$display_filters['expert']['access']) + { + unset($my_search['fields']['expert']); + } + else + { + load_language('help_quick_search.lang'); + } + } + + if (isset($my_search['fields']['author']) and $display_filters['author']['access']) { $filter_clause = get_clause_for_filter('author'); @@ -118,7 +160,12 @@ SELECT $my_search['fields']['author']['words'] = array_intersect($my_search['fields']['author']['words'], $author_names); } - if (isset($my_search['fields']['date_posted'])) + else if (isset($my_search['fields']['author']) and !($display_filters['author']['access'])) + { + unset($my_search['fields']['author']); + } + + if (isset($my_search['fields']['date_posted']) and $display_filters['post_date']['access']) { $filter_clause = get_clause_for_filter('date_posted'); $cache_key = $persistent_cache->make_key('filter_date_posted'.$user['id'].$user['cache_update_time']); @@ -220,7 +267,12 @@ SELECT $template->assign('DATE_POSTED', $counters); } - if (isset($my_search['fields']['date_created'])) + else if (isset($my_search['fields']['date_posted']) and !($display_filters['post_date']['access'])) + { + unset($my_search['fields']['date_posted']); + } + + if (isset($my_search['fields']['date_created']) and $display_filters['creation_date']['access']) { $filter_clause = get_clause_for_filter('date_created'); $cache_key = $persistent_cache->make_key('filter_date_created'.$user['id'].$user['cache_update_time']); @@ -324,8 +376,12 @@ SELECT $template->assign('DATE_CREATED', $counters); } + else if (isset($my_search['fields']['date_created']) and !($display_filters['creation_date']['access'])) + { + unset($my_search['fields']['date_created']); + } - if (isset($my_search['fields']['added_by'])) + if (isset($my_search['fields']['added_by']) and $display_filters['added_by']['access']) { $filter_clause = get_clause_for_filter('added_by'); @@ -388,11 +444,18 @@ SELECT $my_search['fields']['added_by'] = array_intersect($my_search['fields']['added_by'], $user_ids); } - if (isset($my_search['fields']['cat']) and !empty($my_search['fields']['cat']['words'])) + else if (isset($my_search['fields']['added_by']) and !($display_filters['added_by']['access'])) { - $fullname_of = array(); + unset($my_search['fields']['added_by']); + } - $query = ' + if (isset($my_search['fields']['cat']) and $display_filters['album']['access']) + { + if (!empty($my_search['fields']['cat']['words'])) + { + $fullname_of = array(); + + $query = ' SELECT id, uppercats @@ -400,26 +463,32 @@ SELECT INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id = cat_id AND user_id = '.$user['id'].' WHERE id IN ('.implode(',', $my_search['fields']['cat']['words']).') ;'; - $result = pwg_query($query); + $result = pwg_query($query); - while ($row = pwg_db_fetch_assoc($result)) - { - $cat_display_name = get_cat_display_name_cache( - $row['uppercats'], - 'admin.php?page=album-' // TODO not sure it's relevant to link to admin pages - ); - $row['fullname'] = strip_tags($cat_display_name); + while ($row = pwg_db_fetch_assoc($result)) + { + $cat_display_name = get_cat_display_name_cache( + $row['uppercats'], + 'admin.php?page=album-' // TODO not sure it's relevant to link to admin pages + ); + $row['fullname'] = strip_tags($cat_display_name); - $fullname_of[$row['id']] = $row['fullname']; + $fullname_of[$row['id']] = $row['fullname']; + } + + $template->assign('fullname_of', json_encode($fullname_of)); + + // in case the search has forbidden albums for current user, we need to filter the search rule + $my_search['fields']['cat']['words'] = array_intersect($my_search['fields']['cat']['words'], array_keys($fullname_of)); } - - $template->assign('fullname_of', json_encode($fullname_of)); - - // in case the search has forbidden albums for current user, we need to filter the search rule - $my_search['fields']['cat']['words'] = array_intersect($my_search['fields']['cat']['words'], array_keys($fullname_of)); } - if (isset($my_search['fields']['filetypes'])) + else if (isset($my_search['fields']['cat']) and !($display_filters['album']['access'])) + { + unset($my_search['fields']['cat']); + } + + if (isset($my_search['fields']['filetypes']) and $display_filters['file_type']['access']) { $filter_clause = get_clause_for_filter('filetypes'); @@ -469,12 +538,17 @@ SELECT } } + else if (isset($my_search['fields']['filetypes']) and !($display_filters['file_type']['access'])) + { + unset($my_search['fields']['filetypes']); + } + // For rating if ($conf['rate']) { $template->assign('SHOW_FILTER_RATINGS', true); - if (isset($my_search['fields']['ratings'])) + if (isset($my_search['fields']['ratings']) and $display_filters['rating']['access']) { $filter_clause = get_clause_for_filter('ratings'); @@ -529,14 +603,22 @@ SELECT } $template->assign('RATING', $ratings); } + else if (isset($my_search['fields']['ratings']) and !($display_filters['rating']['access'])) + { + unset($my_search['fields']['ratings']); + } } else { $template->assign('SHOW_FILTER_RATINGS', false); + if (isset($my_search['fields']['ratings'])) + { + unset($my_search['fields']['ratings']); + } } // For filesize - if (isset($my_search['fields']['filesize_min']) && isset($my_search['fields']['filesize_max'])) + if (isset($my_search['fields']['filesize_min']) && isset($my_search['fields']['filesize_max']) and $display_filters['file_size']['access']) { $filter_clause = get_clause_for_filter('filesize'); @@ -582,8 +664,14 @@ SELECT $template->assign('FILESIZE', $filesize ); } + + else if (isset($my_search['fields']['filesize_min']) && isset($my_search['fields']['filesize_max']) and !($display_filters['file_size']['access'])) + { + unset($my_search['fields']['filesize_min']); + unset($my_search['fields']['filesize_max']); + } - if (isset($my_search['fields']['ratios'])) + if (isset($my_search['fields']['ratios']) and $display_filters['ratio']['access']) { $filter_clause = get_clause_for_filter('ratios'); @@ -648,11 +736,15 @@ SELECT $persistent_cache->set($cache_key, $ratios); } } - $template->assign('RATIOS', $ratios); } - if (isset($my_search['fields']['height_min']) and isset($my_search['fields']['height_max'])) + else if (isset($my_search['fields']['ratios']) and !($display_filters['ratio']['access'])) + { + unset($my_search['fields']['ratios']); + } + + if (isset($my_search['fields']['height_min']) and isset($my_search['fields']['height_max']) and $display_filters['height']['access']) { $filter_clause = get_clause_for_filter('height'); @@ -699,7 +791,13 @@ SELECT $template->assign('HEIGHT', $height); } - if (isset($my_search['fields']['width_min']) and isset($my_search['fields']['width_max'])) + else if (isset($my_search['fields']['height_min']) && isset($my_search['fields']['height_max']) and !($display_filters['height']['access'])) + { + unset($my_search['fields']['height_min']); + unset($my_search['fields']['height_max']); + } + + if (isset($my_search['fields']['width_min']) and isset($my_search['fields']['width_max']) and $display_filters['width']['access']) { $filter_clause = get_clause_for_filter('width'); @@ -746,6 +844,12 @@ SELECT $template->assign('WIDTH', $width); } + else if (isset($my_search['fields']['width_min']) && isset($my_search['fields']['width_max']) and !($display_filters['width']['access'])) + { + unset($my_search['fields']['width_min']); + unset($my_search['fields']['width_max']); + } + $template->assign( array( 'GP' => json_encode($my_search), diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 2f751864e..82b0b1bfa 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -59,6 +59,8 @@ if ( strncmp($page['root_path'], './', 2) == 0 ) $page['root_path'] = substr($page['root_path'], 2); } +$page['section_url'] = $rewritten; + // deleting first "/" if displayed $tokens = explode('/', ltrim($rewritten, '/') ); // $tokens = array( diff --git a/include/selected_tags.inc.php b/include/selected_tags.inc.php new file mode 100644 index 000000000..f3fb6dbcd --- /dev/null +++ b/include/selected_tags.inc.php @@ -0,0 +1,42 @@ +$tag) +{ + $other_tags = $page['tags']; + unset($other_tags[$key]); + + $selected_related_tags_info[$key] = + array( + 'tag_name' => trigger_change('render_tag_name', $page['tags'][$key]['name'], $page['tags'][$key]), + 'item_count' => '', + 'index_url' => make_index_url( + array( + 'tags' => array( $page['tags'][$key] ) + ) + ), + 'remove_url' => make_index_url( + array( + 'tags' => $other_tags + ) + ) + ); +} + +$template->assign( + array( + 'SELECT_RELATED_TAGS' => $selected_related_tags_info, + ) +); + +$template->set_filename('selected_tags', 'include/selected_tags.inc.tpl'); +$template->assign_var_from_handle('SELECTED_TAGS_TEMPLATE', 'selected_tags'); + diff --git a/include/smarty/CHANGELOG.md b/include/smarty/CHANGELOG.md index 899cfd7e7..4ee214bac 100644 --- a/include/smarty/CHANGELOG.md +++ b/include/smarty/CHANGELOG.md @@ -6,6 +6,183 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.5.2] - 2025-08-26 + + +- Fixed escaping of array/object keys in debug_print_var + +## [5.5.1] - 2025-05-19 +- Fix missing support for loading modifiercompilers from plugin dir in BCPluginsAdapter [#1132](https://github.com/smarty-php/smarty/pull/1132) + + +## [5.5.0] - 2025-05-03 +- Support trailing comma in array [#1013](https://github.com/smarty-php/smarty/issues/1013) + + +## [5.4.5] - 2025-04-15 +- Fixed deprecation notice in StringEval in PHP8.4 [#1119](https://github.com/smarty-php/smarty/issues/1119) + + +## [5.4.4] - 2025-04-13 +- Fix syntax error occurring when registering a function plugin that ends with the string 'close' [#1122](https://github.com/smarty-php/smarty/issues/1122) +- Replace SMARTY_VERSION constant with $smarty.version in debug.tpl [#1073](https://github.com/smarty-php/smarty/issues/1073) + + +## [5.4.3] - 2024-12-23 +- Fix PHP backtraces by qualifying/replacing `call_user_func_array` calls [#1074](https://github.com/smarty-php/smarty/issues/1074) + + +## [5.4.2] - 2024-11-20 + + +- Support the deprecations introduced in PHP 8.4 and added tests for PHP 8.4 [#1043](https://github.com/smarty-php/smarty/pull/1043) + +## [5.4.1] - 2024-08-29 + + +- Enable (and fix) unit tests for Windows [#1046](https://github.com/smarty-php/smarty/pull/1046) +- Fix the use of "extends:" to define the inheritance tree on Windows [#1018](https://github.com/smarty-php/smarty/issues/1018) + +## [5.4.0] - 2024-08-14 +- Fixing forced OpCache invalidation on every template include, which is resulting in fast raising wasted OpCache memory [#1007](https://github.com/smarty-php/smarty/issues/1007) +- Improvement of auto-escaping [#1030](https://github.com/smarty-php/smarty/pull/1030) + + +## [5.3.1] - 2024-06-16 +- Fixed error when using section with nocache [#1034](https://github.com/smarty-php/smarty/issues/1034) + + +## [5.3.0] - 2024-05-30 +- Fix warning when calling hasVariable for an undefined variable [#977](https://github.com/smarty-php/smarty/issues/977) +- Added `$smarty->prependTemplateDir()` method [#1022](https://github.com/smarty-php/smarty/issues/1022) + + +## [5.2.0] - 2024-05-28 +- Fixed a code injection vulnerability in extends-tag. This addresses CVE-2024-35226. +- Added `$smarty->setCacheModifiedCheck()` setter for cache_modified_check +- Added a PSR-4 loading script to allow Smarty to be used without Composer [#1017](https://github.com/smarty-php/smarty/pull/1017) + + +## [5.1.0] - 2024-04-22 +- Prevent deprecation notices during compilation in PHP8.3 [#996](https://github.com/smarty-php/smarty/issues/996) +- Fix that getTemplateVars would return an array of objects instead of the assigned variables values [#994](https://github.com/smarty-php/smarty/issues/994) +- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972) +- Documented support for `{if $element is in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937) +- Added support for `{if $element is not in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937) +- Using stream variables in templates now throws a deprecation notice [#933](https://github.com/smarty-php/smarty/pull/933) +- Internal compiler classes always return a string (the internal has_code flag has been removed for simplicity) [#918](https://github.com/smarty-php/smarty/pull/918) +- Fix invalid classnames in Runtime code for foreach [#1000](https://github.com/smarty-php/smarty/issues/1000) + +## [5.0.2] - 2024-03-28 +- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972) + +## [5.0.1] - 2024-03-27 +- Fix error in Smarty\Smarty::compileAllTemplates() by including missing FilesystemIterator class [#966](https://github.com/smarty-php/smarty/issues/966) + +## [5.0.0] - 2024-03-25 +- Fixed that scoped variables would overwrite parent scope [#952](https://github.com/smarty-php/smarty/issues/952) +- Removed publicly accessible `$tpl->_var_stack` variable + +### Fixed +- Too many shorthand attributes error when using a modifier as a function with more than 3 parameters in an expression [#949](https://github.com/smarty-php/smarty/issues/949) + +### Removed +- Dropped support for undocumented `{time()}` added in v5.0.0 since we already have the documented `{$smarty.now}` + +## [5.0.0-rc3] - 2024-02-26 + +### Added +- PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925) +- Backlink to GitHub in docs +- Explain how to do escaping and set-up auto-escaping in docs [#865](https://github.com/smarty-php/smarty/issues/865) +- Link to variable scope page in the documentation for the assign tag [#878](https://github.com/smarty-php/smarty/issues/878) +- Add support for implode, substr and json_encode as modifiers/functions in templates [#939](https://github.com/smarty-php/smarty/issues/939) +- Add template path to CompilerException to enable rich debug features [#935](https://github.com/smarty-php/smarty/issues/935) + +### Fixed +- The {debug} tag was broken in v5 [#922](https://github.com/smarty-php/smarty/issues/922) +- Documentation on `{if $x is even by $y}` syntax +- Fix incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930) + +## [5.0.0-rc2] - 2023-11-11 + +### Fixed +- Registered output filters wouldn't run [#899](https://github.com/smarty-php/smarty/issues/899) +- Use of negative numbers in {math} equations [#895](https://github.com/smarty-php/smarty/issues/895) +- Do not auto-html-escape custom function results [#906](https://github.com/smarty-php/smarty/issues/906) +- Fix case-sensitive tag names [#907](https://github.com/smarty-php/smarty/issues/907) + +### Removed +- Removed `$smarty->registered_filters` array + +## [5.0.0-rc1] - 2023-08-08 + +### Added +- Added support for PHP8.2 +- Added a new way to extend Smarty functionality using `Smarty::addExtension()` or `Smarty::setExtensions()`. Please see the docs for more information. +- Custom tags can accept positional parameters, so you can write a block compiler that support this: `{trans "Jack" "dull boy"}All work and no play makes %s a %s.{/trans}` [#164](https://github.com/smarty-php/smarty/issues/164) +- Full support for ternary operator: `{$test ? $a : $b}` and `{$var ?: $value_if_falsy}` [#881](https://github.com/smarty-php/smarty/issues/881) +- Full support for null coalescing operator: `{$var ?? $value_if_null}` [#882](https://github.com/smarty-php/smarty/issues/882) + +### Changed +- All Smarty code is now in the \Smarty namespace. For simple use-cases, you only need to add + `use \Smarty\Smarty;` to your script and everything will work. If you extend Smarty or use + Smarty plug-ins, please review your code to see if they assume specific class or method names. + E.g.: `Smarty_Internal_Template` is now `\Smarty\Template\`, `SmartyException` is now `\Smarty\Exception`. +- Template variable scope bubbling has been simplified and made more consistent. + The global scope now equals the Smarty scope in order to avoid global state side effects. Please read + the documentation for more details. +- Lexers and Parsers PHP files are reliably generated from sources (.y and .plex) using the make file +- Smarty now always runs in multibyte mode, using `symfony/polyfill-mbstring` if required. Please use the + multibyte extension for optimal performance. +- Smarty no longer calls `mb_internal_encoding()` and doesn't check for deprecated `mbstring.func_overload` ini directive [#480](https://github.com/smarty-php/smarty/issues/480) +- Generated `'; - } elseif ($encode === 'javascript_charcode') { - for ($x = 0, $_length = strlen($string); $x < $_length; $x++) { - $ord[] = ord($string[ $x ]); - } - return ''; - } elseif ($encode === 'hex') { - preg_match('!^(.*)(\?.*)$!', $address, $match); - if (!empty($match[ 2 ])) { - trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING); - return; - } - $address_encode = ''; - for ($x = 0, $_length = strlen($address); $x < $_length; $x++) { - if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) { - $address_encode .= '%' . bin2hex($address[ $x ]); - } else { - $address_encode .= $address[ $x ]; - } - } - $text_encode = ''; - for ($x = 0, $_length = strlen($text); $x < $_length; $x++) { - $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';'; - } - $mailto = "mailto:"; - return '' . $text_encode . ''; - } else { - // no encoding - return $string; - } -} diff --git a/include/smarty/libs/plugins/function.math.php b/include/smarty/libs/plugins/function.math.php deleted file mode 100644 index f9cf67fe7..000000000 --- a/include/smarty/libs/plugins/function.math.php +++ /dev/null @@ -1,142 +0,0 @@ - - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @return string|null - */ -function smarty_function_math($params, $template) -{ - static $_allowed_funcs = - array( - 'int' => true, - 'abs' => true, - 'ceil' => true, - 'acos' => true, - 'acosh' => true, - 'cos' => true, - 'cosh' => true, - 'deg2rad' => true, - 'rad2deg' => true, - 'exp' => true, - 'floor' => true, - 'log' => true, - 'log10' => true, - 'max' => true, - 'min' => true, - 'pi' => true, - 'pow' => true, - 'rand' => true, - 'round' => true, - 'asin' => true, - 'asinh' => true, - 'sin' => true, - 'sinh' => true, - 'sqrt' => true, - 'srand' => true, - 'atan' => true, - 'atanh' => true, - 'tan' => true, - 'tanh' => true - ); - - // be sure equation parameter is present - if (empty($params[ 'equation' ])) { - trigger_error("math: missing equation parameter", E_USER_WARNING); - return; - } - $equation = $params[ 'equation' ]; - - // Remove whitespaces - $equation = preg_replace('/\s+/', '', $equation); - - // Adapted from https://www.php.net/manual/en/function.eval.php#107377 - $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number - $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))'; - $operators = '[,+\/*\^%-]'; // Allowed math operators - $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/'; - - if (!preg_match($regexp, $equation)) { - trigger_error("math: illegal characters", E_USER_WARNING); - return; - } - - // make sure parenthesis are balanced - if (substr_count($equation, '(') !== substr_count($equation, ')')) { - trigger_error("math: unbalanced parenthesis", E_USER_WARNING); - return; - } - - // disallow backticks - if (strpos($equation, '`') !== false) { - trigger_error("math: backtick character not allowed in equation", E_USER_WARNING); - return; - } - - // also disallow dollar signs - if (strpos($equation, '$') !== false) { - trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING); - return; - } - foreach ($params as $key => $val) { - if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') { - // make sure value is not empty - if (strlen($val) === 0) { - trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING); - return; - } - if (!is_numeric($val)) { - trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING); - return; - } - } - } - // match all vars in equation, make sure all are passed - preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match); - foreach ($match[ 1 ] as $curr_var) { - if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) { - trigger_error( - "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'", - E_USER_WARNING - ); - return; - } - } - foreach ($params as $key => $val) { - if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') { - $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation); - } - } - $smarty_math_result = null; - eval("\$smarty_math_result = " . $equation . ";"); - - if (empty($params[ 'format' ])) { - if (empty($params[ 'assign' ])) { - return $smarty_math_result; - } else { - $template->assign($params[ 'assign' ], $smarty_math_result); - } - } else { - if (empty($params[ 'assign' ])) { - printf($params[ 'format' ], $smarty_math_result); - } else { - $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result)); - } - } -} diff --git a/include/smarty/libs/plugins/modifier.capitalize.php b/include/smarty/libs/plugins/modifier.capitalize.php deleted file mode 100644 index 2903d61d7..000000000 --- a/include/smarty/libs/plugins/modifier.capitalize.php +++ /dev/null @@ -1,147 +0,0 @@ - - * @author Rodney Rehm - */ -function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false) -{ - $string = (string) $string; - - if (Smarty::$_MBSTRING) { - if ($lc_rest) { - // uppercase (including hyphenated words) - $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET); - } else { - // uppercase word breaks - $upper_string = preg_replace_callback( - "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, - 'smarty_mod_cap_mbconvert_cb', - $string - ); - } - // check uc_digits case - if (!$uc_digits) { - if (preg_match_all( - "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, - $string, - $matches, - PREG_OFFSET_CAPTURE - ) - ) { - foreach ($matches[ 1 ] as $match) { - $upper_string = - substr_replace( - $upper_string, - mb_strtolower($match[ 0 ], Smarty::$_CHARSET), - $match[ 1 ], - strlen($match[ 0 ]) - ); - } - } - } - $upper_string = - preg_replace_callback( - "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, - 'smarty_mod_cap_mbconvert2_cb', - $upper_string - ); - return $upper_string; - } - // lowercase first - if ($lc_rest) { - $string = strtolower($string); - } - // uppercase (including hyphenated words) - $upper_string = - preg_replace_callback( - "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, - 'smarty_mod_cap_ucfirst_cb', - $string - ); - // check uc_digits case - if (!$uc_digits) { - if (preg_match_all( - "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, - $string, - $matches, - PREG_OFFSET_CAPTURE - ) - ) { - foreach ($matches[ 1 ] as $match) { - $upper_string = - substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ])); - } - } - } - $upper_string = preg_replace_callback( - "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, - 'smarty_mod_cap_ucfirst2_cb', - $upper_string - ); - return $upper_string; -} - -/** - * - * Bug: create_function() use exhausts memory when used in long loops - * Fix: use declared functions for callbacks instead of using create_function() - * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3 - * - * @author Kyle Renfrow - */ -/** - * @param $matches - * - * @return string - */ -function smarty_mod_cap_mbconvert_cb($matches) -{ - return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET); -} - -/** - * @param $matches - * - * @return string - */ -function smarty_mod_cap_mbconvert2_cb($matches) -{ - return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET); -} - -/** - * @param $matches - * - * @return string - */ -function smarty_mod_cap_ucfirst_cb($matches) -{ - return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ])); -} - -/** - * @param $matches - * - * @return string - */ -function smarty_mod_cap_ucfirst2_cb($matches) -{ - return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ])); -} diff --git a/include/smarty/libs/plugins/modifier.count.php b/include/smarty/libs/plugins/modifier.count.php deleted file mode 100644 index ca35fc115..000000000 --- a/include/smarty/libs/plugins/modifier.count.php +++ /dev/null @@ -1,36 +0,0 @@ - Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface, - * > 1 would be returned, unless value was null, in which case 0 would be returned. - */ - - if ($arrayOrObject instanceof Countable || is_array($arrayOrObject)) { - return count($arrayOrObject, (int) $mode); - } elseif ($arrayOrObject === null) { - return 0; - } - return 1; -} diff --git a/include/smarty/libs/plugins/modifier.date_format.php b/include/smarty/libs/plugins/modifier.date_format.php deleted file mode 100644 index e3589fd07..000000000 --- a/include/smarty/libs/plugins/modifier.date_format.php +++ /dev/null @@ -1,86 +0,0 @@ - - * - * @param string $string input date string - * @param string $format strftime format for output - * @param string $default_date default date if $string is empty - * @param string $formatter either 'strftime' or 'auto' - * - * @return string |void - * @uses smarty_make_timestamp() - */ -function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto') -{ - if ($format === null) { - $format = Smarty::$_DATE_FORMAT; - } - /** - * require_once the {@link shared.make_timestamp.php} plugin - */ - static $is_loaded = false; - if (!$is_loaded) { - if (!is_callable('smarty_make_timestamp')) { - include_once SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'; - } - $is_loaded = true; - } - if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') { - $timestamp = smarty_make_timestamp($string); - } elseif (!empty($default_date)) { - $timestamp = smarty_make_timestamp($default_date); - } else { - return; - } - if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) { - if (Smarty::$_IS_WINDOWS) { - $_win_from = array( - '%D', - '%h', - '%n', - '%r', - '%R', - '%t', - '%T' - ); - $_win_to = array( - '%m/%d/%y', - '%b', - "\n", - '%I:%M:%S %p', - '%H:%M', - "\t", - '%H:%M:%S' - ); - if (strpos($format, '%e') !== false) { - $_win_from[] = '%e'; - $_win_to[] = sprintf('%\' 2d', date('j', $timestamp)); - } - if (strpos($format, '%l') !== false) { - $_win_from[] = '%l'; - $_win_to[] = sprintf('%\' 2d', date('h', $timestamp)); - } - $format = str_replace($_win_from, $_win_to, $format); - } - // @ to suppress deprecation errors when running in PHP8.1 or higher. - return @strftime($format, $timestamp); - } else { - return date($format, $timestamp); - } -} diff --git a/include/smarty/libs/plugins/modifier.debug_print_var.php b/include/smarty/libs/plugins/modifier.debug_print_var.php deleted file mode 100644 index 78397d017..000000000 --- a/include/smarty/libs/plugins/modifier.debug_print_var.php +++ /dev/null @@ -1,103 +0,0 @@ - - * - * @param array|object $var variable to be formatted - * @param int $max maximum recursion depth if $var is an array or object - * @param int $length maximum string length if $var is a string - * @param int $depth actual recursion depth - * @param array $objects processed objects in actual depth to prevent recursive object processing - * - * @return string - */ -function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array()) -{ - $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t'); - switch (gettype($var)) { - case 'array': - $results = 'Array (' . count($var) . ')'; - if ($depth === $max) { - break; - } - foreach ($var as $curr_key => $curr_val) { - $results .= '
    ' . str_repeat(' ', $depth * 2) . '' . strtr($curr_key, $_replace) . - ' => ' . - smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects); - $depth--; - } - break; - case 'object': - $object_vars = get_object_vars($var); - $results = '' . get_class($var) . ' Object (' . count($object_vars) . ')'; - if (in_array($var, $objects)) { - $results .= ' called recursive'; - break; - } - if ($depth === $max) { - break; - } - $objects[] = $var; - foreach ($object_vars as $curr_key => $curr_val) { - $results .= '
    ' . str_repeat(' ', $depth * 2) . ' ->' . strtr($curr_key, $_replace) . - ' = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects); - $depth--; - } - break; - case 'boolean': - case 'NULL': - case 'resource': - if (true === $var) { - $results = 'true'; - } elseif (false === $var) { - $results = 'false'; - } elseif (null === $var) { - $results = 'null'; - } else { - $results = htmlspecialchars((string)$var); - } - $results = '' . $results . ''; - break; - case 'integer': - case 'float': - $results = htmlspecialchars((string)$var); - break; - case 'string': - $results = strtr($var, $_replace); - if (Smarty::$_MBSTRING) { - if (mb_strlen($var, Smarty::$_CHARSET) > $length) { - $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...'; - } - } else { - if (isset($var[ $length ])) { - $results = substr($var, 0, $length - 3) . '...'; - } - } - $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET); - break; - case 'unknown type': - default: - $results = strtr((string)$var, $_replace); - if (Smarty::$_MBSTRING) { - if (mb_strlen($results, Smarty::$_CHARSET) > $length) { - $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...'; - } - } else { - if (strlen($results) > $length) { - $results = substr($results, 0, $length - 3) . '...'; - } - } - $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET); - } - return $results; -} diff --git a/include/smarty/libs/plugins/modifier.escape.php b/include/smarty/libs/plugins/modifier.escape.php deleted file mode 100644 index e168679c3..000000000 --- a/include/smarty/libs/plugins/modifier.escape.php +++ /dev/null @@ -1,189 +0,0 @@ - - * - * @param string $string input string - * @param string $esc_type escape type - * @param string $char_set character set, used for htmlspecialchars() or htmlentities() - * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities() - * - * @return string escaped input string - */ -function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true) -{ - static $is_loaded_1 = false; - static $is_loaded_2 = false; - if (!$char_set) { - $char_set = Smarty::$_CHARSET; - } - - $string = (string)$string; - - switch ($esc_type) { - case 'html': - return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode); - // no break - case 'htmlall': - if (Smarty::$_MBSTRING) { - $string = mb_convert_encoding($string, 'UTF-8', $char_set); - return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode); - } - // no MBString fallback - return htmlentities($string, ENT_QUOTES, $char_set, $double_encode); - // no break - case 'url': - return rawurlencode($string); - case 'urlpathinfo': - return str_replace('%2F', '/', rawurlencode($string)); - case 'quotes': - // escape unescaped single quotes - return preg_replace("%(? '\\\\', - "'" => "\\'", - '"' => '\\"', - "\r" => '\\r', - "\n" => '\\n', - ' '<\/', - // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements - '#is', - $source, - $matches, - PREG_OFFSET_CAPTURE | PREG_SET_ORDER - ) - ) { - foreach ($matches as $match) { - $store[] = $match[ 0 ][ 0 ]; - $_length = strlen($match[ 0 ][ 0 ]); - $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@'; - $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length); - $_offset += $_length - strlen($replace); - $_store++; - } - } - // Strip all HTML-Comments - // yes, even the ones in '; + } elseif ($encode === 'javascript_charcode') { + for ($x = 0, $_length = strlen($string); $x < $_length; $x++) { + $ord[] = ord($string[$x]); + } + return ''; + } elseif ($encode === 'hex') { + preg_match('!^(.*)(\?.*)$!', $address, $match); + if (!empty($match[2])) { + trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING); + return; + } + $address_encode = ''; + for ($x = 0, $_length = strlen($address); $x < $_length; $x++) { + if (preg_match('!\w!' . \Smarty\Smarty::$_UTF8_MODIFIER, $address[$x])) { + $address_encode .= '%' . bin2hex($address[$x]); + } else { + $address_encode .= $address[$x]; + } + } + $text_encode = ''; + for ($x = 0, $_length = strlen($text); $x < $_length; $x++) { + $text_encode .= '&#x' . bin2hex($text[$x]) . ';'; + } + $mailto = "mailto:"; + return '' . $text_encode . ''; + } else { + // no encoding + return $string; + } + } +} diff --git a/include/smarty/src/FunctionHandler/Math.php b/include/smarty/src/FunctionHandler/Math.php new file mode 100644 index 000000000..23ef9253d --- /dev/null +++ b/include/smarty/src/FunctionHandler/Math.php @@ -0,0 +1,140 @@ + + * + * @param array $params parameters + * @param Template $template template object + * + * @return string|null + */ +class Math extends Base { + + public function handle($params, Template $template) { + static $_allowed_funcs = + [ + 'int' => true, + 'abs' => true, + 'ceil' => true, + 'acos' => true, + 'acosh' => true, + 'cos' => true, + 'cosh' => true, + 'deg2rad' => true, + 'rad2deg' => true, + 'exp' => true, + 'floor' => true, + 'log' => true, + 'log10' => true, + 'max' => true, + 'min' => true, + 'pi' => true, + 'pow' => true, + 'rand' => true, + 'round' => true, + 'asin' => true, + 'asinh' => true, + 'sin' => true, + 'sinh' => true, + 'sqrt' => true, + 'srand' => true, + 'atan' => true, + 'atanh' => true, + 'tan' => true, + 'tanh' => true + ]; + + // be sure equation parameter is present + if (empty($params['equation'])) { + trigger_error("math: missing equation parameter", E_USER_WARNING); + return; + } + $equation = $params['equation']; + + // Remove whitespaces + $equation = preg_replace('/\s+/', '', $equation); + + // Adapted from https://www.php.net/manual/en/function.eval.php#107377 + $number = '-?(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number + $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))'; + $operators = '[,+\/*\^%-]'; // Allowed math operators + $regexp = '/^((' . $number . '|' . $functionsOrVars . '|(' . $functionsOrVars . '\s*\((?1)*\)|\((?1)*\)))(?:' . $operators . '(?1))?)+$/'; + + if (!preg_match($regexp, $equation)) { + trigger_error("math: illegal characters", E_USER_WARNING); + return; + } + + // make sure parenthesis are balanced + if (substr_count($equation, '(') !== substr_count($equation, ')')) { + trigger_error("math: unbalanced parenthesis", E_USER_WARNING); + return; + } + + // disallow backticks + if (strpos($equation, '`') !== false) { + trigger_error("math: backtick character not allowed in equation", E_USER_WARNING); + return; + } + + // also disallow dollar signs + if (strpos($equation, '$') !== false) { + trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING); + return; + } + foreach ($params as $key => $val) { + if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') { + // make sure value is not empty + if (strlen($val) === 0) { + trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING); + return; + } + if (!is_numeric($val)) { + trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING); + return; + } + } + } + // match all vars in equation, make sure all are passed + preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match); + foreach ($match[1] as $curr_var) { + if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) { + trigger_error( + "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'", + E_USER_WARNING + ); + return; + } + } + foreach ($params as $key => $val) { + if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') { + $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation); + } + } + $smarty_math_result = null; + eval("\$smarty_math_result = " . $equation . ";"); + + if (empty($params['format'])) { + if (empty($params['assign'])) { + return $smarty_math_result; + } else { + $template->assign($params['assign'], $smarty_math_result); + } + } else { + if (empty($params['assign'])) { + printf($params['format'], $smarty_math_result); + } else { + $template->assign($params['assign'], sprintf($params['format'], $smarty_math_result)); + } + } + } +} diff --git a/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/include/smarty/src/Lexer/ConfigfileLexer.php similarity index 57% rename from include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php rename to include/smarty/src/Lexer/ConfigfileLexer.php index afb3efcb0..d592c8238 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php +++ b/include/smarty/src/Lexer/ConfigfileLexer.php @@ -1,111 +1,117 @@ 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE' - ); + public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'); + + /** + * storage for assembled token patterns + * + * @var string + */ + private $yy_global_pattern1 = null; + private $yy_global_pattern2 = null; + private $yy_global_pattern3 = null; + private $yy_global_pattern4 = null; + private $yy_global_pattern5 = null; + private $yy_global_pattern6 = null; /** * token names @@ -115,54 +121,19 @@ class Smarty_Internal_Configfilelexer public $smarty_token_names = array( // Text for parser error messages ); - /** - * compiler object - * - * @var Smarty_Internal_Config_File_Compiler - */ - private $compiler = null; - - /** - * copy of config_booleanize - * - * @var bool - */ - private $configBooleanize = false; - - /** - * storage for assembled token patterns - * - * @var string - */ - private $yy_global_pattern1 = null; - - private $yy_global_pattern2 = null; - - private $yy_global_pattern3 = null; - - private $yy_global_pattern4 = null; - - private $yy_global_pattern5 = null; - - private $yy_global_pattern6 = null; - - private $_yy_state = 1; - - private $_yy_stack = array(); - /** * constructor * * @param string $data template source - * @param Smarty_Internal_Config_File_Compiler $compiler + * @param \Smarty\Compiler\Configfile $compiler */ - public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler) + public function __construct($data, \Smarty\Compiler\Configfile $compiler) { $this->data = $data . "\n"; //now all lines are \n-terminated $this->dataLength = strlen($data); $this->counter = 0; if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) { - $this->counter += strlen($match[ 0 ]); + $this->counter += strlen($match[0]); } $this->line = 1; $this->compiler = $compiler; @@ -170,10 +141,9 @@ class Smarty_Internal_Configfilelexer $this->configBooleanize = $this->smarty->config_booleanize; } - public function replace($input) - { + public function replace ($input) { return $input; - } // end function + } public function PrintTrace() { @@ -181,6 +151,11 @@ class Smarty_Internal_Configfilelexer $this->yyTracePrompt = '
    '; } + + + private $_yy_state = 1; + private $_yy_stack = array(); + public function yylex() { return $this->{'yylex' . $this->_yy_state}(); @@ -189,85 +164,61 @@ class Smarty_Internal_Configfilelexer public function yypushstate($state) { if ($this->yyTraceFILE) { - fprintf( - $this->yyTraceFILE, - "%sState push %s\n", - $this->yyTracePrompt, - isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state - ); + fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf( - $this->yyTraceFILE, - "%snew State %s\n", - $this->yyTracePrompt, - isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state - ); + fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } } public function yypopstate() { - if ($this->yyTraceFILE) { - fprintf( - $this->yyTraceFILE, - "%sState pop %s\n", - $this->yyTracePrompt, - isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state - ); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } - $this->_yy_state = array_pop($this->_yy_stack); + $this->_yy_state = array_pop($this->_yy_stack); if ($this->yyTraceFILE) { - fprintf( - $this->yyTraceFILE, - "%snew State %s\n", - $this->yyTracePrompt, - isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state - ); + fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } + } public function yybegin($state) { - $this->_yy_state = $state; + $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf( - $this->yyTraceFILE, - "%sState set %s\n", - $this->yyTracePrompt, - isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state - ); + fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } } + + + public function yylex1() { if (!isset($this->yy_global_pattern1)) { - $this->yy_global_pattern1 = - $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS"); + $this->yy_global_pattern1 = $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); } - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } + do { - if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) { - if (!isset($yymatches[ 0 ][ 1 ])) { - $yymatches = preg_grep("/(.|\s)+/", $yymatches); + if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) { + if (!isset($yymatches[ 0 ][1])) { + $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr( - $this->data, - $this->counter, - 5 - ) . '... state START'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state START'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -285,89 +236,91 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[ $this->counter ]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } - public function yy_r1_1() - { - $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; - $this->yypushstate(self::COMMENT); - } - - public function yy_r1_2() - { - $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; - $this->yypushstate(self::SECTION); - } - - public function yy_r1_3() - { - $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; - } - - public function yy_r1_4() - { - $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; - $this->yypushstate(self::VALUE); } // end function + + const START = 1; + public function yy_r1_1() + { + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART; + $this->yypushstate(self::COMMENT); + } + public function yy_r1_2() + { + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB; + $this->yypushstate(self::SECTION); + } + public function yy_r1_3() + { + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB; + } + public function yy_r1_4() + { + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL; + $this->yypushstate(self::VALUE); + } public function yy_r1_5() { - return false; - } + return false; + } public function yy_r1_6() { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE; + } public function yy_r1_7() { - $this->token = Smarty_Internal_Configfileparser::TPC_ID; - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID; + } public function yy_r1_8() { - $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER; } + + public function yylex2() { if (!isset($this->yy_global_pattern2)) { - $this->yy_global_pattern2 = - $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS"); + $this->yy_global_pattern2 = $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); } - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } + do { - if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) { - if (!isset($yymatches[ 0 ][ 1 ])) { - $yymatches = preg_grep("/(.|\s)+/", $yymatches); + if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) { + if (!isset($yymatches[ 0 ][1])) { + $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr( - $this->data, - $this->counter, - 5 - ) . '... state VALUE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -385,80 +338,84 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[ $this->counter ]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } + } // end function + + + const VALUE = 2; public function yy_r2_1() { - return false; - } + return false; + } public function yy_r2_2() { - $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; - $this->yypopstate(); - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT; + $this->yypopstate(); + } public function yy_r2_3() { - $this->token = Smarty_Internal_Configfileparser::TPC_INT; - $this->yypopstate(); - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT; + $this->yypopstate(); + } public function yy_r2_4() { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; - $this->yypushstate(self::TRIPPLE); - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES; + $this->yypushstate(self::TRIPPLE); + } public function yy_r2_5() { - $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; - $this->yypopstate(); - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING; + $this->yypopstate(); + } public function yy_r2_6() { - $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; - $this->yypopstate(); - } // end function + $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING; + $this->yypopstate(); + } public function yy_r2_7() { - if (!$this->configBooleanize || - !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no'))) { - $this->yypopstate(); - $this->yypushstate(self::NAKED_STRING_VALUE); - return true; //reprocess in new state - } else { - $this->token = Smarty_Internal_Configfileparser::TPC_BOOL; - $this->yypopstate(); - } - } + if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) { + $this->yypopstate(); + $this->yypushstate(self::NAKED_STRING_VALUE); + return true; //reprocess in new state + } else { + $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL; + $this->yypopstate(); + } + } public function yy_r2_8() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->yypopstate(); - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; + $this->yypopstate(); + } public function yy_r2_9() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->value = ''; - $this->yypopstate(); - } // end function + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; + $this->value = ''; + $this->yypopstate(); + } + + public function yylex3() { @@ -468,23 +425,21 @@ class Smarty_Internal_Configfilelexer if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); } - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } + do { - if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) { - if (!isset($yymatches[ 0 ][ 1 ])) { - $yymatches = preg_grep("/(.|\s)+/", $yymatches); + if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) { + if (!isset($yymatches[ 0 ][1])) { + $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr( - $this->data, - $this->counter, - 5 - ) . '... state NAKED_STRING_VALUE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state NAKED_STRING_VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -502,26 +457,31 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[ $this->counter ]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } + } // end function + + + const NAKED_STRING_VALUE = 3; public function yy_r3_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->yypopstate(); + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; + $this->yypopstate(); } + + public function yylex4() { if (!isset($this->yy_global_pattern4)) { @@ -530,23 +490,21 @@ class Smarty_Internal_Configfilelexer if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); } - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } + do { - if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) { - if (!isset($yymatches[ 0 ][ 1 ])) { - $yymatches = preg_grep("/(.|\s)+/", $yymatches); + if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) { + if (!isset($yymatches[ 0 ][1])) { + $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr( - $this->data, - $this->counter, - 5 - ) . '... state COMMENT'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state COMMENT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -564,36 +522,41 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[ $this->counter ]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } - public function yy_r4_1() - { - return false; - } - - public function yy_r4_2() - { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; } // end function + + const COMMENT = 4; + public function yy_r4_1() + { + + return false; + } + public function yy_r4_2() + { + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; + } public function yy_r4_3() { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; - $this->yypopstate(); + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE; + $this->yypopstate(); } + + public function yylex5() { if (!isset($this->yy_global_pattern5)) { @@ -602,23 +565,21 @@ class Smarty_Internal_Configfilelexer if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); } - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } + do { - if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) { - if (!isset($yymatches[ 0 ][ 1 ])) { - $yymatches = preg_grep("/(.|\s)+/", $yymatches); + if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) { + if (!isset($yymatches[ 0 ][1])) { + $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr( - $this->data, - $this->counter, - 5 - ) . '... state SECTION'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state SECTION'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -636,30 +597,34 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[ $this->counter ]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } + } // end function + + + const SECTION = 5; public function yy_r5_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_DOT; - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT; + } public function yy_r5_2() { - $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; - $this->yypopstate(); - } // end function + + $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION; + $this->yypopstate(); + } + public function yylex6() { @@ -669,23 +634,21 @@ class Smarty_Internal_Configfilelexer if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); } - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } + do { - if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, 0, $this->counter)) { - if (!isset($yymatches[ 0 ][ 1 ])) { - $yymatches = preg_grep("/(.|\s)+/", $yymatches); + if (preg_match($this->yy_global_pattern6,$this->data, $yymatches, 0, $this->counter)) { + if (!isset($yymatches[ 0 ][1])) { + $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr( - $this->data, - $this->counter, - 5 - ) . '... state TRIPPLE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state TRIPPLE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -703,37 +666,42 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= $this->dataLength) { + if ($this->counter >= $this->dataLength) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[ $this->counter ]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } + } // end function + + + const TRIPPLE = 6; public function yy_r6_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; - $this->yypopstate(); - $this->yypushstate(self::START); - } + $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END; + $this->yypopstate(); + $this->yypushstate(self::START); + } public function yy_r6_2() { - $to = strlen($this->data); - preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[ 0 ][ 1 ])) { - $to = $match[ 0 ][ 1 ]; - } else { - $this->compiler->trigger_config_file_error('missing or misspelled literal closing tag'); - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; + + $to = strlen($this->data); + preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } else { + $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag'); + } + $this->value = substr($this->data,$this->counter,$to-$this->counter); + $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT; } + + } diff --git a/include/smarty/lexer/smarty_internal_configfilelexer.plex b/include/smarty/src/Lexer/ConfigfileLexer.plex similarity index 73% rename from include/smarty/lexer/smarty_internal_configfilelexer.plex rename to include/smarty/src/Lexer/ConfigfileLexer.plex index 7a86fadc4..a895050c4 100644 --- a/include/smarty/lexer/smarty_internal_configfilelexer.plex +++ b/include/smarty/src/Lexer/ConfigfileLexer.plex @@ -1,6 +1,9 @@ data = $data . "\n"; //now all lines are \n-terminated $this->dataLength = strlen($data); @@ -179,31 +182,31 @@ naked_string = /[^\n]+?(?=[ \t\r]*\n)/ %statename START commentstart { - $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART; $this->yypushstate(self::COMMENT); } openB { - $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB; $this->yypushstate(self::SECTION); } closeB { - $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB; } equal { - $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL; $this->yypushstate(self::VALUE); } whitespace { return false; } newline { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE; } id { - $this->token = Smarty_Internal_Configfileparser::TPC_ID; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID; } text { - $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER; } */ @@ -215,23 +218,23 @@ whitespace { return false; } float { - $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT; $this->yypopstate(); } int { - $this->token = Smarty_Internal_Configfileparser::TPC_INT; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT; $this->yypopstate(); } tripple_quotes { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES; $this->yypushstate(self::TRIPPLE); } single_quoted_string { - $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING; $this->yypopstate(); } double_quoted_string { - $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING; $this->yypopstate(); } maybe_bool { @@ -240,16 +243,16 @@ maybe_bool { $this->yypushstate(self::NAKED_STRING_VALUE); return true; //reprocess in new state } else { - $this->token = Smarty_Internal_Configfileparser::TPC_BOOL; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL; $this->yypopstate(); } } naked_string { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; $this->yypopstate(); } newline { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; $this->value = ''; $this->yypopstate(); } @@ -260,7 +263,7 @@ newline { %statename NAKED_STRING_VALUE naked_string { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; $this->yypopstate(); } @@ -273,10 +276,10 @@ whitespace { return false; } naked_string { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING; } newline { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE; $this->yypopstate(); } @@ -286,10 +289,10 @@ newline { %statename SECTION dot { - $this->token = Smarty_Internal_Configfileparser::TPC_DOT; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT; } section { - $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION; $this->yypopstate(); } @@ -298,7 +301,7 @@ section { %statename TRIPPLE tripple_quotes_end { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END; $this->yypopstate(); $this->yypushstate(self::START); } @@ -311,7 +314,7 @@ text { $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag'); } $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; + $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT; } */ diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/include/smarty/src/Lexer/TemplateLexer.php similarity index 79% rename from include/smarty/libs/sysplugins/smarty_internal_templatelexer.php rename to include/smarty/src/Lexer/TemplateLexer.php index 5ca482058..2e7f33055 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php +++ b/include/smarty/src/Lexer/TemplateLexer.php @@ -1,4 +1,7 @@ */ -class Smarty_Internal_Templatelexer +class TemplateLexer { /** * Source @@ -67,13 +70,6 @@ class Smarty_Internal_Templatelexer */ public $taglineno; - /** - * php code type - * - * @var string - */ - public $phpType = ''; - /** * state number * @@ -91,7 +87,7 @@ class Smarty_Internal_Templatelexer /** * compiler object * - * @var Smarty_Internal_TemplateCompilerBase + * @var \Smarty\Compiler\Template */ public $compiler = null; @@ -161,7 +157,6 @@ class Smarty_Internal_Templatelexer 'COMMENT' => 'comment', 'AS' => 'as', 'TO' => 'to', - 'PHP' => '" '"<", "==" ... logical operator', 'TLOGOP' => '"lt", "eq" ... logical operator; "is div by" ... if condition', 'SCOND' => '"is even" ... if condition', @@ -227,9 +222,9 @@ class Smarty_Internal_Templatelexer * constructor * * @param string $source template source - * @param Smarty_Internal_TemplateCompilerBase $compiler + * @param \Smarty\Compiler\Template $compiler */ - public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler) + public function __construct($source, \Smarty\Compiler\Template $compiler) { $this->data = $source; $this->dataLength = strlen($this->data); @@ -238,7 +233,7 @@ class Smarty_Internal_Templatelexer $this->counter += strlen($match[0]); } $this->line = 1; - $this->smarty = $compiler->template->smarty; + $this->smarty = $compiler->getTemplate()->getSmarty(); $this->compiler = $compiler; $this->compiler->initDelimiterPreg(); $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter(); @@ -380,7 +375,7 @@ class Smarty_Internal_Templatelexer public function yy_r1_1() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r1_2() { @@ -398,18 +393,18 @@ class Smarty_Internal_Templatelexer public function yy_r1_4() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r1_6() { - $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERALSTART; $this->yypushstate(self::LITERAL); } public function yy_r1_8() { - $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND; $this->yypushstate(self::LITERAL); } public function yy_r1_10() @@ -430,14 +425,14 @@ class Smarty_Internal_Templatelexer $to = $match[0][1]; } $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yylex2() { if (!isset($this->yy_global_pattern2)) { - $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS"); + $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -493,84 +488,77 @@ class Smarty_Internal_Templatelexer public function yy_r2_1() { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELIF; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } public function yy_r2_4() { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOR; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } public function yy_r2_6() { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOREACH; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } public function yy_r2_8() { - $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELSETFILTER; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } public function yy_r2_10() - { - - $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE; - $this->yybegin(self::TAGBODY); - $this->taglineno = $this->line; - } - public function yy_r2_12() { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG; + $this->token = \Smarty\Parser\TemplateParser::TP_SIMPLETAG; $this->taglineno = $this->line; } - public function yy_r2_15() + public function yy_r2_13() { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; + $this->token = \Smarty\Parser\TemplateParser::TP_SMARTYBLOCKCHILDPARENT; $this->taglineno = $this->line; } + public function yy_r2_16() + { + + $this->yypopstate(); + $this->token = \Smarty\Parser\TemplateParser::TP_CLOSETAG; + $this->taglineno = $this->line; + } public function yy_r2_18() - { - - $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG; - $this->taglineno = $this->line; - } - public function yy_r2_20() { if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT; + $this->token = \Smarty\Parser\TemplateParser::TP_SIMPELOUTPUT; $this->taglineno = $this->line; } else { $this->value = $this->smarty->getLeftDelimiter(); - $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_LDEL; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } } - public function yy_r2_23() + public function yy_r2_21() { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELSLASH; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - public function yy_r2_25() + public function yy_r2_23() { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_LDEL; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } @@ -579,7 +567,7 @@ class Smarty_Internal_Templatelexer public function yylex3() { if (!isset($this->yy_global_pattern3)) { - $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS"); + $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+(not\\s+)?in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -635,7 +623,7 @@ class Smarty_Internal_Templatelexer public function yy_r3_1() { - $this->token = Smarty_Internal_Templateparser::TP_RDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_RDEL; $this->yypopstate(); } public function yy_r3_2() @@ -647,227 +635,227 @@ class Smarty_Internal_Templatelexer public function yy_r3_4() { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE; $this->yypushstate(self::DOUBLEQUOTEDSTRING); $this->compiler->enterDoubleQuote(); } public function yy_r3_5() { - $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; + $this->token = \Smarty\Parser\TemplateParser::TP_SINGLEQUOTESTRING; } public function yy_r3_6() { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; + $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID; } public function yy_r3_7() { - $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; + $this->token = \Smarty\Parser\TemplateParser::TP_DOLLAR; } public function yy_r3_8() { - $this->token = Smarty_Internal_Templateparser::TP_ISIN; - } - public function yy_r3_9() - { - - $this->token = Smarty_Internal_Templateparser::TP_AS; + $this->token = \Smarty\Parser\TemplateParser::TP_ISIN; } public function yy_r3_10() { - $this->token = Smarty_Internal_Templateparser::TP_TO; + $this->token = \Smarty\Parser\TemplateParser::TP_AS; } public function yy_r3_11() { - $this->token = Smarty_Internal_Templateparser::TP_STEP; + $this->token = \Smarty\Parser\TemplateParser::TP_TO; } public function yy_r3_12() { - $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; + $this->token = \Smarty\Parser\TemplateParser::TP_STEP; } public function yy_r3_13() { - $this->token = Smarty_Internal_Templateparser::TP_LOGOP; + $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF; } - public function yy_r3_15() + public function yy_r3_14() { - $this->token = Smarty_Internal_Templateparser::TP_SLOGOP; + $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP; } - public function yy_r3_17() + public function yy_r3_16() { - $this->token = Smarty_Internal_Templateparser::TP_TLOGOP; + $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP; } - public function yy_r3_20() + public function yy_r3_18() { - $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND; + $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP; } - public function yy_r3_23() + public function yy_r3_21() { - $this->token = Smarty_Internal_Templateparser::TP_NOT; + $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND; } public function yy_r3_24() { - $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; + $this->token = \Smarty\Parser\TemplateParser::TP_NOT; } - public function yy_r3_28() + public function yy_r3_25() { - $this->token = Smarty_Internal_Templateparser::TP_OPENP; + $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST; } public function yy_r3_29() { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; + $this->token = \Smarty\Parser\TemplateParser::TP_OPENP; } public function yy_r3_30() { - $this->token = Smarty_Internal_Templateparser::TP_OPENB; + $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP; } public function yy_r3_31() { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; + $this->token = \Smarty\Parser\TemplateParser::TP_OPENB; } public function yy_r3_32() { - $this->token = Smarty_Internal_Templateparser::TP_PTR; + $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB; } public function yy_r3_33() { - $this->token = Smarty_Internal_Templateparser::TP_APTR; + $this->token = \Smarty\Parser\TemplateParser::TP_PTR; } public function yy_r3_34() { - $this->token = Smarty_Internal_Templateparser::TP_EQUAL; + $this->token = \Smarty\Parser\TemplateParser::TP_APTR; } public function yy_r3_35() { - $this->token = Smarty_Internal_Templateparser::TP_INCDEC; + $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL; } - public function yy_r3_37() + public function yy_r3_36() { - $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; + $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC; } - public function yy_r3_39() + public function yy_r3_38() { - $this->token = Smarty_Internal_Templateparser::TP_MATH; + $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH; } - public function yy_r3_41() + public function yy_r3_40() { - $this->token = Smarty_Internal_Templateparser::TP_AT; + $this->token = \Smarty\Parser\TemplateParser::TP_MATH; } public function yy_r3_42() { - $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN; + $this->token = \Smarty\Parser\TemplateParser::TP_AT; } public function yy_r3_43() { - $this->token = Smarty_Internal_Templateparser::TP_HATCH; + $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN; } public function yy_r3_44() + { + + $this->token = \Smarty\Parser\TemplateParser::TP_HATCH; + } + public function yy_r3_45() { // resolve conflicts with shorttag and right_delimiter starting with '=' if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) { preg_match('/\s+/',$this->value,$match); $this->value = $match[0]; - $this->token = Smarty_Internal_Templateparser::TP_SPACE; + $this->token = \Smarty\Parser\TemplateParser::TP_SPACE; } else { - $this->token = Smarty_Internal_Templateparser::TP_ATTR; + $this->token = \Smarty\Parser\TemplateParser::TP_ATTR; } } - public function yy_r3_45() + public function yy_r3_46() { - $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE; - } - public function yy_r3_48() - { - - $this->token = Smarty_Internal_Templateparser::TP_ID; + $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE; } public function yy_r3_49() { - $this->token = Smarty_Internal_Templateparser::TP_INTEGER; + $this->token = \Smarty\Parser\TemplateParser::TP_ID; } public function yy_r3_50() { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; - $this->yypopstate(); + $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER; } public function yy_r3_51() { - $this->token = Smarty_Internal_Templateparser::TP_VERT; + $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK; + $this->yypopstate(); } public function yy_r3_52() { - $this->token = Smarty_Internal_Templateparser::TP_DOT; + $this->token = \Smarty\Parser\TemplateParser::TP_VERT; } public function yy_r3_53() { - $this->token = Smarty_Internal_Templateparser::TP_COMMA; + $this->token = \Smarty\Parser\TemplateParser::TP_DOT; } public function yy_r3_54() { - $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; + $this->token = \Smarty\Parser\TemplateParser::TP_COMMA; } public function yy_r3_55() { - $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; + $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON; } public function yy_r3_56() { - $this->token = Smarty_Internal_Templateparser::TP_COLON; + $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON; } public function yy_r3_57() { - $this->token = Smarty_Internal_Templateparser::TP_QMARK; + $this->token = \Smarty\Parser\TemplateParser::TP_COLON; } public function yy_r3_58() { - $this->token = Smarty_Internal_Templateparser::TP_HEX; + $this->token = \Smarty\Parser\TemplateParser::TP_QMARK; } public function yy_r3_59() { - $this->token = Smarty_Internal_Templateparser::TP_SPACE; + $this->token = \Smarty\Parser\TemplateParser::TP_HEX; } public function yy_r3_60() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_SPACE; + } + public function yy_r3_61() + { + + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } @@ -932,16 +920,16 @@ class Smarty_Internal_Templatelexer { $this->literal_cnt++; - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL; } public function yy_r4_3() { if ($this->literal_cnt) { $this->literal_cnt--; - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL; } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND; $this->yypopstate(); } } @@ -959,7 +947,7 @@ class Smarty_Internal_Templatelexer $this->compiler->trigger_template_error ("missing or misspelled literal closing tag"); } $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL; } @@ -1022,17 +1010,17 @@ class Smarty_Internal_Templatelexer public function yy_r5_1() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r5_3() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r5_5() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r5_7() { @@ -1049,20 +1037,20 @@ class Smarty_Internal_Templatelexer public function yy_r5_11() { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_LDEL; $this->taglineno = $this->line; $this->yypushstate(self::TAGBODY); } public function yy_r5_13() { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE; $this->yypopstate(); } public function yy_r5_14() { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK; $this->value = substr($this->value,0,-1); $this->yypushstate(self::TAGBODY); $this->taglineno = $this->line; @@ -1070,24 +1058,24 @@ class Smarty_Internal_Templatelexer public function yy_r5_15() { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; + $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID; } public function yy_r5_16() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r5_17() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } public function yy_r5_22() { $to = $this->dataLength; $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } } diff --git a/include/smarty/lexer/smarty_internal_templatelexer.plex b/include/smarty/src/Lexer/TemplateLexer.plex similarity index 72% rename from include/smarty/lexer/smarty_internal_templatelexer.plex rename to include/smarty/src/Lexer/TemplateLexer.plex index 2cd46df97..282a99cf9 100644 --- a/include/smarty/lexer/smarty_internal_templatelexer.plex +++ b/include/smarty/src/Lexer/TemplateLexer.plex @@ -1,4 +1,7 @@ */ -class Smarty_Internal_Templatelexer +class TemplateLexer { /** * Source @@ -67,13 +70,6 @@ class Smarty_Internal_Templatelexer */ public $taglineno; - /** - * php code type - * - * @var string - */ - public $phpType = ''; - /** * state number * @@ -91,7 +87,7 @@ class Smarty_Internal_Templatelexer /** * compiler object * - * @var Smarty_Internal_TemplateCompilerBase + * @var \Smarty\Compiler\Template */ public $compiler = null; @@ -226,9 +222,9 @@ class Smarty_Internal_Templatelexer * constructor * * @param string $source template source - * @param Smarty_Internal_TemplateCompilerBase $compiler + * @param \Smarty\Compiler\Template $compiler */ - public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler) + public function __construct($source, \Smarty\Compiler\Template $compiler) { $this->data = $source; $this->dataLength = strlen($this->data); @@ -237,7 +233,7 @@ class Smarty_Internal_Templatelexer $this->counter += strlen($match[0]); } $this->line = 1; - $this->smarty = $compiler->template->smarty; + $this->smarty = $compiler->getTemplate()->getSmarty(); $this->compiler = $compiler; $this->compiler->initDelimiterPreg(); $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter(); @@ -328,13 +324,12 @@ class Smarty_Internal_Templatelexer slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~ tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~ scond = ~\s+is\s+(not\s+)?(odd|even)~ - isin = ~\s+is\s+in\s+~ + isin = ~\s+is\s+(not\s+)?in\s+~ as = ~\s+as\s+~ to = ~\s+to\s+~ step = ~\s+step\s+~ if = ~(if|elseif|else if|while)\s+~ for = ~for\s+~ - makenocache = ~make_nocache\s+~ array = ~array~ foreach = ~foreach(?![^\s])~ setfilter = ~setfilter\s+~ @@ -346,7 +341,7 @@ class Smarty_Internal_Templatelexer /*!lex2php %statename TEXT emptyjava { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } comment { $to = $this->dataLength; @@ -360,14 +355,14 @@ class Smarty_Internal_Templatelexer return false; } userliteral { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } ldel literal rdel { - $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERALSTART; $this->yypushstate(self::LITERAL); } ldel slash literal rdel { - $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND; $this->yypushstate(self::LITERAL); } ldel { @@ -384,70 +379,65 @@ class Smarty_Internal_Templatelexer $to = $match[0][1]; } $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } */ /*!lex2php %statename TAG ldel if { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELIF; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } ldel for { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOR; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } ldel foreach { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOREACH; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } ldel setfilter { - $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; - $this->yybegin(self::TAGBODY); - $this->taglineno = $this->line; - } - ldel makenocache { - $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELSETFILTER; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } ldel id nocacherdel { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG; + $this->token = \Smarty\Parser\TemplateParser::TP_SIMPLETAG; $this->taglineno = $this->line; } ldel smartyblockchildparent rdel { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; + $this->token = \Smarty\Parser\TemplateParser::TP_SMARTYBLOCKCHILDPARENT; $this->taglineno = $this->line; } ldel slash id rdel { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG; + $this->token = \Smarty\Parser\TemplateParser::TP_CLOSETAG; $this->taglineno = $this->line; } ldel dollar id nocacherdel { if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) { $this->yypopstate(); - $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT; + $this->token = \Smarty\Parser\TemplateParser::TP_SIMPELOUTPUT; $this->taglineno = $this->line; } else { $this->value = $this->smarty->getLeftDelimiter(); - $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_LDEL; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } } ldel slash { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->token = \Smarty\Parser\TemplateParser::TP_LDELSLASH; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } ldel { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_LDEL; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } @@ -455,7 +445,7 @@ class Smarty_Internal_Templatelexer /*!lex2php %statename TAGBODY rdel { - $this->token = Smarty_Internal_Templateparser::TP_RDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_RDEL; $this->yypopstate(); } ldel { @@ -463,143 +453,143 @@ class Smarty_Internal_Templatelexer return true; } double_quote { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE; $this->yypushstate(self::DOUBLEQUOTEDSTRING); $this->compiler->enterDoubleQuote(); } singlequotestring { - $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; + $this->token = \Smarty\Parser\TemplateParser::TP_SINGLEQUOTESTRING; } dollar id { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; + $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID; } dollar { - $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; + $this->token = \Smarty\Parser\TemplateParser::TP_DOLLAR; } isin { - $this->token = Smarty_Internal_Templateparser::TP_ISIN; + $this->token = \Smarty\Parser\TemplateParser::TP_ISIN; } as { - $this->token = Smarty_Internal_Templateparser::TP_AS; + $this->token = \Smarty\Parser\TemplateParser::TP_AS; } to { - $this->token = Smarty_Internal_Templateparser::TP_TO; + $this->token = \Smarty\Parser\TemplateParser::TP_TO; } step { - $this->token = Smarty_Internal_Templateparser::TP_STEP; + $this->token = \Smarty\Parser\TemplateParser::TP_STEP; } instanceof { - $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; + $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF; } lop { - $this->token = Smarty_Internal_Templateparser::TP_LOGOP; + $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP; } slop { - $this->token = Smarty_Internal_Templateparser::TP_SLOGOP; + $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP; } tlop { - $this->token = Smarty_Internal_Templateparser::TP_TLOGOP; + $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP; } scond { - $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND; + $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND; } not{ - $this->token = Smarty_Internal_Templateparser::TP_NOT; + $this->token = \Smarty\Parser\TemplateParser::TP_NOT; } typecast { - $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; + $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST; } openP { - $this->token = Smarty_Internal_Templateparser::TP_OPENP; + $this->token = \Smarty\Parser\TemplateParser::TP_OPENP; } closeP { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; + $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP; } openB { - $this->token = Smarty_Internal_Templateparser::TP_OPENB; + $this->token = \Smarty\Parser\TemplateParser::TP_OPENB; } closeB { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; + $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB; } ptr { - $this->token = Smarty_Internal_Templateparser::TP_PTR; + $this->token = \Smarty\Parser\TemplateParser::TP_PTR; } aptr { - $this->token = Smarty_Internal_Templateparser::TP_APTR; + $this->token = \Smarty\Parser\TemplateParser::TP_APTR; } equal { - $this->token = Smarty_Internal_Templateparser::TP_EQUAL; + $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL; } incdec { - $this->token = Smarty_Internal_Templateparser::TP_INCDEC; + $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC; } unimath { - $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; + $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH; } math { - $this->token = Smarty_Internal_Templateparser::TP_MATH; + $this->token = \Smarty\Parser\TemplateParser::TP_MATH; } at { - $this->token = Smarty_Internal_Templateparser::TP_AT; + $this->token = \Smarty\Parser\TemplateParser::TP_AT; } array openP { - $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN; + $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN; } hatch { - $this->token = Smarty_Internal_Templateparser::TP_HATCH; + $this->token = \Smarty\Parser\TemplateParser::TP_HATCH; } attr { // resolve conflicts with shorttag and right_delimiter starting with '=' if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) { preg_match('/\s+/',$this->value,$match); $this->value = $match[0]; - $this->token = Smarty_Internal_Templateparser::TP_SPACE; + $this->token = \Smarty\Parser\TemplateParser::TP_SPACE; } else { - $this->token = Smarty_Internal_Templateparser::TP_ATTR; + $this->token = \Smarty\Parser\TemplateParser::TP_ATTR; } } namespace { - $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE; + $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE; } id { - $this->token = Smarty_Internal_Templateparser::TP_ID; + $this->token = \Smarty\Parser\TemplateParser::TP_ID; } integer { - $this->token = Smarty_Internal_Templateparser::TP_INTEGER; + $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER; } backtick { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK; $this->yypopstate(); } vert { - $this->token = Smarty_Internal_Templateparser::TP_VERT; + $this->token = \Smarty\Parser\TemplateParser::TP_VERT; } dot { - $this->token = Smarty_Internal_Templateparser::TP_DOT; + $this->token = \Smarty\Parser\TemplateParser::TP_DOT; } comma { - $this->token = Smarty_Internal_Templateparser::TP_COMMA; + $this->token = \Smarty\Parser\TemplateParser::TP_COMMA; } semicolon { - $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; + $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON; } doublecolon { - $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; + $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON; } colon { - $this->token = Smarty_Internal_Templateparser::TP_COLON; + $this->token = \Smarty\Parser\TemplateParser::TP_COLON; } qmark { - $this->token = Smarty_Internal_Templateparser::TP_QMARK; + $this->token = \Smarty\Parser\TemplateParser::TP_QMARK; } hex { - $this->token = Smarty_Internal_Templateparser::TP_HEX; + $this->token = \Smarty\Parser\TemplateParser::TP_HEX; } space { - $this->token = Smarty_Internal_Templateparser::TP_SPACE; + $this->token = \Smarty\Parser\TemplateParser::TP_SPACE; } char { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } */ @@ -607,14 +597,14 @@ class Smarty_Internal_Templatelexer %statename LITERAL ldel literal rdel { $this->literal_cnt++; - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL; } ldel slash literal rdel { if ($this->literal_cnt) { $this->literal_cnt--; - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL; } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND; $this->yypopstate(); } } @@ -630,19 +620,19 @@ class Smarty_Internal_Templatelexer $this->compiler->trigger_template_error ("missing or misspelled literal closing tag"); } $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL; } */ /*!lex2php %statename DOUBLEQUOTEDSTRING userliteral { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } ldel literal rdel { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } ldel slash literal rdel { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } ldel slash { $this->yypushstate(self::TAG); @@ -653,33 +643,33 @@ class Smarty_Internal_Templatelexer return true; } ldel { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->token = \Smarty\Parser\TemplateParser::TP_LDEL; $this->taglineno = $this->line; $this->yypushstate(self::TAGBODY); } double_quote { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE; $this->yypopstate(); } backtick dollar { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK; $this->value = substr($this->value,0,-1); $this->yypushstate(self::TAGBODY); $this->taglineno = $this->line; } dollar id { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; + $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID; } dollar { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } textdoublequoted { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } char { $to = $this->dataLength; $this->value = substr($this->data,$this->counter,$to-$this->counter); - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = \Smarty\Parser\TemplateParser::TP_TEXT; } */ } diff --git a/include/smarty/src/ParseTree/Base.php b/include/smarty/src/ParseTree/Base.php new file mode 100644 index 000000000..e1140c15e --- /dev/null +++ b/include/smarty/src/ParseTree/Base.php @@ -0,0 +1,45 @@ +data); } diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/include/smarty/src/ParseTree/Dq.php similarity index 50% rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php rename to include/smarty/src/ParseTree/Dq.php index 8655f5869..b5fca3b40 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php +++ b/include/smarty/src/ParseTree/Dq.php @@ -1,92 +1,94 @@ subtrees[] = $subtree; - if ($subtree instanceof Smarty_Internal_ParseTree_Tag) { - $parser->block_nesting_level = count($parser->compiler->_tag_stack); + if ($subtree instanceof Tag) { + $parser->block_nesting_level = $parser->compiler->getTagStackCount(); } } /** * Append buffer to subtree * - * @param \Smarty_Internal_Templateparser $parser - * @param Smarty_Internal_ParseTree $subtree parse tree buffer + * @param \Smarty\Parser\TemplateParser $parser + * @param Base $subtree parse tree buffer */ - public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree) + public function append_subtree(\Smarty\Parser\TemplateParser $parser, Base $subtree) { $last_subtree = count($this->subtrees) - 1; - if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag + if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Tag && $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level ) { - if ($subtree instanceof Smarty_Internal_ParseTree_Code) { + if ($subtree instanceof Code) { $this->subtrees[ $last_subtree ]->data = $parser->compiler->appendCode( - $this->subtrees[ $last_subtree ]->data, + (string) $this->subtrees[ $last_subtree ]->data, 'data . ';?>' ); - } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) { + } elseif ($subtree instanceof DqContent) { $this->subtrees[ $last_subtree ]->data = $parser->compiler->appendCode( - $this->subtrees[ $last_subtree ]->data, + (string) $this->subtrees[ $last_subtree ]->data, 'data . '";?>' ); } else { $this->subtrees[ $last_subtree ]->data = - $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data); + $parser->compiler->appendCode((string) $this->subtrees[ $last_subtree ]->data, (string) $subtree->data); } } else { $this->subtrees[] = $subtree; } - if ($subtree instanceof Smarty_Internal_ParseTree_Tag) { - $parser->block_nesting_level = count($parser->compiler->_tag_stack); + if ($subtree instanceof Tag) { + $parser->block_nesting_level = $parser->compiler->getTagStackCount(); } } /** * Merge subtree buffer content together * - * @param \Smarty_Internal_Templateparser $parser + * @param \Smarty\Parser\TemplateParser $parser * * @return string compiled template code */ - public function to_smarty_php(Smarty_Internal_Templateparser $parser) + public function to_smarty_php(\Smarty\Parser\TemplateParser $parser) { $code = ''; foreach ($this->subtrees as $subtree) { if ($code !== '') { $code .= '.'; } - if ($subtree instanceof Smarty_Internal_ParseTree_Tag) { + if ($subtree instanceof Tag) { $more_php = $subtree->assign_to_var($parser); } else { $more_php = $subtree->to_smarty_php($parser); } $code .= $more_php; - if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) { + if (!$subtree instanceof DqContent) { $parser->compiler->has_variable_string = true; } } diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php b/include/smarty/src/ParseTree/DqContent.php similarity index 58% rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php rename to include/smarty/src/ParseTree/DqContent.php index a8ca389d9..f0a4b0697 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php +++ b/include/smarty/src/ParseTree/DqContent.php @@ -1,22 +1,24 @@ data . '"'; } diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/include/smarty/src/ParseTree/Tag.php similarity index 63% rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php rename to include/smarty/src/ParseTree/Tag.php index e6c755604..05237f2de 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php +++ b/include/smarty/src/ParseTree/Tag.php @@ -1,10 +1,13 @@ data = $data; $this->saved_block_nesting = $parser->block_nesting_level; @@ -40,11 +43,11 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree /** * Return buffer content * - * @param \Smarty_Internal_Templateparser $parser + * @param \Smarty\Parser\TemplateParser $parser * * @return string content */ - public function to_smarty_php(Smarty_Internal_Templateparser $parser) + public function to_smarty_php(\Smarty\Parser\TemplateParser $parser) { return $this->data; } @@ -52,16 +55,16 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree /** * Return complied code that loads the evaluated output of buffer content into a temporary variable * - * @param \Smarty_Internal_Templateparser $parser + * @param \Smarty\Parser\TemplateParser $parser * * @return string template code */ - public function assign_to_var(Smarty_Internal_Templateparser $parser) + public function assign_to_var(\Smarty\Parser\TemplateParser $parser) { $var = $parser->compiler->getNewPrefixVariable(); - $tmp = $parser->compiler->appendCode('', $this->data); + $tmp = $parser->compiler->appendCode('', (string) $this->data); $tmp = $parser->compiler->appendCode($tmp, ""); - $parser->compiler->prefix_code[] = sprintf('%s', $tmp); + $parser->compiler->appendPrefixCode($tmp); return $var; } } diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/include/smarty/src/ParseTree/Template.php similarity index 77% rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php rename to include/smarty/src/ParseTree/Template.php index 829c420fe..ce802a0f4 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php +++ b/include/smarty/src/ParseTree/Template.php @@ -1,10 +1,13 @@ subtrees)) { $this->subtrees = array_merge($this->subtrees, $subtree->subtrees); @@ -52,10 +55,10 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree /** * Append array to subtree * - * @param \Smarty_Internal_Templateparser $parser - * @param \Smarty_Internal_ParseTree[] $array + * @param \Smarty\Parser\TemplateParser $parser + * @param Base[] $array */ - public function append_array(Smarty_Internal_Templateparser $parser, $array = array()) + public function append_array(\Smarty\Parser\TemplateParser $parser, $array = array()) { if (!empty($array)) { $this->subtrees = array_merge($this->subtrees, (array)$array); @@ -65,10 +68,10 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree /** * Prepend array to subtree * - * @param \Smarty_Internal_Templateparser $parser - * @param \Smarty_Internal_ParseTree[] $array + * @param \Smarty\Parser\TemplateParser $parser + * @param Base[] $array */ - public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array()) + public function prepend_array(\Smarty\Parser\TemplateParser $parser, $array = array()) { if (!empty($array)) { $this->subtrees = array_merge((array)$array, $this->subtrees); @@ -78,11 +81,11 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree /** * Sanitize and merge subtree buffers together * - * @param \Smarty_Internal_Templateparser $parser + * @param \Smarty\Parser\TemplateParser $parser * * @return string template code content */ - public function to_smarty_php(Smarty_Internal_Templateparser $parser) + public function to_smarty_php(\Smarty\Parser\TemplateParser $parser) { $code = ''; @@ -111,7 +114,7 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree break; case 'tag': foreach ($chunk['subtrees'] as $subtree) { - $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser)); + $text = $parser->compiler->appendCode($text, (string) $subtree->to_smarty_php($parser)); } $code .= $text; break; @@ -136,12 +139,12 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree continue; } - if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text + if ($this->subtrees[ $key ] instanceof Text && $this->subtrees[ $key ]->isToBeStripped()) { $newMode = 'textstripped'; - } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) { + } elseif ($this->subtrees[ $key ] instanceof Text) { $newMode = 'text'; - } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) { + } elseif ($this->subtrees[ $key ] instanceof Tag) { $newMode = 'tag'; } else { $newMode = 'other'; diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php b/include/smarty/src/ParseTree/Text.php similarity index 78% rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php rename to include/smarty/src/ParseTree/Text.php index 58116c811..e6131407c 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php +++ b/include/smarty/src/ParseTree/Text.php @@ -1,20 +1,22 @@ data; } diff --git a/include/smarty/src/Parser/ConfigfileParser.php b/include/smarty/src/Parser/ConfigfileParser.php new file mode 100644 index 000000000..7997a0981 --- /dev/null +++ b/include/smarty/src/Parser/ConfigfileParser.php @@ -0,0 +1,972 @@ + '\\', + '\'' => '\''); + + /** + * constructor + * + * @param Lexer $lex + * @param Configfile $compiler + */ + public function __construct(Lexer $lex, Configfile $compiler) + { + $this->lex = $lex; + $this->smarty = $compiler->getSmarty(); + $this->compiler = $compiler; + $this->configOverwrite = $this->smarty->config_overwrite; + $this->configReadHidden = $this->smarty->config_read_hidden; + } + + /** + * parse optional boolean keywords + * + * @param string $str + * + * @return bool + */ + private function parse_bool($str) + { + $str = strtolower($str); + if (in_array($str, array('on', 'yes', 'true'))) { + $res = true; + } else { + $res = false; + } + return $res; + } + + /** + * parse single quoted string + * remove outer quotes + * unescape inner quotes + * + * @param string $qstr + * + * @return string + */ + private static function parse_single_quoted_string($qstr) + { + $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes + + $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE); + + $str = ''; + foreach ($ss as $s) { + if (strlen($s) === 2 && $s[0] === '\\') { + if (isset(self::$escapes_single[$s[1]])) { + $s = self::$escapes_single[$s[1]]; + } + } + $str .= $s; + } + return $str; + } + + /** + * parse double quoted string + * + * @param string $qstr + * + * @return string + */ + private static function parse_double_quoted_string($qstr) + { + $inner_str = substr($qstr, 1, strlen($qstr) - 2); + return stripcslashes($inner_str); + } + + /** + * parse triple quoted string + * + * @param string $qstr + * + * @return string + */ + private static function parse_tripple_double_quoted_string($qstr) + { + return stripcslashes($qstr); + } + + /** + * set a config variable in target array + * + * @param array $var + * @param array $target_array + */ + private function set_var(array $var, array &$target_array) + { + $key = $var['key']; + $value = $var['value']; + + if ($this->configOverwrite || !isset($target_array['vars'][$key])) { + $target_array['vars'][$key] = $value; + } else { + settype($target_array['vars'][$key], 'array'); + $target_array['vars'][$key][] = $value; + } + } + + /** + * add config variable to global vars + * + * @param array $vars + */ + private function add_global_vars(array $vars) + { + if (!isset($this->compiler->config_data['vars'])) { + $this->compiler->config_data['vars'] = array(); + } + foreach ($vars as $var) { + $this->set_var($var, $this->compiler->config_data); + } + } + + /** + * add config variable to section + * + * @param string $section_name + * @param array $vars + */ + private function add_section_vars($section_name, array $vars) + { + if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) { + $this->compiler->config_data['sections'][$section_name]['vars'] = array(); + } + foreach ($vars as $var) { + $this->set_var($var, $this->compiler->config_data['sections'][$section_name]); + } + } + + const TPC_OPENB = 1; + const TPC_SECTION = 2; + const TPC_CLOSEB = 3; + const TPC_DOT = 4; + const TPC_ID = 5; + const TPC_EQUAL = 6; + const TPC_FLOAT = 7; + const TPC_INT = 8; + const TPC_BOOL = 9; + const TPC_SINGLE_QUOTED_STRING = 10; + const TPC_DOUBLE_QUOTED_STRING = 11; + const TPC_TRIPPLE_QUOTES = 12; + const TPC_TRIPPLE_TEXT = 13; + const TPC_TRIPPLE_QUOTES_END = 14; + const TPC_NAKED_STRING = 15; + const TPC_OTHER = 16; + const TPC_NEWLINE = 17; + const TPC_COMMENTSTART = 18; + const YY_NO_ACTION = 60; + const YY_ACCEPT_ACTION = 59; + const YY_ERROR_ACTION = 58; + + const YY_SZ_ACTTAB = 39; +public static $yy_action = array( + 24, 25, 26, 27, 28, 12, 15, 23, 31, 32, + 59, 8, 9, 3, 21, 22, 33, 13, 33, 13, + 14, 10, 18, 16, 30, 11, 17, 20, 34, 7, + 5, 1, 2, 29, 4, 19, 52, 35, 6, + ); + public static $yy_lookahead = array( + 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, + 20, 21, 25, 23, 25, 26, 17, 18, 17, 18, + 2, 25, 4, 13, 14, 1, 15, 24, 17, 22, + 3, 23, 23, 14, 6, 2, 28, 17, 3, +); + const YY_SHIFT_USE_DFLT = -8; + const YY_SHIFT_MAX = 19; + public static $yy_shift_ofst = array( + -8, 1, 1, 1, -7, -1, -1, 24, -8, -8, + -8, 18, 10, 11, 27, 28, 19, 20, 33, 35, +); + const YY_REDUCE_USE_DFLT = -21; + const YY_REDUCE_MAX = 10; + public static $yy_reduce_ofst = array( + -10, -11, -11, -11, -20, -13, -4, 3, 7, 8, + 9, +); + public static $yyExpectedTokens = array( + array(), + array(5, 17, 18, ), + array(5, 17, 18, ), + array(5, 17, 18, ), + array(7, 8, 9, 10, 11, 12, 15, 16, ), + array(17, 18, ), + array(17, 18, ), + array(1, ), + array(), + array(), + array(), + array(2, 4, ), + array(13, 14, ), + array(15, 17, ), + array(3, ), + array(6, ), + array(14, ), + array(17, ), + array(2, ), + array(3, ), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), +); + public static $yy_default = array( + 44, 40, 41, 37, 58, 58, 58, 36, 39, 44, + 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 38, 42, 43, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, +); + const YYNOCODE = 29; + const YYSTACKDEPTH = 100; + const YYNSTATE = 36; + const YYNRULE = 22; + const YYERRORSYMBOL = 19; + const YYERRSYMDT = 'yy0'; + const YYFALLBACK = 0; + public static $yyFallback = array( + ); + public function Trace($TraceFILE, $zTracePrompt) + { + if (!$TraceFILE) { + $zTracePrompt = 0; + } elseif (!$zTracePrompt) { + $TraceFILE = 0; + } + $this->yyTraceFILE = $TraceFILE; + $this->yyTracePrompt = $zTracePrompt; + } + + public function PrintTrace() + { + $this->yyTraceFILE = fopen('php://output', 'w'); + $this->yyTracePrompt = '
    '; + } + + public $yyTraceFILE; + public $yyTracePrompt; + public $yyidx; /* Index of top element in stack */ + public $yyerrcnt; /* Shifts left before out of the error */ + public $yystack = array(); /* The parser's stack */ + + public $yyTokenName = array( + '$', 'OPENB', 'SECTION', 'CLOSEB', + 'DOT', 'ID', 'EQUAL', 'FLOAT', + 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', + 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', + 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', + 'start', 'global_vars', 'sections', 'var_list', + 'section', 'newline', 'var', 'value', + ); + + public static $yyRuleName = array( + 'start ::= global_vars sections', + 'global_vars ::= var_list', + 'sections ::= sections section', + 'sections ::=', + 'section ::= OPENB SECTION CLOSEB newline var_list', + 'section ::= OPENB DOT SECTION CLOSEB newline var_list', + 'var_list ::= var_list newline', + 'var_list ::= var_list var', + 'var_list ::=', + 'var ::= ID EQUAL value', + 'value ::= FLOAT', + 'value ::= INT', + 'value ::= BOOL', + 'value ::= SINGLE_QUOTED_STRING', + 'value ::= DOUBLE_QUOTED_STRING', + 'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', + 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END', + 'value ::= NAKED_STRING', + 'value ::= OTHER', + 'newline ::= NEWLINE', + 'newline ::= COMMENTSTART NEWLINE', + 'newline ::= COMMENTSTART NAKED_STRING NEWLINE', + ); + + public function tokenName($tokenType) + { + if ($tokenType === 0) { + return 'End of Input'; + } + if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) { + return $this->yyTokenName[$tokenType]; + } else { + return 'Unknown'; + } + } + + public static function yy_destructor($yymajor, $yypminor) + { + switch ($yymajor) { + default: break; /* If no destructor action specified: do nothing */ + } + } + + public function yy_pop_parser_stack() + { + if (empty($this->yystack)) { + return; + } + $yytos = array_pop($this->yystack); + if ($this->yyTraceFILE && $this->yyidx >= 0) { + fwrite($this->yyTraceFILE, + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + "\n"); + } + $yymajor = $yytos->major; + self::yy_destructor($yymajor, $yytos->minor); + $this->yyidx--; + + return $yymajor; + } + + public function __destruct() + { + while ($this->yystack !== Array()) { + $this->yy_pop_parser_stack(); + } + if (is_resource($this->yyTraceFILE)) { + fclose($this->yyTraceFILE); + } + } + + public function yy_get_expected_tokens($token) + { + static $res3 = array(); + static $res4 = array(); + $state = $this->yystack[$this->yyidx]->stateno; + $expected = self::$yyExpectedTokens[$state]; + if (isset($res3[$state][$token])) { + if ($res3[$state][$token]) { + return $expected; + } + } else { + if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) { + return $expected; + } + } + $stack = $this->yystack; + $yyidx = $this->yyidx; + do { + $yyact = $this->yy_find_shift_action($token); + if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) { + // reduce action + $done = 0; + do { + if ($done++ === 100) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // too much recursion prevents proper detection + // so give up + return array_unique($expected); + } + $yyruleno = $yyact - self::YYNSTATE; + $this->yyidx -= self::$yyRuleInfo[$yyruleno][1]; + $nextstate = $this->yy_find_reduce_action( + $this->yystack[$this->yyidx]->stateno, + self::$yyRuleInfo[$yyruleno][0]); + if (isset(self::$yyExpectedTokens[$nextstate])) { + $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); + if (isset($res4[$nextstate][$token])) { + if ($res4[$nextstate][$token]) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return array_unique($expected); + } + } else { + if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return array_unique($expected); + } + } + } + if ($nextstate < self::YYNSTATE) { + // we need to shift a non-terminal + $this->yyidx++; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = $nextstate; + $x->major = self::$yyRuleInfo[$yyruleno][0]; + $this->yystack[$this->yyidx] = $x; + continue 2; + } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // the last token was just ignored, we can't accept + // by ignoring input, this is in essence ignoring a + // syntax error! + return array_unique($expected); + } elseif ($nextstate === self::YY_NO_ACTION) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // input accepted, but not shifted (I guess) + return $expected; + } else { + $yyact = $nextstate; + } + } while (true); + } + break; + } while (true); + $this->yyidx = $yyidx; + $this->yystack = $stack; + + return array_unique($expected); + } + + public function yy_is_expected_token($token) + { + static $res = array(); + static $res2 = array(); + if ($token === 0) { + return true; // 0 is not part of this + } + $state = $this->yystack[$this->yyidx]->stateno; + if (isset($res[$state][$token])) { + if ($res[$state][$token]) { + return true; + } + } else { + if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) { + return true; + } + } + $stack = $this->yystack; + $yyidx = $this->yyidx; + do { + $yyact = $this->yy_find_shift_action($token); + if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) { + // reduce action + $done = 0; + do { + if ($done++ === 100) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // too much recursion prevents proper detection + // so give up + return true; + } + $yyruleno = $yyact - self::YYNSTATE; + $this->yyidx -= self::$yyRuleInfo[$yyruleno][1]; + $nextstate = $this->yy_find_reduce_action( + $this->yystack[$this->yyidx]->stateno, + self::$yyRuleInfo[$yyruleno][0]); + if (isset($res2[$nextstate][$token])) { + if ($res2[$nextstate][$token]) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return true; + } + } else { + if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return true; + } + } + if ($nextstate < self::YYNSTATE) { + // we need to shift a non-terminal + $this->yyidx++; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = $nextstate; + $x->major = self::$yyRuleInfo[$yyruleno][0]; + $this->yystack[$this->yyidx] = $x; + continue 2; + } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + if (!$token) { + // end of input: this is valid + return true; + } + // the last token was just ignored, we can't accept + // by ignoring input, this is in essence ignoring a + // syntax error! + return false; + } elseif ($nextstate === self::YY_NO_ACTION) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // input accepted, but not shifted (I guess) + return true; + } else { + $yyact = $nextstate; + } + } while (true); + } + break; + } while (true); + $this->yyidx = $yyidx; + $this->yystack = $stack; + + return true; + } + + public function yy_find_shift_action($iLookAhead) + { + $stateno = $this->yystack[$this->yyidx]->stateno; + + /* if ($this->yyidx < 0) return self::YY_NO_ACTION; */ + if (!isset(self::$yy_shift_ofst[$stateno])) { + // no shift actions + return self::$yy_default[$stateno]; + } + $i = self::$yy_shift_ofst[$stateno]; + if ($i === self::YY_SHIFT_USE_DFLT) { + return self::$yy_default[$stateno]; + } + if ($iLookAhead === self::YYNOCODE) { + return self::YY_NO_ACTION; + } + $i += $iLookAhead; + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[$i] != $iLookAhead) { + if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) + && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { + if ($this->yyTraceFILE) { + fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' . + $this->yyTokenName[$iLookAhead] . ' => ' . + $this->yyTokenName[$iFallback] . "\n"); + } + + return $this->yy_find_shift_action($iFallback); + } + + return self::$yy_default[$stateno]; + } else { + return self::$yy_action[$i]; + } + } + + public function yy_find_reduce_action($stateno, $iLookAhead) + { + /* $stateno = $this->yystack[$this->yyidx]->stateno; */ + + if (!isset(self::$yy_reduce_ofst[$stateno])) { + return self::$yy_default[$stateno]; + } + $i = self::$yy_reduce_ofst[$stateno]; + if ($i === self::YY_REDUCE_USE_DFLT) { + return self::$yy_default[$stateno]; + } + if ($iLookAhead === self::YYNOCODE) { + return self::YY_NO_ACTION; + } + $i += $iLookAhead; + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[$i] != $iLookAhead) { + return self::$yy_default[$stateno]; + } else { + return self::$yy_action[$i]; + } + } + + public function yy_shift($yyNewState, $yyMajor, $yypMinor) + { + $this->yyidx++; + if ($this->yyidx >= self::YYSTACKDEPTH) { + $this->yyidx--; + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); + } + while ($this->yyidx >= 0) { + $this->yy_pop_parser_stack(); + } +// line 245 "src/Parser/ConfigfileParser.y" + + $this->internalError = true; + $this->compiler->trigger_config_file_error('Stack overflow in configfile parser'); + + return; + } + $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $yytos->stateno = $yyNewState; + $yytos->major = $yyMajor; + $yytos->minor = $yypMinor; + $this->yystack[] = $yytos; + if ($this->yyTraceFILE && $this->yyidx > 0) { + fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, + $yyNewState); + fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); + for ($i = 1; $i <= $this->yyidx; $i++) { + fprintf($this->yyTraceFILE, " %s", + $this->yyTokenName[$this->yystack[$i]->major]); + } + fwrite($this->yyTraceFILE,"\n"); + } + } + + public static $yyRuleInfo = array( + array( 0 => 20, 1 => 2 ), + array( 0 => 21, 1 => 1 ), + array( 0 => 22, 1 => 2 ), + array( 0 => 22, 1 => 0 ), + array( 0 => 24, 1 => 5 ), + array( 0 => 24, 1 => 6 ), + array( 0 => 23, 1 => 2 ), + array( 0 => 23, 1 => 2 ), + array( 0 => 23, 1 => 0 ), + array( 0 => 26, 1 => 3 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 3 ), + array( 0 => 27, 1 => 2 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 25, 1 => 1 ), + array( 0 => 25, 1 => 2 ), + array( 0 => 25, 1 => 3 ), + ); + + public static $yyReduceMap = array( + 0 => 0, + 2 => 0, + 3 => 0, + 19 => 0, + 20 => 0, + 21 => 0, + 1 => 1, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, + 10 => 10, + 11 => 11, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, + 16 => 16, + 17 => 17, + 18 => 17, + ); +// line 251 "src/Parser/ConfigfileParser.y" + public function yy_r0(){ + $this->_retvalue = null; + } +// line 256 "src/Parser/ConfigfileParser.y" + public function yy_r1(){ + $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = null; + } +// line 270 "src/Parser/ConfigfileParser.y" + public function yy_r4(){ + $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = null; + } +// line 275 "src/Parser/ConfigfileParser.y" + public function yy_r5(){ + if ($this->configReadHidden) { + $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); + } + $this->_retvalue = null; + } +// line 283 "src/Parser/ConfigfileParser.y" + public function yy_r6(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +// line 287 "src/Parser/ConfigfileParser.y" + public function yy_r7(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + 0]->minor)); + } +// line 291 "src/Parser/ConfigfileParser.y" + public function yy_r8(){ + $this->_retvalue = array(); + } +// line 297 "src/Parser/ConfigfileParser.y" + public function yy_r9(){ + $this->_retvalue = array('key' => $this->yystack[$this->yyidx + -2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor); + } +// line 302 "src/Parser/ConfigfileParser.y" + public function yy_r10(){ + $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; + } +// line 306 "src/Parser/ConfigfileParser.y" + public function yy_r11(){ + $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; + } +// line 310 "src/Parser/ConfigfileParser.y" + public function yy_r12(){ + $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); + } +// line 314 "src/Parser/ConfigfileParser.y" + public function yy_r13(){ + $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); + } +// line 318 "src/Parser/ConfigfileParser.y" + public function yy_r14(){ + $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); + } +// line 322 "src/Parser/ConfigfileParser.y" + public function yy_r15(){ + $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor); + } +// line 326 "src/Parser/ConfigfileParser.y" + public function yy_r16(){ + $this->_retvalue = ''; + } +// line 330 "src/Parser/ConfigfileParser.y" + public function yy_r17(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } + + private $_retvalue; + + public function yy_reduce($yyruleno) + { + if ($this->yyTraceFILE && $yyruleno >= 0 + && $yyruleno < count(self::$yyRuleName)) { + fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", + $this->yyTracePrompt, $yyruleno, + self::$yyRuleName[$yyruleno]); + } + + $this->_retvalue = $yy_lefthand_side = null; + if (isset(self::$yyReduceMap[$yyruleno])) { + // call the action + $this->_retvalue = null; + $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}(); + $yy_lefthand_side = $this->_retvalue; + } + $yygoto = self::$yyRuleInfo[$yyruleno][0]; + $yysize = self::$yyRuleInfo[$yyruleno][1]; + $this->yyidx -= $yysize; + for ($i = $yysize; $i; $i--) { + // pop all of the right-hand side parameters + array_pop($this->yystack); + } + $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); + if ($yyact < self::YYNSTATE) { + if (!$this->yyTraceFILE && $yysize) { + $this->yyidx++; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = $yyact; + $x->major = $yygoto; + $x->minor = $yy_lefthand_side; + $this->yystack[$this->yyidx] = $x; + } else { + $this->yy_shift($yyact, $yygoto, $yy_lefthand_side); + } + } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) { + $this->yy_accept(); + } + } + + public function yy_parse_failed() + { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); + } while ($this->yyidx >= 0) { + $this->yy_pop_parser_stack(); + } + } + + public function yy_syntax_error($yymajor, $TOKEN) + { +// line 238 "src/Parser/ConfigfileParser.y" + + $this->internalError = true; + $this->yymajor = $yymajor; + $this->compiler->trigger_config_file_error(); + } + + public function yy_accept() + { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); + } while ($this->yyidx >= 0) { + $this->yy_pop_parser_stack(); + } +// line 231 "src/Parser/ConfigfileParser.y" + + $this->successful = !$this->internalError; + $this->internalError = false; + $this->retvalue = $this->_retvalue; + } + + public function doParse($yymajor, $yytokenvalue) + { + $yyerrorhit = 0; /* True if yymajor has invoked an error */ + + if ($this->yyidx === null || $this->yyidx < 0) { + $this->yyidx = 0; + $this->yyerrcnt = -1; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = 0; + $x->major = 0; + $this->yystack = array(); + $this->yystack[] = $x; + } + $yyendofinput = ($yymajor==0); + + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sInput %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + } + + do { + $yyact = $this->yy_find_shift_action($yymajor); + if ($yymajor < self::YYERRORSYMBOL && + !$this->yy_is_expected_token($yymajor)) { + // force a syntax error + $yyact = self::YY_ERROR_ACTION; + } + if ($yyact < self::YYNSTATE) { + $this->yy_shift($yyact, $yymajor, $yytokenvalue); + $this->yyerrcnt--; + if ($yyendofinput && $this->yyidx >= 0) { + $yymajor = 0; + } else { + $yymajor = self::YYNOCODE; + } + } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { + $this->yy_reduce($yyact - self::YYNSTATE); + } elseif ($yyact === self::YY_ERROR_ACTION) { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sSyntax Error!\n", + $this->yyTracePrompt); + } + if (self::YYERRORSYMBOL) { + if ($this->yyerrcnt < 0) { + $this->yy_syntax_error($yymajor, $yytokenvalue); + } + $yymx = $this->yystack[$this->yyidx]->major; + if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + } + $this->yy_destructor($yymajor, $yytokenvalue); + $yymajor = self::YYNOCODE; + } else { + while ($this->yyidx >= 0 && + $yymx !== self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ){ + $this->yy_pop_parser_stack(); + } + if ($this->yyidx < 0 || $yymajor==0) { + $this->yy_destructor($yymajor, $yytokenvalue); + $this->yy_parse_failed(); + $yymajor = self::YYNOCODE; + } elseif ($yymx !== self::YYERRORSYMBOL) { + $u2 = 0; + $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2); + } + } + $this->yyerrcnt = 3; + $yyerrorhit = 1; + } else { + if ($this->yyerrcnt <= 0) { + $this->yy_syntax_error($yymajor, $yytokenvalue); + } + $this->yyerrcnt = 3; + $this->yy_destructor($yymajor, $yytokenvalue); + if ($yyendofinput) { + $this->yy_parse_failed(); + } + $yymajor = self::YYNOCODE; + } + } else { + $this->yy_accept(); + $yymajor = self::YYNOCODE; + } + } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0); + } +} + diff --git a/include/smarty/lexer/smarty_internal_configfileparser.y b/include/smarty/src/Parser/ConfigfileParser.y similarity index 91% rename from include/smarty/lexer/smarty_internal_configfileparser.y rename to include/smarty/src/Parser/ConfigfileParser.y index c981b58e9..23afc2d8f 100644 --- a/include/smarty/lexer/smarty_internal_configfileparser.y +++ b/include/smarty/src/Parser/ConfigfileParser.y @@ -1,5 +1,5 @@ /** -* Smarty Internal Plugin Configfileparser +* ConfigfileParser * * This is the config file parser * @@ -10,16 +10,22 @@ */ %name TPC_ %declare_class { + +namespace Smarty\Parser; + +use \Smarty\Lexer\ConfigfileLexer as Lexer; +use \Smarty\Compiler\Configfile as Configfile; + /** * Smarty Internal Plugin Configfileparse * * This is the config file parser. -* It is generated from the smarty_internal_configfileparser.y file +* It is generated from the ConfigfileParser.y file * @package Smarty * @subpackage Compiler * @author Uwe Tews */ -class Smarty_Internal_Configfileparser +class ConfigfileParser } %include_class { @@ -42,7 +48,7 @@ class Smarty_Internal_Configfileparser /** * lexer object * - * @var Smarty_Internal_Configfilelexer + * @var Lexer */ private $lex; /** @@ -54,7 +60,7 @@ class Smarty_Internal_Configfileparser /** * compiler object * - * @var Smarty_Internal_Config_File_Compiler + * @var Configfile */ public $compiler = null; /** @@ -86,13 +92,13 @@ class Smarty_Internal_Configfileparser /** * constructor * - * @param Smarty_Internal_Configfilelexer $lex - * @param Smarty_Internal_Config_File_Compiler $compiler + * @param Lexer $lex + * @param Configfile $compiler */ - public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler) + public function __construct(Lexer $lex, Configfile $compiler) { $this->lex = $lex; - $this->smarty = $compiler->smarty; + $this->smarty = $compiler->getSmarty(); $this->compiler = $compiler; $this->configOverwrite = $this->smarty->config_overwrite; $this->configReadHidden = $this->smarty->config_read_hidden; @@ -237,8 +243,8 @@ class Smarty_Internal_Configfileparser %stack_overflow { - $this->internalError = true; - $this->compiler->trigger_config_file_error('Stack overflow in configfile parser'); + $this->internalError = true; + $this->compiler->trigger_config_file_error('Stack overflow in configfile parser'); } // Complete config file diff --git a/include/smarty/src/Parser/TemplateParser.php b/include/smarty/src/Parser/TemplateParser.php new file mode 100644 index 000000000..772df98d0 --- /dev/null +++ b/include/smarty/src/Parser/TemplateParser.php @@ -0,0 +1,3178 @@ + +*/ +class TemplateParser +{ +// line 35 "src/Parser/TemplateParser.y" + + const ERR1 = 'Security error: Call to private object member not allowed'; + const ERR2 = 'Security error: Call to dynamic object member not allowed'; + + /** + * result status + * + * @var bool + */ + public $successful = true; + + /** + * return value + * + * @var mixed + */ + public $retvalue = 0; + + /** + * @var + */ + public $yymajor; + + /** + * last index of array variable + * + * @var mixed + */ + public $last_index; + + /** + * last variable name + * + * @var string + */ + public $last_variable; + + /** + * root parse tree buffer + * + * @var TemplateParseTree + */ + public $root_buffer; + + /** + * current parse tree object + * + * @var \Smarty\ParseTree\Base + */ + public $current_buffer; + + /** + * lexer object + * + * @var Lexer + */ + public $lex; + + /** + * internal error flag + * + * @var bool + */ + private $internalError = false; + + /** + * {strip} status + * + * @var bool + */ + public $strip = false; + /** + * compiler object + * + * @var TemplateCompiler + */ + public $compiler = null; + + /** + * smarty object + * + * @var \Smarty\Smarty + */ + public $smarty = null; + + /** + * template object + * + * @var \Smarty\Template + */ + public $template = null; + + /** + * block nesting level + * + * @var int + */ + public $block_nesting_level = 0; + + /** + * security object + * + * @var \Smarty\Security + */ + public $security = null; + + /** + * template prefix array + * + * @var \Smarty\ParseTree\Base[] + */ + public $template_prefix = array(); + + /** + * template prefix array + * + * @var \Smarty\ParseTree\Base[] + */ + public $template_postfix = array(); + + /** + * constructor + * + * @param Lexer $lex + * @param TemplateCompiler $compiler + */ + public function __construct(Lexer $lex, TemplateCompiler $compiler) + { + $this->lex = $lex; + $this->compiler = $compiler; + $this->template = $this->compiler->getTemplate(); + $this->smarty = $this->template->getSmarty(); + $this->security = $this->smarty->security_policy ?? false; + $this->current_buffer = $this->root_buffer = new TemplateParseTree(); + } + + /** + * insert PHP code in current buffer + * + * @param string $code + */ + public function insertPhpCode($code) + { + $this->current_buffer->append_subtree($this, new Tag($this, $code)); + } + + /** + * error rundown + * + */ + public function errorRunDown() + { + while ($this->yystack !== array()) { + $this->yy_pop_parser_stack(); + } + if (is_resource($this->yyTraceFILE)) { + fclose($this->yyTraceFILE); + } + } + + /** + * merge PHP code with prefix code and return parse tree tag object + * + * @param string $code + * + * @return Tag + */ + private function mergePrefixCode($code) + { + $tmp = ''; + foreach ($this->compiler->prefix_code as $preCode) { + $tmp .= $preCode; + } + $this->compiler->prefix_code = array(); + $tmp .= $code; + return new Tag($this, $this->compiler->processNocacheCode($tmp)); + } + + + const TP_VERT = 1; + const TP_COLON = 2; + const TP_TEXT = 3; + const TP_STRIPON = 4; + const TP_STRIPOFF = 5; + const TP_LITERALSTART = 6; + const TP_LITERALEND = 7; + const TP_LITERAL = 8; + const TP_SIMPELOUTPUT = 9; + const TP_SIMPLETAG = 10; + const TP_SMARTYBLOCKCHILDPARENT = 11; + const TP_LDEL = 12; + const TP_RDEL = 13; + const TP_DOLLARID = 14; + const TP_EQUAL = 15; + const TP_ID = 16; + const TP_PTR = 17; + const TP_LDELIF = 18; + const TP_LDELFOR = 19; + const TP_SEMICOLON = 20; + const TP_INCDEC = 21; + const TP_TO = 22; + const TP_STEP = 23; + const TP_LDELFOREACH = 24; + const TP_SPACE = 25; + const TP_AS = 26; + const TP_APTR = 27; + const TP_LDELSETFILTER = 28; + const TP_CLOSETAG = 29; + const TP_LDELSLASH = 30; + const TP_ATTR = 31; + const TP_INTEGER = 32; + const TP_COMMA = 33; + const TP_OPENP = 34; + const TP_CLOSEP = 35; + const TP_MATH = 36; + const TP_UNIMATH = 37; + const TP_ISIN = 38; + const TP_QMARK = 39; + const TP_NOT = 40; + const TP_TYPECAST = 41; + const TP_HEX = 42; + const TP_DOT = 43; + const TP_INSTANCEOF = 44; + const TP_SINGLEQUOTESTRING = 45; + const TP_DOUBLECOLON = 46; + const TP_NAMESPACE = 47; + const TP_AT = 48; + const TP_HATCH = 49; + const TP_OPENB = 50; + const TP_CLOSEB = 51; + const TP_DOLLAR = 52; + const TP_LOGOP = 53; + const TP_SLOGOP = 54; + const TP_TLOGOP = 55; + const TP_SINGLECOND = 56; + const TP_ARRAYOPEN = 57; + const TP_QUOTE = 58; + const TP_BACKTICK = 59; + const YY_NO_ACTION = 542; + const YY_ACCEPT_ACTION = 541; + const YY_ERROR_ACTION = 540; + + const YY_SZ_ACTTAB = 2565; +public static $yy_action = array( + 33, 106, 269, 306, 179, 305, 200, 247, 248, 249, + 1, 264, 138, 237, 202, 361, 6, 87, 284, 222, + 338, 361, 112, 107, 400, 321, 217, 261, 218, 130, + 224, 400, 21, 400, 49, 44, 400, 32, 45, 46, + 278, 226, 400, 282, 400, 203, 400, 53, 4, 139, + 302, 231, 28, 102, 225, 5, 54, 247, 248, 249, + 1, 20, 135, 192, 193, 271, 6, 87, 246, 222, + 216, 29, 112, 229, 7, 159, 217, 261, 218, 140, + 208, 272, 21, 509, 53, 44, 13, 302, 45, 46, + 278, 226, 149, 235, 153, 203, 257, 53, 4, 328, + 302, 302, 256, 304, 143, 5, 54, 247, 248, 249, + 1, 302, 100, 394, 86, 236, 6, 87, 3, 222, + 102, 257, 112, 144, 97, 394, 217, 261, 218, 102, + 224, 394, 21, 256, 446, 44, 178, 305, 45, 46, + 278, 226, 302, 282, 200, 203, 446, 53, 4, 115, + 302, 47, 22, 285, 41, 5, 54, 247, 248, 249, + 1, 139, 137, 267, 202, 141, 6, 87, 14, 222, + 541, 99, 112, 151, 15, 446, 217, 261, 218, 314, + 224, 216, 21, 256, 233, 44, 9, 446, 45, 46, + 278, 226, 325, 282, 268, 203, 53, 53, 4, 302, + 302, 152, 257, 361, 320, 5, 54, 247, 248, 249, + 1, 264, 137, 102, 194, 361, 6, 87, 37, 222, + 102, 361, 112, 257, 89, 316, 217, 261, 218, 314, + 224, 216, 21, 36, 49, 44, 200, 40, 45, 46, + 278, 226, 115, 282, 237, 203, 14, 53, 4, 115, + 302, 238, 15, 155, 107, 5, 54, 247, 248, 249, + 1, 466, 136, 256, 202, 200, 6, 87, 466, 222, + 255, 171, 112, 264, 446, 310, 217, 261, 218, 158, + 224, 257, 11, 142, 157, 44, 446, 183, 45, 46, + 278, 226, 26, 282, 256, 203, 49, 53, 4, 446, + 302, 184, 260, 323, 176, 5, 54, 247, 248, 249, + 1, 446, 137, 264, 189, 291, 6, 87, 183, 222, + 200, 302, 112, 253, 178, 305, 217, 261, 218, 263, + 213, 18, 21, 200, 184, 44, 49, 15, 45, 46, + 278, 226, 146, 282, 269, 203, 25, 53, 4, 220, + 302, 312, 107, 152, 290, 5, 54, 247, 248, 249, + 1, 219, 137, 147, 187, 130, 6, 87, 259, 222, + 16, 19, 112, 256, 167, 258, 217, 261, 218, 111, + 224, 173, 21, 96, 256, 44, 200, 23, 45, 46, + 278, 226, 177, 282, 227, 203, 335, 53, 4, 174, + 302, 180, 305, 170, 90, 5, 54, 247, 248, 249, + 1, 184, 137, 256, 202, 91, 6, 87, 482, 222, + 160, 482, 112, 214, 197, 482, 217, 261, 218, 184, + 188, 181, 21, 245, 302, 44, 164, 140, 45, 46, + 278, 226, 466, 282, 13, 203, 166, 53, 4, 466, + 302, 42, 43, 286, 12, 5, 54, 247, 248, 249, + 1, 264, 139, 447, 202, 40, 6, 87, 293, 294, + 295, 296, 112, 17, 311, 447, 217, 261, 218, 337, + 224, 183, 21, 260, 49, 48, 244, 245, 45, 46, + 278, 226, 24, 282, 303, 203, 8, 53, 4, 92, + 302, 42, 43, 286, 12, 5, 54, 247, 248, 249, + 1, 10, 139, 9, 202, 317, 6, 87, 293, 294, + 295, 296, 112, 116, 299, 35, 217, 261, 218, 225, + 224, 198, 21, 98, 34, 44, 329, 324, 45, 46, + 278, 226, 448, 282, 448, 203, 161, 53, 4, 172, + 302, 129, 175, 225, 232, 5, 54, 288, 215, 216, + 252, 101, 93, 109, 243, 191, 103, 85, 450, 162, + 450, 24, 101, 330, 182, 273, 274, 300, 298, 301, + 250, 251, 281, 204, 283, 113, 289, 262, 300, 298, + 301, 121, 288, 215, 216, 252, 270, 93, 109, 275, + 190, 103, 60, 277, 279, 225, 237, 101, 280, 297, + 273, 274, 129, 239, 199, 266, 107, 281, 204, 283, + 7, 289, 101, 300, 298, 301, 288, 88, 216, 254, + 163, 114, 109, 265, 191, 103, 85, 200, 300, 298, + 301, 101, 200, 259, 273, 274, 19, 165, 326, 362, + 258, 281, 204, 283, 396, 289, 234, 300, 298, 301, + 288, 362, 216, 327, 200, 114, 396, 362, 201, 119, + 72, 336, 396, 37, 259, 101, 393, 19, 273, 274, + 154, 258, 228, 339, 94, 281, 204, 283, 393, 289, + 256, 300, 298, 301, 393, 38, 314, 288, 314, 216, + 314, 314, 114, 207, 319, 201, 119, 72, 314, 314, + 314, 314, 101, 221, 184, 273, 274, 156, 314, 314, + 314, 95, 281, 204, 283, 314, 289, 256, 300, 298, + 301, 314, 314, 314, 288, 314, 216, 314, 314, 108, + 206, 319, 201, 122, 51, 314, 120, 314, 314, 101, + 314, 184, 273, 274, 314, 314, 314, 314, 314, 281, + 204, 283, 314, 289, 314, 300, 298, 301, 288, 314, + 216, 314, 314, 114, 314, 314, 201, 122, 67, 314, + 314, 314, 314, 101, 314, 314, 273, 274, 314, 314, + 314, 314, 314, 281, 204, 283, 314, 289, 314, 300, + 298, 301, 288, 314, 216, 314, 314, 114, 212, 314, + 201, 122, 67, 314, 314, 314, 314, 101, 314, 314, + 273, 274, 314, 314, 314, 314, 314, 281, 204, 283, + 314, 289, 314, 300, 298, 301, 288, 314, 216, 314, + 314, 114, 205, 314, 201, 119, 72, 314, 314, 314, + 314, 101, 314, 314, 273, 274, 314, 314, 314, 314, + 314, 281, 204, 283, 314, 289, 314, 300, 298, 301, + 314, 314, 314, 288, 314, 216, 314, 314, 114, 314, + 318, 201, 122, 78, 314, 314, 314, 314, 101, 314, + 482, 273, 274, 482, 314, 314, 314, 482, 281, 204, + 283, 314, 289, 209, 211, 298, 301, 288, 314, 216, + 314, 314, 108, 314, 314, 201, 122, 58, 314, 238, + 314, 314, 101, 314, 314, 273, 274, 314, 314, 482, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 288, 314, 216, 314, 314, 114, 314, 314, 201, + 118, 64, 314, 314, 314, 314, 101, 314, 314, 273, + 274, 314, 314, 314, 314, 314, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 288, 314, 216, 314, 314, + 114, 314, 314, 196, 117, 59, 314, 314, 314, 314, + 101, 314, 314, 273, 274, 314, 314, 314, 314, 314, + 281, 204, 283, 314, 289, 314, 300, 298, 301, 288, + 314, 216, 314, 314, 114, 314, 314, 201, 104, 84, + 314, 314, 314, 314, 101, 314, 314, 273, 274, 314, + 314, 314, 314, 314, 281, 204, 283, 314, 289, 314, + 300, 298, 301, 288, 314, 216, 314, 314, 114, 314, + 314, 201, 105, 83, 314, 314, 314, 314, 101, 314, + 314, 273, 274, 314, 314, 314, 314, 314, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 288, 314, 216, + 314, 314, 114, 314, 314, 201, 122, 55, 314, 314, + 314, 314, 101, 314, 314, 273, 274, 314, 314, 314, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 288, 314, 216, 314, 314, 114, 314, 314, 201, + 122, 66, 314, 314, 314, 314, 101, 314, 314, 273, + 274, 314, 314, 314, 314, 314, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 288, 314, 216, 314, 314, + 114, 314, 314, 201, 104, 56, 314, 314, 314, 314, + 101, 314, 314, 273, 274, 314, 314, 314, 314, 314, + 281, 204, 283, 314, 289, 314, 300, 298, 301, 288, + 314, 216, 314, 314, 114, 314, 314, 201, 122, 65, + 314, 314, 314, 314, 101, 314, 314, 273, 274, 314, + 314, 314, 314, 314, 281, 204, 283, 314, 289, 314, + 300, 298, 301, 288, 314, 216, 314, 314, 114, 314, + 314, 201, 122, 57, 314, 314, 314, 314, 101, 314, + 314, 273, 274, 314, 314, 314, 314, 314, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 288, 314, 216, + 314, 314, 114, 314, 314, 201, 122, 58, 314, 314, + 314, 314, 101, 314, 314, 273, 274, 314, 314, 314, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 288, 314, 216, 314, 314, 114, 314, 314, 201, + 122, 68, 314, 314, 314, 314, 101, 314, 314, 273, + 274, 314, 314, 314, 314, 314, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 288, 314, 216, 314, 314, + 114, 314, 314, 201, 122, 69, 314, 314, 314, 314, + 101, 314, 314, 273, 274, 314, 314, 314, 314, 314, + 281, 204, 283, 314, 289, 314, 300, 298, 301, 288, + 314, 216, 314, 314, 114, 314, 314, 201, 122, 70, + 314, 314, 314, 314, 101, 314, 314, 273, 274, 314, + 314, 314, 314, 314, 281, 204, 283, 314, 289, 314, + 300, 298, 301, 288, 314, 216, 314, 314, 114, 314, + 314, 201, 122, 71, 314, 314, 314, 314, 101, 314, + 314, 273, 274, 314, 314, 314, 314, 314, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 288, 314, 216, + 314, 314, 114, 314, 314, 201, 122, 73, 314, 314, + 314, 314, 101, 314, 314, 273, 274, 314, 314, 314, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 288, 314, 216, 314, 314, 114, 314, 314, 195, + 122, 61, 314, 314, 314, 314, 101, 314, 314, 273, + 274, 314, 314, 314, 314, 314, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 288, 314, 216, 314, 314, + 114, 314, 314, 201, 122, 62, 314, 314, 314, 314, + 101, 314, 314, 273, 274, 314, 314, 314, 314, 314, + 281, 204, 283, 314, 289, 314, 300, 298, 301, 288, + 314, 216, 314, 314, 114, 314, 314, 201, 122, 63, + 314, 314, 314, 314, 101, 314, 314, 273, 274, 314, + 314, 314, 314, 314, 281, 204, 283, 314, 289, 314, + 300, 298, 301, 288, 314, 216, 314, 314, 114, 314, + 314, 201, 122, 74, 314, 314, 314, 314, 101, 314, + 314, 273, 274, 314, 314, 314, 314, 314, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 288, 314, 216, + 314, 314, 114, 314, 314, 201, 122, 75, 314, 314, + 314, 314, 101, 314, 314, 273, 274, 314, 314, 314, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 288, 314, 216, 314, 314, 114, 314, 314, 201, + 122, 76, 314, 314, 314, 314, 101, 314, 314, 273, + 274, 314, 314, 314, 314, 314, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 288, 314, 216, 314, 314, + 114, 314, 314, 201, 122, 77, 314, 314, 314, 314, + 101, 314, 314, 273, 274, 314, 314, 314, 314, 314, + 281, 204, 283, 314, 289, 314, 300, 298, 301, 288, + 314, 216, 314, 314, 114, 314, 314, 201, 122, 79, + 314, 314, 314, 314, 101, 314, 314, 273, 274, 314, + 314, 314, 314, 314, 281, 204, 283, 314, 289, 314, + 210, 298, 301, 288, 314, 216, 314, 314, 114, 314, + 314, 201, 122, 80, 314, 314, 314, 314, 101, 314, + 314, 273, 274, 314, 314, 314, 314, 314, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 288, 314, 216, + 314, 314, 114, 314, 314, 201, 122, 81, 314, 314, + 314, 314, 101, 314, 314, 273, 274, 314, 314, 314, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 288, 314, 216, 314, 314, 114, 314, 314, 201, + 122, 82, 314, 314, 314, 314, 101, 314, 314, 273, + 274, 314, 314, 314, 314, 314, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 288, 314, 216, 314, 314, + 114, 314, 314, 201, 122, 50, 314, 314, 314, 314, + 101, 314, 314, 273, 274, 314, 314, 314, 314, 314, + 281, 204, 283, 314, 289, 314, 300, 298, 301, 288, + 314, 216, 314, 314, 114, 314, 314, 201, 122, 52, + 314, 314, 314, 314, 101, 314, 314, 273, 274, 314, + 314, 314, 314, 314, 281, 204, 283, 314, 289, 314, + 300, 298, 301, 288, 314, 216, 168, 314, 114, 314, + 314, 201, 134, 314, 314, 314, 256, 314, 101, 47, + 22, 285, 41, 314, 314, 314, 314, 333, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 288, 314, 216, + 145, 314, 114, 314, 314, 201, 128, 314, 314, 314, + 256, 314, 101, 47, 22, 285, 41, 314, 314, 314, + 314, 287, 281, 204, 283, 315, 289, 314, 300, 298, + 301, 247, 248, 249, 2, 314, 313, 314, 314, 314, + 6, 87, 259, 314, 314, 19, 112, 314, 14, 258, + 217, 261, 218, 314, 15, 39, 314, 14, 14, 42, + 43, 286, 12, 15, 15, 314, 314, 314, 42, 43, + 286, 12, 314, 314, 314, 314, 293, 294, 295, 296, + 308, 27, 314, 314, 315, 293, 294, 295, 296, 314, + 247, 248, 249, 2, 314, 313, 314, 110, 314, 6, + 87, 314, 314, 314, 314, 112, 314, 314, 148, 217, + 261, 218, 314, 42, 43, 286, 12, 314, 42, 43, + 286, 12, 314, 314, 314, 314, 314, 314, 314, 314, + 293, 294, 295, 296, 314, 293, 294, 295, 296, 309, + 27, 314, 314, 240, 241, 242, 133, 223, 314, 247, + 248, 249, 1, 314, 482, 314, 314, 482, 6, 87, + 3, 482, 466, 314, 112, 314, 276, 314, 217, 261, + 218, 288, 314, 216, 314, 314, 114, 314, 314, 201, + 132, 314, 314, 314, 314, 314, 101, 314, 466, 314, + 314, 466, 314, 482, 314, 466, 281, 204, 283, 314, + 289, 314, 300, 298, 301, 314, 288, 314, 216, 314, + 200, 114, 314, 314, 201, 123, 314, 314, 314, 314, + 314, 101, 365, 314, 314, 314, 230, 314, 314, 314, + 314, 281, 204, 283, 14, 289, 314, 300, 298, 301, + 15, 314, 288, 446, 216, 314, 169, 114, 314, 314, + 201, 124, 314, 314, 314, 446, 256, 101, 314, 47, + 22, 285, 41, 314, 314, 314, 314, 281, 204, 283, + 314, 289, 314, 300, 298, 301, 314, 288, 314, 216, + 314, 314, 114, 314, 314, 201, 125, 314, 314, 314, + 314, 314, 101, 314, 314, 314, 314, 314, 314, 314, + 314, 314, 281, 204, 283, 314, 289, 314, 300, 298, + 301, 314, 314, 288, 314, 216, 314, 314, 114, 314, + 314, 201, 126, 314, 314, 314, 314, 314, 101, 314, + 314, 314, 314, 314, 314, 314, 314, 314, 281, 204, + 283, 314, 289, 314, 300, 298, 301, 314, 288, 314, + 216, 314, 314, 114, 314, 314, 201, 127, 314, 314, + 314, 314, 314, 101, 314, 314, 314, 314, 314, 314, + 314, 314, 314, 281, 204, 283, 314, 289, 314, 300, + 298, 301, 314, 314, 288, 314, 216, 223, 314, 114, + 314, 314, 201, 131, 482, 314, 314, 482, 314, 101, + 314, 482, 466, 314, 314, 314, 276, 314, 314, 281, + 204, 283, 314, 289, 314, 300, 298, 301, 314, 314, + 409, 314, 314, 314, 314, 314, 314, 314, 466, 314, + 314, 466, 314, 482, 223, 466, 292, 314, 314, 314, + 314, 482, 314, 314, 482, 314, 314, 36, 482, 466, + 314, 223, 446, 276, 409, 409, 409, 409, 482, 314, + 314, 482, 314, 314, 446, 482, 466, 314, 314, 30, + 276, 409, 409, 409, 409, 466, 482, 314, 466, 482, + 482, 314, 466, 482, 466, 314, 314, 314, 276, 314, + 314, 314, 466, 314, 314, 466, 332, 482, 314, 466, + 314, 314, 314, 314, 314, 331, 42, 43, 286, 12, + 466, 314, 314, 466, 314, 482, 314, 466, 314, 42, + 43, 286, 12, 293, 294, 295, 296, 307, 314, 42, + 43, 286, 12, 185, 314, 314, 293, 294, 295, 296, + 186, 314, 314, 314, 322, 314, 293, 294, 295, 296, + 42, 43, 286, 12, 31, 314, 42, 43, 286, 12, + 314, 334, 314, 42, 43, 286, 12, 293, 294, 295, + 296, 314, 314, 293, 294, 295, 296, 314, 314, 314, + 293, 294, 295, 296, 42, 43, 286, 12, 42, 43, + 286, 12, 482, 314, 314, 482, 314, 314, 314, 482, + 466, 293, 294, 295, 296, 293, 294, 295, 296, 314, + 314, 314, 259, 314, 314, 19, 314, 314, 314, 258, + 314, 314, 314, 314, 314, 314, 466, 314, 14, 466, + 150, 482, 314, 466, 15, + ); + public static $yy_lookahead = array( + 2, 80, 100, 13, 102, 103, 1, 9, 10, 11, + 12, 21, 14, 70, 16, 25, 18, 19, 93, 21, + 77, 31, 24, 80, 13, 104, 28, 29, 30, 104, + 32, 20, 34, 22, 44, 37, 25, 39, 40, 41, + 42, 43, 31, 45, 33, 47, 35, 49, 50, 14, + 52, 16, 12, 17, 43, 57, 58, 9, 10, 11, + 12, 12, 14, 14, 16, 16, 18, 19, 65, 21, + 67, 12, 24, 14, 34, 16, 28, 29, 30, 43, + 32, 32, 34, 1, 49, 37, 50, 52, 40, 41, + 42, 43, 72, 45, 99, 47, 101, 49, 50, 51, + 52, 52, 82, 69, 14, 57, 58, 9, 10, 11, + 12, 52, 14, 13, 16, 15, 18, 19, 15, 21, + 17, 101, 24, 72, 34, 25, 28, 29, 30, 17, + 32, 31, 34, 82, 34, 37, 102, 103, 40, 41, + 42, 43, 52, 45, 1, 47, 46, 49, 50, 46, + 52, 85, 86, 87, 88, 57, 58, 9, 10, 11, + 12, 14, 14, 16, 16, 80, 18, 19, 25, 21, + 61, 62, 24, 72, 31, 34, 28, 29, 30, 65, + 32, 67, 34, 82, 43, 37, 33, 46, 40, 41, + 42, 43, 51, 45, 47, 47, 49, 49, 50, 52, + 52, 99, 101, 13, 51, 57, 58, 9, 10, 11, + 12, 21, 14, 17, 16, 25, 18, 19, 15, 21, + 17, 31, 24, 101, 110, 111, 28, 29, 30, 65, + 32, 67, 34, 15, 44, 37, 1, 2, 40, 41, + 42, 43, 46, 45, 70, 47, 25, 49, 50, 46, + 52, 77, 31, 72, 80, 57, 58, 9, 10, 11, + 12, 43, 14, 82, 16, 1, 18, 19, 50, 21, + 82, 76, 24, 21, 34, 111, 28, 29, 30, 99, + 32, 101, 34, 14, 72, 37, 46, 106, 40, 41, + 42, 43, 27, 45, 82, 47, 44, 49, 50, 34, + 52, 106, 107, 51, 76, 57, 58, 9, 10, 11, + 12, 46, 14, 21, 16, 51, 18, 19, 106, 21, + 1, 52, 24, 69, 102, 103, 28, 29, 30, 16, + 32, 25, 34, 1, 106, 37, 44, 31, 40, 41, + 42, 43, 70, 45, 100, 47, 27, 49, 50, 17, + 52, 59, 80, 99, 93, 57, 58, 9, 10, 11, + 12, 48, 14, 72, 16, 104, 18, 19, 9, 21, + 20, 12, 24, 82, 72, 16, 28, 29, 30, 79, + 32, 76, 34, 33, 82, 37, 1, 2, 40, 41, + 42, 43, 14, 45, 16, 47, 14, 49, 50, 76, + 52, 102, 103, 72, 80, 57, 58, 9, 10, 11, + 12, 106, 14, 82, 16, 80, 18, 19, 9, 21, + 99, 12, 24, 63, 64, 16, 28, 29, 30, 106, + 32, 6, 34, 8, 52, 37, 99, 43, 40, 41, + 42, 43, 43, 45, 50, 47, 99, 49, 50, 50, + 52, 36, 37, 38, 39, 57, 58, 9, 10, 11, + 12, 21, 14, 34, 16, 2, 18, 19, 53, 54, + 55, 56, 24, 15, 59, 46, 28, 29, 30, 21, + 32, 106, 34, 107, 44, 37, 7, 8, 40, 41, + 42, 43, 33, 45, 35, 47, 34, 49, 50, 99, + 52, 36, 37, 38, 39, 57, 58, 9, 10, 11, + 12, 34, 14, 33, 16, 35, 18, 19, 53, 54, + 55, 56, 24, 46, 103, 15, 28, 29, 30, 43, + 32, 64, 34, 81, 33, 37, 35, 51, 40, 41, + 42, 43, 33, 45, 35, 47, 99, 49, 50, 81, + 52, 70, 81, 43, 73, 57, 58, 65, 66, 67, + 68, 80, 70, 71, 7, 73, 74, 75, 33, 99, + 35, 33, 80, 35, 16, 83, 84, 96, 97, 98, + 13, 13, 90, 91, 92, 16, 94, 16, 96, 97, + 98, 16, 65, 66, 67, 68, 16, 70, 71, 14, + 73, 74, 75, 16, 32, 43, 70, 80, 32, 16, + 83, 84, 70, 77, 78, 73, 80, 90, 91, 92, + 34, 94, 80, 96, 97, 98, 65, 16, 67, 68, + 49, 70, 71, 91, 73, 74, 75, 1, 96, 97, + 98, 80, 1, 9, 83, 84, 12, 49, 51, 13, + 16, 90, 91, 92, 13, 94, 16, 96, 97, 98, + 65, 25, 67, 51, 1, 70, 25, 31, 73, 74, + 75, 16, 31, 15, 9, 80, 13, 12, 83, 84, + 72, 16, 48, 35, 76, 90, 91, 92, 25, 94, + 82, 96, 97, 98, 31, 22, 112, 65, 112, 67, + 112, 112, 70, 108, 109, 73, 74, 75, 112, 112, + 112, 112, 80, 48, 106, 83, 84, 72, 112, 112, + 112, 76, 90, 91, 92, 112, 94, 82, 96, 97, + 98, 112, 112, 112, 65, 112, 67, 112, 112, 70, + 108, 109, 73, 74, 75, 112, 77, 112, 112, 80, + 112, 106, 83, 84, 112, 112, 112, 112, 112, 90, + 91, 92, 112, 94, 112, 96, 97, 98, 65, 112, + 67, 112, 112, 70, 112, 112, 73, 74, 75, 112, + 112, 112, 112, 80, 112, 112, 83, 84, 112, 112, + 112, 112, 112, 90, 91, 92, 112, 94, 112, 96, + 97, 98, 65, 112, 67, 112, 112, 70, 105, 112, + 73, 74, 75, 112, 112, 112, 112, 80, 112, 112, + 83, 84, 112, 112, 112, 112, 112, 90, 91, 92, + 112, 94, 112, 96, 97, 98, 65, 112, 67, 112, + 112, 70, 105, 112, 73, 74, 75, 112, 112, 112, + 112, 80, 112, 112, 83, 84, 112, 112, 112, 112, + 112, 90, 91, 92, 112, 94, 112, 96, 97, 98, + 112, 112, 112, 65, 112, 67, 112, 112, 70, 112, + 109, 73, 74, 75, 112, 112, 112, 112, 80, 112, + 9, 83, 84, 12, 112, 112, 112, 16, 90, 91, + 92, 112, 94, 95, 96, 97, 98, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 75, 112, 77, + 112, 112, 80, 112, 112, 83, 84, 112, 112, 48, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 75, 112, 112, 112, 112, 80, 112, 112, 83, + 84, 112, 112, 112, 112, 112, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 65, 112, 67, 112, 112, + 70, 112, 112, 73, 74, 75, 112, 112, 112, 112, + 80, 112, 112, 83, 84, 112, 112, 112, 112, 112, + 90, 91, 92, 112, 94, 112, 96, 97, 98, 65, + 112, 67, 112, 112, 70, 112, 112, 73, 74, 75, + 112, 112, 112, 112, 80, 112, 112, 83, 84, 112, + 112, 112, 112, 112, 90, 91, 92, 112, 94, 112, + 96, 97, 98, 65, 112, 67, 112, 112, 70, 112, + 112, 73, 74, 75, 112, 112, 112, 112, 80, 112, + 112, 83, 84, 112, 112, 112, 112, 112, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 75, 112, 112, + 112, 112, 80, 112, 112, 83, 84, 112, 112, 112, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 75, 112, 112, 112, 112, 80, 112, 112, 83, + 84, 112, 112, 112, 112, 112, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 65, 112, 67, 112, 112, + 70, 112, 112, 73, 74, 75, 112, 112, 112, 112, + 80, 112, 112, 83, 84, 112, 112, 112, 112, 112, + 90, 91, 92, 112, 94, 112, 96, 97, 98, 65, + 112, 67, 112, 112, 70, 112, 112, 73, 74, 75, + 112, 112, 112, 112, 80, 112, 112, 83, 84, 112, + 112, 112, 112, 112, 90, 91, 92, 112, 94, 112, + 96, 97, 98, 65, 112, 67, 112, 112, 70, 112, + 112, 73, 74, 75, 112, 112, 112, 112, 80, 112, + 112, 83, 84, 112, 112, 112, 112, 112, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 75, 112, 112, + 112, 112, 80, 112, 112, 83, 84, 112, 112, 112, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 75, 112, 112, 112, 112, 80, 112, 112, 83, + 84, 112, 112, 112, 112, 112, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 65, 112, 67, 112, 112, + 70, 112, 112, 73, 74, 75, 112, 112, 112, 112, + 80, 112, 112, 83, 84, 112, 112, 112, 112, 112, + 90, 91, 92, 112, 94, 112, 96, 97, 98, 65, + 112, 67, 112, 112, 70, 112, 112, 73, 74, 75, + 112, 112, 112, 112, 80, 112, 112, 83, 84, 112, + 112, 112, 112, 112, 90, 91, 92, 112, 94, 112, + 96, 97, 98, 65, 112, 67, 112, 112, 70, 112, + 112, 73, 74, 75, 112, 112, 112, 112, 80, 112, + 112, 83, 84, 112, 112, 112, 112, 112, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 75, 112, 112, + 112, 112, 80, 112, 112, 83, 84, 112, 112, 112, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 75, 112, 112, 112, 112, 80, 112, 112, 83, + 84, 112, 112, 112, 112, 112, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 65, 112, 67, 112, 112, + 70, 112, 112, 73, 74, 75, 112, 112, 112, 112, + 80, 112, 112, 83, 84, 112, 112, 112, 112, 112, + 90, 91, 92, 112, 94, 112, 96, 97, 98, 65, + 112, 67, 112, 112, 70, 112, 112, 73, 74, 75, + 112, 112, 112, 112, 80, 112, 112, 83, 84, 112, + 112, 112, 112, 112, 90, 91, 92, 112, 94, 112, + 96, 97, 98, 65, 112, 67, 112, 112, 70, 112, + 112, 73, 74, 75, 112, 112, 112, 112, 80, 112, + 112, 83, 84, 112, 112, 112, 112, 112, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 75, 112, 112, + 112, 112, 80, 112, 112, 83, 84, 112, 112, 112, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 75, 112, 112, 112, 112, 80, 112, 112, 83, + 84, 112, 112, 112, 112, 112, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 65, 112, 67, 112, 112, + 70, 112, 112, 73, 74, 75, 112, 112, 112, 112, + 80, 112, 112, 83, 84, 112, 112, 112, 112, 112, + 90, 91, 92, 112, 94, 112, 96, 97, 98, 65, + 112, 67, 112, 112, 70, 112, 112, 73, 74, 75, + 112, 112, 112, 112, 80, 112, 112, 83, 84, 112, + 112, 112, 112, 112, 90, 91, 92, 112, 94, 112, + 96, 97, 98, 65, 112, 67, 112, 112, 70, 112, + 112, 73, 74, 75, 112, 112, 112, 112, 80, 112, + 112, 83, 84, 112, 112, 112, 112, 112, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 75, 112, 112, + 112, 112, 80, 112, 112, 83, 84, 112, 112, 112, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 75, 112, 112, 112, 112, 80, 112, 112, 83, + 84, 112, 112, 112, 112, 112, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 65, 112, 67, 112, 112, + 70, 112, 112, 73, 74, 75, 112, 112, 112, 112, + 80, 112, 112, 83, 84, 112, 112, 112, 112, 112, + 90, 91, 92, 112, 94, 112, 96, 97, 98, 65, + 112, 67, 112, 112, 70, 112, 112, 73, 74, 75, + 112, 112, 112, 112, 80, 112, 112, 83, 84, 112, + 112, 112, 112, 112, 90, 91, 92, 112, 94, 112, + 96, 97, 98, 65, 112, 67, 72, 112, 70, 112, + 112, 73, 74, 112, 112, 112, 82, 112, 80, 85, + 86, 87, 88, 112, 112, 112, 112, 89, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 65, 112, 67, + 72, 112, 70, 112, 112, 73, 74, 112, 112, 112, + 82, 112, 80, 85, 86, 87, 88, 112, 112, 112, + 112, 89, 90, 91, 92, 3, 94, 112, 96, 97, + 98, 9, 10, 11, 12, 112, 14, 112, 112, 112, + 18, 19, 9, 112, 112, 12, 24, 112, 25, 16, + 28, 29, 30, 112, 31, 23, 112, 25, 25, 36, + 37, 38, 39, 31, 31, 112, 112, 112, 36, 37, + 38, 39, 112, 112, 112, 112, 53, 54, 55, 56, + 58, 59, 112, 112, 3, 53, 54, 55, 56, 112, + 9, 10, 11, 12, 112, 14, 112, 20, 112, 18, + 19, 112, 112, 112, 112, 24, 112, 112, 26, 28, + 29, 30, 112, 36, 37, 38, 39, 112, 36, 37, + 38, 39, 112, 112, 112, 112, 112, 112, 112, 112, + 53, 54, 55, 56, 112, 53, 54, 55, 56, 58, + 59, 112, 112, 3, 4, 5, 6, 2, 112, 9, + 10, 11, 12, 112, 9, 112, 112, 12, 18, 19, + 15, 16, 17, 112, 24, 112, 21, 112, 28, 29, + 30, 65, 112, 67, 112, 112, 70, 112, 112, 73, + 74, 112, 112, 112, 112, 112, 80, 112, 43, 112, + 112, 46, 112, 48, 112, 50, 90, 91, 92, 112, + 94, 112, 96, 97, 98, 112, 65, 112, 67, 112, + 1, 70, 112, 112, 73, 74, 112, 112, 112, 112, + 112, 80, 13, 112, 112, 112, 17, 112, 112, 112, + 112, 90, 91, 92, 25, 94, 112, 96, 97, 98, + 31, 112, 65, 34, 67, 112, 72, 70, 112, 112, + 73, 74, 112, 112, 112, 46, 82, 80, 112, 85, + 86, 87, 88, 112, 112, 112, 112, 90, 91, 92, + 112, 94, 112, 96, 97, 98, 112, 65, 112, 67, + 112, 112, 70, 112, 112, 73, 74, 112, 112, 112, + 112, 112, 80, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 90, 91, 92, 112, 94, 112, 96, 97, + 98, 112, 112, 65, 112, 67, 112, 112, 70, 112, + 112, 73, 74, 112, 112, 112, 112, 112, 80, 112, + 112, 112, 112, 112, 112, 112, 112, 112, 90, 91, + 92, 112, 94, 112, 96, 97, 98, 112, 65, 112, + 67, 112, 112, 70, 112, 112, 73, 74, 112, 112, + 112, 112, 112, 80, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 90, 91, 92, 112, 94, 112, 96, + 97, 98, 112, 112, 65, 112, 67, 2, 112, 70, + 112, 112, 73, 74, 9, 112, 112, 12, 112, 80, + 112, 16, 17, 112, 112, 112, 21, 112, 112, 90, + 91, 92, 112, 94, 112, 96, 97, 98, 112, 112, + 2, 112, 112, 112, 112, 112, 112, 112, 43, 112, + 112, 46, 112, 48, 2, 50, 51, 112, 112, 112, + 112, 9, 112, 112, 12, 112, 112, 15, 16, 17, + 112, 2, 34, 21, 36, 37, 38, 39, 9, 112, + 112, 12, 112, 112, 46, 16, 17, 112, 112, 2, + 21, 53, 54, 55, 56, 43, 9, 112, 46, 12, + 48, 112, 50, 16, 17, 112, 112, 112, 21, 112, + 112, 112, 43, 112, 112, 46, 13, 48, 112, 50, + 112, 112, 112, 112, 112, 35, 36, 37, 38, 39, + 43, 112, 112, 46, 112, 48, 112, 50, 112, 36, + 37, 38, 39, 53, 54, 55, 56, 13, 112, 36, + 37, 38, 39, 13, 112, 112, 53, 54, 55, 56, + 13, 112, 112, 112, 51, 112, 53, 54, 55, 56, + 36, 37, 38, 39, 2, 112, 36, 37, 38, 39, + 112, 13, 112, 36, 37, 38, 39, 53, 54, 55, + 56, 112, 112, 53, 54, 55, 56, 112, 112, 112, + 53, 54, 55, 56, 36, 37, 38, 39, 36, 37, + 38, 39, 9, 112, 112, 12, 112, 112, 112, 16, + 17, 53, 54, 55, 56, 53, 54, 55, 56, 112, + 112, 112, 9, 112, 112, 12, 112, 112, 112, 16, + 112, 112, 112, 112, 112, 112, 43, 112, 25, 46, + 27, 48, 112, 50, 31, +); + const YY_SHIFT_USE_DFLT = -11; + const YY_SHIFT_MAX = 239; + public static $yy_shift_ofst = array( + -11, 98, 98, 148, 198, 198, 248, 148, 148, 198, + 148, 248, -2, 48, 298, 148, 148, 148, 298, 148, + 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, + 348, 148, 148, 148, 148, 148, 398, 148, 148, 148, + 448, 498, 498, 498, 498, 498, 498, 498, 498, 147, + 1962, 1953, 1953, 35, 1952, 2007, 2012, 2413, 2400, 2423, + 2444, 415, 2450, 2457, 2482, 2478, 465, 465, 465, 465, + 465, 465, 465, 465, 465, 465, 465, 465, 465, 465, + 465, 465, 465, 465, 465, 465, 2139, 90, 143, 2011, + 2533, 1963, 36, 103, 143, 143, 90, 90, 235, 2070, + 2075, 634, 59, 636, 641, 663, 359, 359, 203, 221, + 269, 221, 306, 332, 196, 378, 378, 264, 385, 319, + 221, 5, 5, 5, 5, 5, 5, 5, 5, 112, + 112, 82, 5, -11, -11, 2315, 2362, 2379, 2397, 2513, + 49, 665, 409, 218, 221, 221, 458, 221, 382, 221, + 382, 221, 394, 394, 221, 221, 221, 221, 394, 40, + 394, 394, 394, 399, 394, 399, 394, 221, 221, 221, + 221, 5, 463, 5, 5, 463, 5, 462, 112, 112, + 112, -11, -11, -11, -11, -11, -11, 2348, 11, 100, + -10, 190, 881, 141, 265, 292, 252, 425, 479, 350, + 313, 440, 240, 429, 477, 459, 480, 153, 486, 501, + 509, 535, 538, 510, 557, 567, 568, 558, 569, 571, + 575, 580, 585, 587, 562, 572, 576, 586, 593, 462, + 611, 581, 598, 640, 597, 612, 655, 658, 648, 673, +); + const YY_REDUCE_USE_DFLT = -99; + const YY_REDUCE_MAX = 186; + public static $yy_reduce_ofst = array( + 109, 492, 527, 561, 595, 632, 669, 703, 737, 771, + 808, 842, 876, 910, 944, 978, 1012, 1046, 1080, 1114, + 1148, 1182, 1216, 1250, 1284, 1318, 1352, 1386, 1420, 1454, + 1488, 1522, 1556, 1590, 1624, 1658, 1692, 1726, 1760, 1794, + 1828, 1862, 2036, 2071, 2107, 2142, 2178, 2213, 2249, 542, + 1824, 1858, 2104, 481, 114, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 608, 536, 645, 164, + 20, 101, -98, 34, 181, 212, -57, 174, 195, 3, + 254, -5, -79, 228, 228, 228, 180, -5, 222, 51, + 272, 291, 302, 305, 222, -75, 261, 228, 228, 228, + 331, 323, 228, 228, 228, 228, 228, 228, 228, 222, + 299, 228, 228, 360, 228, 102, 102, 102, 102, 102, + 85, 122, 102, 102, 188, 188, 300, 188, 324, 188, + 335, 188, 244, 244, 188, 188, 188, 188, 244, 321, + 244, 244, 244, 337, 244, 347, 244, 188, 188, 188, + 188, 375, 376, 375, 375, 376, 375, 400, 421, 421, + 421, 467, 452, 468, 471, 447, 470, +); + public static $yyExpectedTokens = array( + array(), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(2, 9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 39, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 51, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ), + array(14, 16, 47, 49, 52, ), + array(23, 25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(14, 16, 49, 52, ), + array(3, 9, 10, 11, 12, 14, 18, 19, 24, 28, 29, 30, 58, 59, ), + array(20, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(26, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(13, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(35, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 51, 53, 54, 55, 56, ), + array(13, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, 59, ), + array(13, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(13, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(2, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(13, 36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(36, 37, 38, 39, 53, 54, 55, 56, ), + array(1, 13, 17, 25, 31, 34, 46, ), + array(14, 34, 52, ), + array(1, 25, 31, ), + array(3, 9, 10, 11, 12, 14, 18, 19, 24, 28, 29, 30, 58, 59, ), + array(9, 12, 16, 25, 27, 31, ), + array(9, 12, 16, 25, 31, ), + array(17, 43, 50, ), + array(15, 17, 46, ), + array(1, 25, 31, ), + array(1, 25, 31, ), + array(14, 34, 52, ), + array(14, 34, 52, ), + array(1, 2, ), + array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 24, 28, 29, 30, ), + array(2, 9, 12, 15, 16, 17, 21, 43, 46, 48, 50, ), + array(9, 12, 16, 48, ), + array(12, 14, 16, 52, ), + array(1, 13, 25, 31, ), + array(1, 13, 25, 31, ), + array(1, 13, 25, 31, ), + array(9, 12, 16, ), + array(9, 12, 16, ), + array(15, 17, 46, ), + array(25, 31, ), + array(14, 52, ), + array(25, 31, ), + array(25, 31, ), + array(1, 17, ), + array(17, 46, ), + array(14, 16, ), + array(14, 16, ), + array(1, 51, ), + array(1, 2, ), + array(1, 27, ), + array(25, 31, ), + array(1, ), + array(1, ), + array(1, ), + array(1, ), + array(1, ), + array(1, ), + array(1, ), + array(1, ), + array(17, ), + array(17, ), + array(1, ), + array(1, ), + array(), + array(), + array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, 51, ), + array(2, 9, 12, 15, 16, 17, 21, 43, 46, 48, 50, ), + array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, ), + array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, ), + array(9, 12, 16, 17, 43, 46, 48, 50, ), + array(12, 14, 16, 32, 52, ), + array(9, 12, 16, 48, ), + array(9, 12, 16, ), + array(15, 43, 50, ), + array(25, 31, ), + array(25, 31, ), + array(15, 21, ), + array(25, 31, ), + array(14, 52, ), + array(25, 31, ), + array(14, 52, ), + array(25, 31, ), + array(43, 50, ), + array(43, 50, ), + array(25, 31, ), + array(25, 31, ), + array(25, 31, ), + array(25, 31, ), + array(43, 50, ), + array(12, 34, ), + array(43, 50, ), + array(43, 50, ), + array(43, 50, ), + array(43, 50, ), + array(43, 50, ), + array(43, 50, ), + array(43, 50, ), + array(25, 31, ), + array(25, 31, ), + array(25, 31, ), + array(25, 31, ), + array(1, ), + array(2, ), + array(1, ), + array(1, ), + array(2, ), + array(1, ), + array(34, ), + array(17, ), + array(17, ), + array(17, ), + array(), + array(), + array(), + array(), + array(), + array(), + array(2, 34, 36, 37, 38, 39, 46, 53, 54, 55, 56, ), + array(13, 20, 22, 25, 31, 33, 35, 43, ), + array(13, 15, 25, 31, 34, 46, ), + array(13, 21, 25, 31, 44, ), + array(13, 21, 25, 31, 44, ), + array(9, 12, 16, 48, ), + array(34, 43, 46, 51, ), + array(27, 34, 46, ), + array(21, 44, 59, ), + array(21, 44, 51, ), + array(6, 8, ), + array(7, 8, ), + array(20, 33, ), + array(16, 48, ), + array(21, 44, ), + array(34, 46, ), + array(34, 46, ), + array(34, 46, ), + array(33, 35, ), + array(33, 35, ), + array(33, 51, ), + array(43, 51, ), + array(33, 35, ), + array(33, 35, ), + array(33, 35, ), + array(33, 35, ), + array(15, 43, ), + array(7, ), + array(13, ), + array(13, ), + array(16, ), + array(16, ), + array(16, ), + array(16, ), + array(16, ), + array(14, ), + array(16, ), + array(43, ), + array(32, ), + array(32, ), + array(34, ), + array(16, ), + array(34, ), + array(16, ), + array(49, ), + array(49, ), + array(16, ), + array(51, ), + array(51, ), + array(16, ), + array(15, ), + array(35, ), + array(22, ), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), +); + public static $yy_default = array( + 350, 540, 540, 540, 525, 525, 540, 501, 501, 524, + 452, 540, 540, 540, 540, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + 390, 369, 390, 540, 540, 540, 395, 540, 540, 540, + 363, 540, 540, 540, 540, 540, 374, 500, 413, 420, + 499, 526, 528, 527, 419, 421, 418, 422, 451, 449, + 397, 401, 402, 392, 395, 363, 433, 540, 390, 540, + 390, 390, 514, 454, 390, 390, 540, 540, 381, 340, + 453, 466, 540, 404, 404, 404, 466, 466, 454, 390, + 540, 390, 390, 384, 454, 540, 540, 404, 404, 404, + 371, 386, 404, 411, 424, 425, 426, 412, 417, 454, + 511, 424, 410, 348, 508, 453, 453, 453, 453, 453, + 540, 468, 466, 482, 360, 370, 540, 373, 540, 378, + 540, 379, 463, 464, 364, 366, 367, 368, 492, 466, + 491, 494, 493, 457, 458, 459, 460, 380, 376, 377, + 372, 382, 502, 385, 387, 503, 442, 466, 488, 515, + 512, 348, 507, 507, 507, 466, 466, 433, 429, 433, + 423, 423, 467, 433, 433, 423, 423, 346, 540, 540, + 540, 423, 433, 443, 540, 540, 540, 540, 429, 540, + 461, 461, 540, 429, 540, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 429, 431, 540, 513, 540, 482, + 540, 540, 540, 540, 540, 438, 540, 540, 540, 398, + 341, 342, 343, 344, 345, 347, 349, 351, 352, 353, + 354, 355, 356, 357, 359, 388, 389, 484, 485, 486, + 506, 383, 504, 505, 427, 436, 437, 446, 447, 465, + 469, 470, 471, 405, 406, 407, 408, 409, 428, 430, + 432, 434, 438, 439, 440, 414, 415, 416, 441, 444, + 445, 479, 477, 516, 517, 518, 519, 455, 456, 490, + 461, 462, 483, 498, 358, 489, 536, 537, 529, 530, + 531, 534, 533, 535, 538, 539, 532, 521, 523, 522, + 520, 495, 480, 478, 476, 473, 474, 475, 481, 496, + 497, 435, 472, 510, 487, 482, 391, 375, 399, 403, +); + const YYNOCODE = 113; + const YYSTACKDEPTH = 500; + const YYNSTATE = 340; + const YYNRULE = 200; + const YYERRORSYMBOL = 60; + const YYERRSYMDT = 'yy0'; + const YYFALLBACK = 0; + public static $yyFallback = array( + ); + public function Trace($TraceFILE, $zTracePrompt) + { + if (!$TraceFILE) { + $zTracePrompt = 0; + } elseif (!$zTracePrompt) { + $TraceFILE = 0; + } + $this->yyTraceFILE = $TraceFILE; + $this->yyTracePrompt = $zTracePrompt; + } + + public function PrintTrace() + { + $this->yyTraceFILE = fopen('php://output', 'w'); + $this->yyTracePrompt = '
    '; + } + + public $yyTraceFILE; + public $yyTracePrompt; + public $yyidx; /* Index of top element in stack */ + public $yyerrcnt; /* Shifts left before out of the error */ + public $yystack = array(); /* The parser's stack */ + + public $yyTokenName = array( + '$', 'VERT', 'COLON', 'TEXT', + 'STRIPON', 'STRIPOFF', 'LITERALSTART', 'LITERALEND', + 'LITERAL', 'SIMPELOUTPUT', 'SIMPLETAG', 'SMARTYBLOCKCHILDPARENT', + 'LDEL', 'RDEL', 'DOLLARID', 'EQUAL', + 'ID', 'PTR', 'LDELIF', 'LDELFOR', + 'SEMICOLON', 'INCDEC', 'TO', 'STEP', + 'LDELFOREACH', 'SPACE', 'AS', 'APTR', + 'LDELSETFILTER', 'CLOSETAG', 'LDELSLASH', 'ATTR', + 'INTEGER', 'COMMA', 'OPENP', 'CLOSEP', + 'MATH', 'UNIMATH', 'ISIN', 'QMARK', + 'NOT', 'TYPECAST', 'HEX', 'DOT', + 'INSTANCEOF', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', + 'AT', 'HATCH', 'OPENB', 'CLOSEB', + 'DOLLAR', 'LOGOP', 'SLOGOP', 'TLOGOP', + 'SINGLECOND', 'ARRAYOPEN', 'QUOTE', 'BACKTICK', + 'error', 'start', 'template', 'literal_e2', + 'literal_e1', 'smartytag', 'tagbody', 'tag', + 'outattr', 'eqoutattr', 'varindexed', 'output', + 'attributes', 'variablevalue', 'value', 'expr', + 'modifierlist', 'statement', 'statements', 'foraction', + 'varvar', 'modparameters', 'attribute', 'nullcoalescing', + 'ternary', 'tlop', 'lop', 'scond', + 'isin', 'array', 'function', 'ns1', + 'doublequoted_with_quotes', 'static_class_access', 'arraydef', 'variablelist', + 'variable', 'object', 'configvariable', 'arrayindex', + 'indexdef', 'varvarele', 'objectchain', 'objectelement', + 'method', 'params', 'modifier', 'modparameter', + 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent', + ); + + public static $yyRuleName = array( + 'start ::= template', + 'template ::= template TEXT', + 'template ::= template STRIPON', + 'template ::= template STRIPOFF', + 'template ::= template LITERALSTART literal_e2 LITERALEND', + 'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND', + 'literal_e2 ::= literal_e1', + 'literal_e1 ::= literal_e1 LITERAL', + 'literal_e1 ::=', + 'template ::= template smartytag', + 'template ::=', + 'smartytag ::= SIMPELOUTPUT', + 'smartytag ::= SIMPLETAG', + 'smartytag ::= SMARTYBLOCKCHILDPARENT', + 'smartytag ::= LDEL tagbody RDEL', + 'smartytag ::= tag RDEL', + 'tagbody ::= outattr', + 'tagbody ::= DOLLARID eqoutattr', + 'tagbody ::= varindexed eqoutattr', + 'eqoutattr ::= EQUAL outattr', + 'outattr ::= output attributes', + 'output ::= variablevalue', + 'output ::= value', + 'output ::= expr', + 'tag ::= LDEL ID attributes', + 'tag ::= LDEL ID', + 'tag ::= LDEL ID modifierlist attributes', + 'tag ::= LDEL ID PTR ID attributes', + 'tag ::= LDEL ID PTR ID modifierlist attributes', + 'tag ::= LDELIF expr', + 'tag ::= LDELIF expr attributes', + 'tag ::= LDELIF statement', + 'tag ::= LDELIF statement attributes', + 'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes', + 'foraction ::= EQUAL expr', + 'foraction ::= INCDEC', + 'tag ::= LDELFOR statement TO expr attributes', + 'tag ::= LDELFOR statement TO expr STEP expr attributes', + 'tag ::= LDELFOREACH SPACE expr AS varvar attributes', + 'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes', + 'tag ::= LDELFOREACH attributes', + 'tag ::= LDELSETFILTER ID modparameters', + 'tag ::= LDELSETFILTER ID modparameters modifierlist', + 'smartytag ::= CLOSETAG', + 'tag ::= LDELSLASH ID', + 'tag ::= LDELSLASH ID modifierlist', + 'tag ::= LDELSLASH ID PTR ID', + 'tag ::= LDELSLASH ID PTR ID modifierlist', + 'attributes ::= attributes attribute', + 'attributes ::= attribute', + 'attributes ::=', + 'attribute ::= SPACE ID EQUAL ID', + 'attribute ::= ATTR expr', + 'attribute ::= ATTR value', + 'attribute ::= SPACE ID', + 'attribute ::= SPACE expr', + 'attribute ::= SPACE value', + 'attribute ::= SPACE INTEGER EQUAL expr', + 'statements ::= statement', + 'statements ::= statements COMMA statement', + 'statement ::= DOLLARID EQUAL INTEGER', + 'statement ::= DOLLARID EQUAL expr', + 'statement ::= varindexed EQUAL expr', + 'statement ::= OPENP statement CLOSEP', + 'expr ::= value', + 'expr ::= nullcoalescing', + 'expr ::= ternary', + 'expr ::= INCDEC DOLLARID', + 'expr ::= DOLLARID INCDEC', + 'expr ::= DOLLARID COLON ID', + 'expr ::= expr MATH value', + 'expr ::= expr UNIMATH value', + 'expr ::= expr tlop value', + 'expr ::= expr lop expr', + 'expr ::= expr scond', + 'isin ::= ISIN', + 'expr ::= expr isin array', + 'expr ::= expr isin value', + 'nullcoalescing ::= expr QMARK QMARK expr', + 'ternary ::= expr QMARK DOLLARID COLON expr', + 'ternary ::= expr QMARK value COLON expr', + 'ternary ::= expr QMARK expr COLON expr', + 'ternary ::= expr QMARK COLON expr', + 'value ::= variablevalue', + 'value ::= UNIMATH value', + 'value ::= NOT value', + 'value ::= TYPECAST value', + 'value ::= variablevalue INCDEC', + 'value ::= HEX', + 'value ::= INTEGER', + 'value ::= INTEGER DOT INTEGER', + 'value ::= INTEGER DOT', + 'value ::= DOT INTEGER', + 'value ::= ID', + 'value ::= function', + 'value ::= OPENP expr CLOSEP', + 'value ::= variablevalue INSTANCEOF ns1', + 'value ::= variablevalue INSTANCEOF variablevalue', + 'value ::= SINGLEQUOTESTRING', + 'value ::= doublequoted_with_quotes', + 'value ::= varindexed DOUBLECOLON static_class_access', + 'value ::= smartytag', + 'value ::= value modifierlist', + 'value ::= NAMESPACE', + 'value ::= arraydef', + 'value ::= ns1 DOUBLECOLON static_class_access', + 'ns1 ::= ID', + 'ns1 ::= NAMESPACE', + 'variablelist ::= variablelist COMMA variable', + 'variablelist ::= variablelist COMMA expr', + 'variablelist ::= variable', + 'variablelist ::= expr', + 'variablelist ::=', + 'variable ::= DOLLARID', + 'variable ::= varindexed', + 'variable ::= varvar AT ID', + 'variable ::= object', + 'configvariable ::= HATCH ID HATCH', + 'configvariable ::= HATCH ID HATCH arrayindex', + 'configvariable ::= HATCH variablevalue HATCH', + 'configvariable ::= HATCH variablevalue HATCH arrayindex', + 'variablevalue ::= variable', + 'variablevalue ::= configvariable', + 'varindexed ::= DOLLARID arrayindex', + 'varindexed ::= varvar arrayindex', + 'arrayindex ::= arrayindex indexdef', + 'arrayindex ::=', + 'indexdef ::= DOT DOLLARID', + 'indexdef ::= DOT varvar', + 'indexdef ::= DOT varvar AT ID', + 'indexdef ::= DOT ID', + 'indexdef ::= DOT INTEGER', + 'indexdef ::= DOT LDEL expr RDEL', + 'indexdef ::= OPENB ID CLOSEB', + 'indexdef ::= OPENB ID DOT ID CLOSEB', + 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB', + 'indexdef ::= OPENB INTEGER CLOSEB', + 'indexdef ::= OPENB DOLLARID CLOSEB', + 'indexdef ::= OPENB variablevalue CLOSEB', + 'indexdef ::= OPENB value CLOSEB', + 'indexdef ::= OPENB expr CLOSEB', + 'indexdef ::= OPENB CLOSEB', + 'varvar ::= DOLLARID', + 'varvar ::= DOLLAR', + 'varvar ::= varvar varvarele', + 'varvarele ::= ID', + 'varvarele ::= SIMPELOUTPUT', + 'varvarele ::= LDEL expr RDEL', + 'object ::= varindexed objectchain', + 'objectchain ::= objectelement', + 'objectchain ::= objectchain objectelement', + 'objectelement ::= PTR ID arrayindex', + 'objectelement ::= PTR varvar arrayindex', + 'objectelement ::= PTR LDEL expr RDEL arrayindex', + 'objectelement ::= PTR ID LDEL expr RDEL arrayindex', + 'objectelement ::= PTR method', + 'function ::= ns1 OPENP variablelist CLOSEP', + 'method ::= ID OPENP params CLOSEP', + 'method ::= DOLLARID OPENP params CLOSEP', + 'params ::= params COMMA expr', + 'params ::= expr', + 'params ::=', + 'modifierlist ::= modifierlist modifier modparameters', + 'modifierlist ::= modifier modparameters', + 'modifier ::= VERT AT ID', + 'modifier ::= VERT ID', + 'modparameters ::= modparameters modparameter', + 'modparameters ::=', + 'modparameter ::= COLON value', + 'modparameter ::= COLON UNIMATH value', + 'modparameter ::= COLON array', + 'static_class_access ::= method', + 'static_class_access ::= method objectchain', + 'static_class_access ::= ID', + 'static_class_access ::= DOLLARID arrayindex', + 'static_class_access ::= DOLLARID arrayindex objectchain', + 'lop ::= LOGOP', + 'lop ::= SLOGOP', + 'tlop ::= TLOGOP', + 'scond ::= SINGLECOND', + 'arraydef ::= OPENB arrayelements CLOSEB', + 'arraydef ::= ARRAYOPEN arrayelements CLOSEP', + 'arrayelements ::= arrayelement', + 'arrayelements ::= arrayelements COMMA arrayelement', + 'arrayelements ::= arrayelements COMMA', + 'arrayelements ::=', + 'arrayelement ::= value APTR expr', + 'arrayelement ::= ID APTR expr', + 'arrayelement ::= expr', + 'doublequoted_with_quotes ::= QUOTE QUOTE', + 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE', + 'doublequoted ::= doublequoted doublequotedcontent', + 'doublequoted ::= doublequotedcontent', + 'doublequotedcontent ::= BACKTICK variablevalue BACKTICK', + 'doublequotedcontent ::= BACKTICK expr BACKTICK', + 'doublequotedcontent ::= DOLLARID', + 'doublequotedcontent ::= LDEL variablevalue RDEL', + 'doublequotedcontent ::= LDEL expr RDEL', + 'doublequotedcontent ::= smartytag', + 'doublequotedcontent ::= TEXT', + ); + + public function tokenName($tokenType) + { + if ($tokenType === 0) { + return 'End of Input'; + } + if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) { + return $this->yyTokenName[$tokenType]; + } else { + return 'Unknown'; + } + } + + public static function yy_destructor($yymajor, $yypminor) + { + switch ($yymajor) { + default: break; /* If no destructor action specified: do nothing */ + } + } + + public function yy_pop_parser_stack() + { + if (empty($this->yystack)) { + return; + } + $yytos = array_pop($this->yystack); + if ($this->yyTraceFILE && $this->yyidx >= 0) { + fwrite($this->yyTraceFILE, + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + "\n"); + } + $yymajor = $yytos->major; + self::yy_destructor($yymajor, $yytos->minor); + $this->yyidx--; + + return $yymajor; + } + + public function __destruct() + { + while ($this->yystack !== Array()) { + $this->yy_pop_parser_stack(); + } + if (is_resource($this->yyTraceFILE)) { + fclose($this->yyTraceFILE); + } + } + + public function yy_get_expected_tokens($token) + { + static $res3 = array(); + static $res4 = array(); + $state = $this->yystack[$this->yyidx]->stateno; + $expected = self::$yyExpectedTokens[$state]; + if (isset($res3[$state][$token])) { + if ($res3[$state][$token]) { + return $expected; + } + } else { + if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) { + return $expected; + } + } + $stack = $this->yystack; + $yyidx = $this->yyidx; + do { + $yyact = $this->yy_find_shift_action($token); + if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) { + // reduce action + $done = 0; + do { + if ($done++ === 100) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // too much recursion prevents proper detection + // so give up + return array_unique($expected); + } + $yyruleno = $yyact - self::YYNSTATE; + $this->yyidx -= self::$yyRuleInfo[$yyruleno][1]; + $nextstate = $this->yy_find_reduce_action( + $this->yystack[$this->yyidx]->stateno, + self::$yyRuleInfo[$yyruleno][0]); + if (isset(self::$yyExpectedTokens[$nextstate])) { + $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); + if (isset($res4[$nextstate][$token])) { + if ($res4[$nextstate][$token]) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return array_unique($expected); + } + } else { + if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return array_unique($expected); + } + } + } + if ($nextstate < self::YYNSTATE) { + // we need to shift a non-terminal + $this->yyidx++; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = $nextstate; + $x->major = self::$yyRuleInfo[$yyruleno][0]; + $this->yystack[$this->yyidx] = $x; + continue 2; + } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // the last token was just ignored, we can't accept + // by ignoring input, this is in essence ignoring a + // syntax error! + return array_unique($expected); + } elseif ($nextstate === self::YY_NO_ACTION) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // input accepted, but not shifted (I guess) + return $expected; + } else { + $yyact = $nextstate; + } + } while (true); + } + break; + } while (true); + $this->yyidx = $yyidx; + $this->yystack = $stack; + + return array_unique($expected); + } + + public function yy_is_expected_token($token) + { + static $res = array(); + static $res2 = array(); + if ($token === 0) { + return true; // 0 is not part of this + } + $state = $this->yystack[$this->yyidx]->stateno; + if (isset($res[$state][$token])) { + if ($res[$state][$token]) { + return true; + } + } else { + if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) { + return true; + } + } + $stack = $this->yystack; + $yyidx = $this->yyidx; + do { + $yyact = $this->yy_find_shift_action($token); + if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) { + // reduce action + $done = 0; + do { + if ($done++ === 100) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // too much recursion prevents proper detection + // so give up + return true; + } + $yyruleno = $yyact - self::YYNSTATE; + $this->yyidx -= self::$yyRuleInfo[$yyruleno][1]; + $nextstate = $this->yy_find_reduce_action( + $this->yystack[$this->yyidx]->stateno, + self::$yyRuleInfo[$yyruleno][0]); + if (isset($res2[$nextstate][$token])) { + if ($res2[$nextstate][$token]) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return true; + } + } else { + if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + return true; + } + } + if ($nextstate < self::YYNSTATE) { + // we need to shift a non-terminal + $this->yyidx++; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = $nextstate; + $x->major = self::$yyRuleInfo[$yyruleno][0]; + $this->yystack[$this->yyidx] = $x; + continue 2; + } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + if (!$token) { + // end of input: this is valid + return true; + } + // the last token was just ignored, we can't accept + // by ignoring input, this is in essence ignoring a + // syntax error! + return false; + } elseif ($nextstate === self::YY_NO_ACTION) { + $this->yyidx = $yyidx; + $this->yystack = $stack; + // input accepted, but not shifted (I guess) + return true; + } else { + $yyact = $nextstate; + } + } while (true); + } + break; + } while (true); + $this->yyidx = $yyidx; + $this->yystack = $stack; + + return true; + } + + public function yy_find_shift_action($iLookAhead) + { + $stateno = $this->yystack[$this->yyidx]->stateno; + + /* if ($this->yyidx < 0) return self::YY_NO_ACTION; */ + if (!isset(self::$yy_shift_ofst[$stateno])) { + // no shift actions + return self::$yy_default[$stateno]; + } + $i = self::$yy_shift_ofst[$stateno]; + if ($i === self::YY_SHIFT_USE_DFLT) { + return self::$yy_default[$stateno]; + } + if ($iLookAhead === self::YYNOCODE) { + return self::YY_NO_ACTION; + } + $i += $iLookAhead; + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[$i] != $iLookAhead) { + if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) + && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { + if ($this->yyTraceFILE) { + fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' . + $this->yyTokenName[$iLookAhead] . ' => ' . + $this->yyTokenName[$iFallback] . "\n"); + } + + return $this->yy_find_shift_action($iFallback); + } + + return self::$yy_default[$stateno]; + } else { + return self::$yy_action[$i]; + } + } + + public function yy_find_reduce_action($stateno, $iLookAhead) + { + /* $stateno = $this->yystack[$this->yyidx]->stateno; */ + + if (!isset(self::$yy_reduce_ofst[$stateno])) { + return self::$yy_default[$stateno]; + } + $i = self::$yy_reduce_ofst[$stateno]; + if ($i === self::YY_REDUCE_USE_DFLT) { + return self::$yy_default[$stateno]; + } + if ($iLookAhead === self::YYNOCODE) { + return self::YY_NO_ACTION; + } + $i += $iLookAhead; + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[$i] != $iLookAhead) { + return self::$yy_default[$stateno]; + } else { + return self::$yy_action[$i]; + } + } + + public function yy_shift($yyNewState, $yyMajor, $yypMinor) + { + $this->yyidx++; + if ($this->yyidx >= self::YYSTACKDEPTH) { + $this->yyidx--; + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); + } + while ($this->yyidx >= 0) { + $this->yy_pop_parser_stack(); + } +// line 232 "src/Parser/TemplateParser.y" + + $this->internalError = true; + $this->compiler->trigger_template_error('Stack overflow in template parser'); + + return; + } + $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $yytos->stateno = $yyNewState; + $yytos->major = $yyMajor; + $yytos->minor = $yypMinor; + $this->yystack[] = $yytos; + if ($this->yyTraceFILE && $this->yyidx > 0) { + fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, + $yyNewState); + fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); + for ($i = 1; $i <= $this->yyidx; $i++) { + fprintf($this->yyTraceFILE, " %s", + $this->yyTokenName[$this->yystack[$i]->major]); + } + fwrite($this->yyTraceFILE,"\n"); + } + } + + public static $yyRuleInfo = array( + array( 0 => 61, 1 => 1 ), + array( 0 => 62, 1 => 2 ), + array( 0 => 62, 1 => 2 ), + array( 0 => 62, 1 => 2 ), + array( 0 => 62, 1 => 4 ), + array( 0 => 63, 1 => 4 ), + array( 0 => 63, 1 => 1 ), + array( 0 => 64, 1 => 2 ), + array( 0 => 64, 1 => 0 ), + array( 0 => 62, 1 => 2 ), + array( 0 => 62, 1 => 0 ), + array( 0 => 65, 1 => 1 ), + array( 0 => 65, 1 => 1 ), + array( 0 => 65, 1 => 1 ), + array( 0 => 65, 1 => 3 ), + array( 0 => 65, 1 => 2 ), + array( 0 => 66, 1 => 1 ), + array( 0 => 66, 1 => 2 ), + array( 0 => 66, 1 => 2 ), + array( 0 => 69, 1 => 2 ), + array( 0 => 68, 1 => 2 ), + array( 0 => 71, 1 => 1 ), + array( 0 => 71, 1 => 1 ), + array( 0 => 71, 1 => 1 ), + array( 0 => 67, 1 => 3 ), + array( 0 => 67, 1 => 2 ), + array( 0 => 67, 1 => 4 ), + array( 0 => 67, 1 => 5 ), + array( 0 => 67, 1 => 6 ), + array( 0 => 67, 1 => 2 ), + array( 0 => 67, 1 => 3 ), + array( 0 => 67, 1 => 2 ), + array( 0 => 67, 1 => 3 ), + array( 0 => 67, 1 => 8 ), + array( 0 => 79, 1 => 2 ), + array( 0 => 79, 1 => 1 ), + array( 0 => 67, 1 => 5 ), + array( 0 => 67, 1 => 7 ), + array( 0 => 67, 1 => 6 ), + array( 0 => 67, 1 => 8 ), + array( 0 => 67, 1 => 2 ), + array( 0 => 67, 1 => 3 ), + array( 0 => 67, 1 => 4 ), + array( 0 => 65, 1 => 1 ), + array( 0 => 67, 1 => 2 ), + array( 0 => 67, 1 => 3 ), + array( 0 => 67, 1 => 4 ), + array( 0 => 67, 1 => 5 ), + array( 0 => 72, 1 => 2 ), + array( 0 => 72, 1 => 1 ), + array( 0 => 72, 1 => 0 ), + array( 0 => 82, 1 => 4 ), + array( 0 => 82, 1 => 2 ), + array( 0 => 82, 1 => 2 ), + array( 0 => 82, 1 => 2 ), + array( 0 => 82, 1 => 2 ), + array( 0 => 82, 1 => 2 ), + array( 0 => 82, 1 => 4 ), + array( 0 => 78, 1 => 1 ), + array( 0 => 78, 1 => 3 ), + array( 0 => 77, 1 => 3 ), + array( 0 => 77, 1 => 3 ), + array( 0 => 77, 1 => 3 ), + array( 0 => 77, 1 => 3 ), + array( 0 => 75, 1 => 1 ), + array( 0 => 75, 1 => 1 ), + array( 0 => 75, 1 => 1 ), + array( 0 => 75, 1 => 2 ), + array( 0 => 75, 1 => 2 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 75, 1 => 2 ), + array( 0 => 88, 1 => 1 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 75, 1 => 3 ), + array( 0 => 83, 1 => 4 ), + array( 0 => 84, 1 => 5 ), + array( 0 => 84, 1 => 5 ), + array( 0 => 84, 1 => 5 ), + array( 0 => 84, 1 => 4 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 3 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 3 ), + array( 0 => 74, 1 => 3 ), + array( 0 => 74, 1 => 3 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 3 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 2 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 1 ), + array( 0 => 74, 1 => 3 ), + array( 0 => 91, 1 => 1 ), + array( 0 => 91, 1 => 1 ), + array( 0 => 95, 1 => 3 ), + array( 0 => 95, 1 => 3 ), + array( 0 => 95, 1 => 1 ), + array( 0 => 95, 1 => 1 ), + array( 0 => 95, 1 => 0 ), + array( 0 => 96, 1 => 1 ), + array( 0 => 96, 1 => 1 ), + array( 0 => 96, 1 => 3 ), + array( 0 => 96, 1 => 1 ), + array( 0 => 98, 1 => 3 ), + array( 0 => 98, 1 => 4 ), + array( 0 => 98, 1 => 3 ), + array( 0 => 98, 1 => 4 ), + array( 0 => 73, 1 => 1 ), + array( 0 => 73, 1 => 1 ), + array( 0 => 70, 1 => 2 ), + array( 0 => 70, 1 => 2 ), + array( 0 => 99, 1 => 2 ), + array( 0 => 99, 1 => 0 ), + array( 0 => 100, 1 => 2 ), + array( 0 => 100, 1 => 2 ), + array( 0 => 100, 1 => 4 ), + array( 0 => 100, 1 => 2 ), + array( 0 => 100, 1 => 2 ), + array( 0 => 100, 1 => 4 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 5 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 3 ), + array( 0 => 100, 1 => 2 ), + array( 0 => 80, 1 => 1 ), + array( 0 => 80, 1 => 1 ), + array( 0 => 80, 1 => 2 ), + array( 0 => 101, 1 => 1 ), + array( 0 => 101, 1 => 1 ), + array( 0 => 101, 1 => 3 ), + array( 0 => 97, 1 => 2 ), + array( 0 => 102, 1 => 1 ), + array( 0 => 102, 1 => 2 ), + array( 0 => 103, 1 => 3 ), + array( 0 => 103, 1 => 3 ), + array( 0 => 103, 1 => 5 ), + array( 0 => 103, 1 => 6 ), + array( 0 => 103, 1 => 2 ), + array( 0 => 90, 1 => 4 ), + array( 0 => 104, 1 => 4 ), + array( 0 => 104, 1 => 4 ), + array( 0 => 105, 1 => 3 ), + array( 0 => 105, 1 => 1 ), + array( 0 => 105, 1 => 0 ), + array( 0 => 76, 1 => 3 ), + array( 0 => 76, 1 => 2 ), + array( 0 => 106, 1 => 3 ), + array( 0 => 106, 1 => 2 ), + array( 0 => 81, 1 => 2 ), + array( 0 => 81, 1 => 0 ), + array( 0 => 107, 1 => 2 ), + array( 0 => 107, 1 => 3 ), + array( 0 => 107, 1 => 2 ), + array( 0 => 93, 1 => 1 ), + array( 0 => 93, 1 => 2 ), + array( 0 => 93, 1 => 1 ), + array( 0 => 93, 1 => 2 ), + array( 0 => 93, 1 => 3 ), + array( 0 => 86, 1 => 1 ), + array( 0 => 86, 1 => 1 ), + array( 0 => 85, 1 => 1 ), + array( 0 => 87, 1 => 1 ), + array( 0 => 94, 1 => 3 ), + array( 0 => 94, 1 => 3 ), + array( 0 => 108, 1 => 1 ), + array( 0 => 108, 1 => 3 ), + array( 0 => 108, 1 => 2 ), + array( 0 => 108, 1 => 0 ), + array( 0 => 109, 1 => 3 ), + array( 0 => 109, 1 => 3 ), + array( 0 => 109, 1 => 1 ), + array( 0 => 92, 1 => 2 ), + array( 0 => 92, 1 => 3 ), + array( 0 => 110, 1 => 2 ), + array( 0 => 110, 1 => 1 ), + array( 0 => 111, 1 => 3 ), + array( 0 => 111, 1 => 3 ), + array( 0 => 111, 1 => 1 ), + array( 0 => 111, 1 => 3 ), + array( 0 => 111, 1 => 3 ), + array( 0 => 111, 1 => 1 ), + array( 0 => 111, 1 => 1 ), + ); + + public static $yyReduceMap = array( + 0 => 0, + 1 => 1, + 2 => 2, + 3 => 3, + 4 => 4, + 5 => 5, + 6 => 6, + 21 => 6, + 22 => 6, + 23 => 6, + 35 => 6, + 55 => 6, + 56 => 6, + 64 => 6, + 65 => 6, + 66 => 6, + 83 => 6, + 88 => 6, + 89 => 6, + 94 => 6, + 98 => 6, + 99 => 6, + 103 => 6, + 104 => 6, + 106 => 6, + 122 => 6, + 182 => 6, + 188 => 6, + 7 => 7, + 8 => 8, + 9 => 9, + 11 => 11, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, + 16 => 16, + 17 => 17, + 18 => 18, + 19 => 19, + 20 => 20, + 24 => 24, + 25 => 25, + 26 => 26, + 27 => 27, + 28 => 28, + 29 => 29, + 30 => 30, + 32 => 30, + 31 => 31, + 33 => 33, + 34 => 34, + 36 => 36, + 37 => 37, + 38 => 38, + 39 => 39, + 40 => 40, + 41 => 41, + 42 => 42, + 43 => 43, + 44 => 44, + 45 => 45, + 46 => 46, + 47 => 47, + 48 => 48, + 49 => 49, + 58 => 49, + 110 => 49, + 111 => 49, + 160 => 49, + 164 => 49, + 168 => 49, + 170 => 49, + 50 => 50, + 112 => 50, + 161 => 50, + 167 => 50, + 51 => 51, + 52 => 52, + 53 => 52, + 54 => 54, + 145 => 54, + 57 => 57, + 59 => 59, + 60 => 60, + 61 => 60, + 62 => 62, + 63 => 63, + 67 => 67, + 68 => 68, + 69 => 69, + 70 => 70, + 71 => 70, + 72 => 72, + 73 => 73, + 74 => 74, + 75 => 75, + 76 => 76, + 77 => 77, + 78 => 78, + 79 => 79, + 80 => 80, + 81 => 80, + 82 => 82, + 84 => 84, + 86 => 84, + 87 => 84, + 125 => 84, + 85 => 85, + 90 => 90, + 91 => 91, + 92 => 92, + 93 => 93, + 95 => 95, + 96 => 96, + 97 => 96, + 100 => 100, + 101 => 101, + 102 => 102, + 105 => 105, + 107 => 107, + 108 => 108, + 109 => 108, + 159 => 108, + 113 => 113, + 114 => 114, + 115 => 115, + 116 => 116, + 117 => 117, + 118 => 118, + 119 => 119, + 120 => 120, + 121 => 121, + 123 => 123, + 124 => 124, + 126 => 126, + 185 => 126, + 127 => 127, + 128 => 128, + 129 => 129, + 130 => 130, + 131 => 131, + 132 => 132, + 140 => 132, + 133 => 133, + 134 => 134, + 135 => 135, + 136 => 135, + 138 => 135, + 139 => 135, + 137 => 137, + 141 => 141, + 142 => 142, + 143 => 143, + 189 => 143, + 144 => 144, + 146 => 146, + 147 => 147, + 148 => 148, + 149 => 149, + 150 => 150, + 151 => 151, + 152 => 152, + 153 => 153, + 154 => 154, + 155 => 155, + 156 => 156, + 157 => 157, + 158 => 158, + 162 => 162, + 163 => 163, + 165 => 165, + 166 => 166, + 169 => 169, + 171 => 171, + 172 => 172, + 173 => 173, + 174 => 174, + 175 => 175, + 176 => 176, + 177 => 177, + 178 => 178, + 179 => 179, + 180 => 180, + 181 => 180, + 183 => 183, + 184 => 184, + 186 => 186, + 187 => 187, + 190 => 190, + 191 => 191, + 192 => 192, + 193 => 193, + 196 => 193, + 194 => 194, + 197 => 194, + 195 => 195, + 198 => 198, + 199 => 199, + ); +// line 245 "src/Parser/TemplateParser.y" + public function yy_r0(){ + $this->root_buffer->prepend_array($this, $this->template_prefix); + $this->root_buffer->append_array($this, $this->template_postfix); + $this->_retvalue = $this->root_buffer->to_smarty_php($this); + } +// line 252 "src/Parser/TemplateParser.y" + public function yy_r1(){ + $text = $this->yystack[ $this->yyidx + 0 ]->minor; + + if ((string)$text == '') { + $this->current_buffer->append_subtree($this, null); + } + + $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($text, $this->strip)); + } +// line 262 "src/Parser/TemplateParser.y" + public function yy_r2(){ + $this->strip = true; + } +// line 266 "src/Parser/TemplateParser.y" + public function yy_r3(){ + $this->strip = false; + } +// line 271 "src/Parser/TemplateParser.y" + public function yy_r4(){ + $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($this->yystack[$this->yyidx + -1]->minor)); + } +// line 276 "src/Parser/TemplateParser.y" + public function yy_r5(){ + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor; + } +// line 279 "src/Parser/TemplateParser.y" + public function yy_r6(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +// line 283 "src/Parser/TemplateParser.y" + public function yy_r7(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + + } +// line 288 "src/Parser/TemplateParser.y" + public function yy_r8(){ + $this->_retvalue = ''; + } +// line 292 "src/Parser/TemplateParser.y" + public function yy_r9(){ + $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor)); + $this->compiler->has_variable_string = false; + $this->block_nesting_level = $this->compiler->getTagStackCount(); + } +// line 302 "src/Parser/TemplateParser.y" + public function yy_r11(){ + $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $'); + $attributes = []; + if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) { + $attributes[] = 'nocache'; + $var = $match[1]; + } + $this->compiler->triggerTagNoCache($var); + $this->_retvalue = $this->compiler->compilePrintExpression('$_smarty_tpl->getValue(\''.$var.'\')', $attributes); + } +// line 314 "src/Parser/TemplateParser.y" + public function yy_r12(){ + $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength())); + if ($tag == 'strip') { + $this->strip = true; + $this->_retvalue = null; + } else { + if (defined($tag)) { + if ($this->security) { + $this->security->isTrustedConstant($tag, $this->compiler); + } + $this->_retvalue = $this->compiler->compilePrintExpression($tag); + } else { + if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) { + $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\'')); + } else { + $this->_retvalue = $this->compiler->compileTag($tag,array()); + } + } + } + } +// line 335 "src/Parser/TemplateParser.y" + public function yy_r13(){ + $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.'); + if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') { + // {$smarty.block.child} + $this->_retvalue = $this->compiler->compileChildBlock(); + } else { + // {$smarty.block.parent} + $this->_retvalue = $this->compiler->compileParentBlock(); + } + } +// line 346 "src/Parser/TemplateParser.y" + public function yy_r14(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +// line 350 "src/Parser/TemplateParser.y" + public function yy_r15(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +// line 354 "src/Parser/TemplateParser.y" + public function yy_r16(){ + $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + 0]->minor[0], $this->yystack[$this->yyidx + 0]->minor[1]); + } +// line 363 "src/Parser/TemplateParser.y" + public function yy_r17(){ + $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1])); + } +// line 367 "src/Parser/TemplateParser.y" + public function yy_r18(){ + $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'])); + } +// line 371 "src/Parser/TemplateParser.y" + public function yy_r19(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +// line 375 "src/Parser/TemplateParser.y" + public function yy_r20(){ + $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor); + } +// line 390 "src/Parser/TemplateParser.y" + public function yy_r24(){ + if (defined($this->yystack[$this->yyidx + -1]->minor)) { + if ($this->security) { + $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler); + } + $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor); + } else { + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor); + } + } +// line 400 "src/Parser/TemplateParser.y" + public function yy_r25(){ + if (defined($this->yystack[$this->yyidx + 0]->minor)) { + if ($this->security) { + $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler); + } + $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + 0]->minor); + } else { + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array()); + } + } +// line 413 "src/Parser/TemplateParser.y" + public function yy_r26(){ + if (defined($this->yystack[$this->yyidx + -2]->minor)) { + if ($this->security) { + $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler); + } + $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor); + } else { + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor)); + } + } +// line 425 "src/Parser/TemplateParser.y" + public function yy_r27(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor)); + } +// line 430 "src/Parser/TemplateParser.y" + public function yy_r28(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor)); + } +// line 435 "src/Parser/TemplateParser.y" + public function yy_r29(){ + $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); + $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor)); + } +// line 440 "src/Parser/TemplateParser.y" + public function yy_r30(){ + $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength())); + $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor)); + } +// line 445 "src/Parser/TemplateParser.y" + public function yy_r31(){ + $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); + $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor)); + } +// line 456 "src/Parser/TemplateParser.y" + public function yy_r33(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1); + } +// line 460 "src/Parser/TemplateParser.y" + public function yy_r34(){ + $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor; + } +// line 468 "src/Parser/TemplateParser.y" + public function yy_r36(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0); + } +// line 472 "src/Parser/TemplateParser.y" + public function yy_r37(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0); + } +// line 477 "src/Parser/TemplateParser.y" + public function yy_r38(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor)))); + } +// line 481 "src/Parser/TemplateParser.y" + public function yy_r39(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor)))); + } +// line 484 "src/Parser/TemplateParser.y" + public function yy_r40(){ + $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor); + } +// line 489 "src/Parser/TemplateParser.y" + public function yy_r41(){ + $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor)))); + } +// line 493 "src/Parser/TemplateParser.y" + public function yy_r42(){ + $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor))); + } +// line 499 "src/Parser/TemplateParser.y" + public function yy_r43(){ + $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /'); + if ($tag === 'strip') { + $this->strip = false; + $this->_retvalue = null; + } else { + $this->_retvalue = $this->compiler->compileTag($tag.'close',array()); + } + } +// line 508 "src/Parser/TemplateParser.y" + public function yy_r44(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array()); + } +// line 512 "src/Parser/TemplateParser.y" + public function yy_r45(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor)); + } +// line 517 "src/Parser/TemplateParser.y" + public function yy_r46(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor)); + } +// line 521 "src/Parser/TemplateParser.y" + public function yy_r47(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor)); + } +// line 529 "src/Parser/TemplateParser.y" + public function yy_r48(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor; + } +// line 535 "src/Parser/TemplateParser.y" + public function yy_r49(){ + $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); + } +// line 540 "src/Parser/TemplateParser.y" + public function yy_r50(){ + $this->_retvalue = array(); + } +// line 545 "src/Parser/TemplateParser.y" + public function yy_r51(){ + if (defined($this->yystack[$this->yyidx + 0]->minor)) { + if ($this->security) { + $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler); + } + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor); + } else { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\''); + } + } +// line 556 "src/Parser/TemplateParser.y" + public function yy_r52(){ + $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor); + } +// line 564 "src/Parser/TemplateParser.y" + public function yy_r54(){ + $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\''; + } +// line 576 "src/Parser/TemplateParser.y" + public function yy_r57(){ + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor); + } +// line 589 "src/Parser/TemplateParser.y" + public function yy_r59(){ + $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor; + } +// line 594 "src/Parser/TemplateParser.y" + public function yy_r60(){ + $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor); + } +// line 601 "src/Parser/TemplateParser.y" + public function yy_r62(){ + $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor); + } +// line 605 "src/Parser/TemplateParser.y" + public function yy_r63(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +// line 630 "src/Parser/TemplateParser.y" + public function yy_r67(){ + $this->_retvalue = '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->preIncDec(\'' . $this->yystack[$this->yyidx + -1]->minor . '\')'; + } +// line 635 "src/Parser/TemplateParser.y" + public function yy_r68(){ + $this->_retvalue = '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + -1]->minor,1) .'\')->postIncDec(\'' . $this->yystack[$this->yyidx + 0]->minor . '\')'; + } +// line 640 "src/Parser/TemplateParser.y" + public function yy_r69(){ + $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')'; + } +// line 645 "src/Parser/TemplateParser.y" + public function yy_r70(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor; + } +// line 655 "src/Parser/TemplateParser.y" + public function yy_r72(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')'; + } +// line 659 "src/Parser/TemplateParser.y" + public function yy_r73(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +// line 663 "src/Parser/TemplateParser.y" + public function yy_r74(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')'; + } +// line 667 "src/Parser/TemplateParser.y" + public function yy_r75(){ + static $isin = [ + 'isin' => 'in_array(', + 'isnotin' => '!in_array(', + ]; + $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor)); + $this->_retvalue = $isin[$op]; + } +// line 676 "src/Parser/TemplateParser.y" + public function yy_r76(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')'; + } +// line 680 "src/Parser/TemplateParser.y" + public function yy_r77(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')'; + } +// line 685 "src/Parser/TemplateParser.y" + public function yy_r78(){ + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.' ?? '.$this->yystack[$this->yyidx + 0]->minor; + } +// line 692 "src/Parser/TemplateParser.y" + public function yy_r79(){ + $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + -2]->minor,1)); + $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.' ? $_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\') : '.$this->yystack[$this->yyidx + 0]->minor; + } +// line 697 "src/Parser/TemplateParser.y" + public function yy_r80(){ + $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor; + } +// line 706 "src/Parser/TemplateParser.y" + public function yy_r82(){ + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.' ?: '.$this->yystack[$this->yyidx + 0]->minor; + } +// line 716 "src/Parser/TemplateParser.y" + public function yy_r84(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +// line 721 "src/Parser/TemplateParser.y" + public function yy_r85(){ + $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 742 "src/Parser/TemplateParser.y" + public function yy_r90(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 746 "src/Parser/TemplateParser.y" + public function yy_r91(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'; + } +// line 750 "src/Parser/TemplateParser.y" + public function yy_r92(){ + $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 755 "src/Parser/TemplateParser.y" + public function yy_r93(){ + if (defined($this->yystack[$this->yyidx + 0]->minor)) { + if ($this->security) { + $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler); + } + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } else { + $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\''; + } + } +// line 772 "src/Parser/TemplateParser.y" + public function yy_r95(){ + $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')'; + } +// line 776 "src/Parser/TemplateParser.y" + public function yy_r96(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +// line 794 "src/Parser/TemplateParser.y" + public function yy_r100(){ + if ($this->security && $this->security->static_classes !== array()) { + $this->compiler->trigger_template_error('dynamic static class not allowed by security setting'); + } + $prefixVar = $this->compiler->getNewPrefixVariable(); + if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') { + $this->compiler->appendPrefixCode("compile(array(),$this->compiler,$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>'); + } else { + $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -2]->minor['var']); + $this->compiler->appendPrefixCode("getValue(" . $this->yystack[$this->yyidx + -2]->minor['var'] . ')'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>'); + } + $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1]; + } +// line 809 "src/Parser/TemplateParser.y" + public function yy_r101(){ + $prefixVar = $this->compiler->getNewPrefixVariable(); + $tmp = $this->compiler->appendCode('', (string) $this->yystack[$this->yyidx + 0]->minor); + $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "")); + $this->_retvalue = $prefixVar; + } +// line 816 "src/Parser/TemplateParser.y" + public function yy_r102(){ + $this->_retvalue = $this->compiler->compileModifier($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor); + } +// line 829 "src/Parser/TemplateParser.y" + public function yy_r105(){ + if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) { + if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) { + $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1]; + } else { + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1]; + } + } else { + $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting'); + } + } +// line 848 "src/Parser/TemplateParser.y" + public function yy_r107(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +// line 856 "src/Parser/TemplateParser.y" + public function yy_r108(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor)); + } +// line 883 "src/Parser/TemplateParser.y" + public function yy_r113(){ + $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + 0]->minor,1)); + $this->_retvalue = array('$_smarty_tpl->hasVariable(\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\')','$_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\')'); + } +// line 887 "src/Parser/TemplateParser.y" + public function yy_r114(){ + if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') { + $smarty_var = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']); + $this->_retvalue = array('true', $smarty_var); + } else { + // used for array reset,next,prev,end,current + $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var']; + $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + 0]->minor['var']); + $this->_retvalue = array('true', '$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + 0]->minor['var'] . ')'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']); + } + } +// line 901 "src/Parser/TemplateParser.y" + public function yy_r115(){ + $this->_retvalue = array('true', '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor); + } +// line 906 "src/Parser/TemplateParser.y" + public function yy_r116(){ + $this->_retvalue = array('true', $this->yystack[$this->yyidx + 0]->minor); + } +// line 911 "src/Parser/TemplateParser.y" + public function yy_r117(){ + $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\''); + } +// line 915 "src/Parser/TemplateParser.y" + public function yy_r118(){ + $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)'; + } +// line 919 "src/Parser/TemplateParser.y" + public function yy_r119(){ + $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor); + } +// line 923 "src/Parser/TemplateParser.y" + public function yy_r120(){ + $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)'; + } +// line 927 "src/Parser/TemplateParser.y" + public function yy_r121(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor[1]; + } +// line 935 "src/Parser/TemplateParser.y" + public function yy_r123(){ + $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor); + } +// line 938 "src/Parser/TemplateParser.y" + public function yy_r124(){ + $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor); + } +// line 951 "src/Parser/TemplateParser.y" + public function yy_r126(){ + return; + } +// line 957 "src/Parser/TemplateParser.y" + public function yy_r127(){ + $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + 0]->minor,1)); + $this->_retvalue = '[$_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\')]'; + } +// line 961 "src/Parser/TemplateParser.y" + public function yy_r128(){ + $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = '[$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + 0]->minor . ')]'; + } +// line 966 "src/Parser/TemplateParser.y" + public function yy_r129(){ + $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -2]->minor); + $this->_retvalue = '[$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + -2]->minor . ')->'.$this->yystack[$this->yyidx + 0]->minor.']'; + } +// line 971 "src/Parser/TemplateParser.y" + public function yy_r130(){ + $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']'; + } +// line 975 "src/Parser/TemplateParser.y" + public function yy_r131(){ + $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']'; + } +// line 980 "src/Parser/TemplateParser.y" + public function yy_r132(){ + $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']'; + } +// line 985 "src/Parser/TemplateParser.y" + public function yy_r133(){ + $this->_retvalue = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']'; + } +// line 989 "src/Parser/TemplateParser.y" + public function yy_r134(){ + $this->_retvalue = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']'; + } +// line 992 "src/Parser/TemplateParser.y" + public function yy_r135(){ + $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']'; + } +// line 998 "src/Parser/TemplateParser.y" + public function yy_r137(){ + $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + -1]->minor,1)); + $this->_retvalue = '[$_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\')]'; + } +// line 1015 "src/Parser/TemplateParser.y" + public function yy_r141(){ + $this->_retvalue = '[]'; + } +// line 1025 "src/Parser/TemplateParser.y" + public function yy_r142(){ + $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\''; + } +// line 1029 "src/Parser/TemplateParser.y" + public function yy_r143(){ + $this->_retvalue = '\'\''; + } +// line 1034 "src/Parser/TemplateParser.y" + public function yy_r144(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1042 "src/Parser/TemplateParser.y" + public function yy_r146(){ + $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $'); + $this->compiler->triggerTagNoCache($var); + $this->_retvalue = '$_smarty_tpl->getValue(\''.$var.'\')'; + } +// line 1049 "src/Parser/TemplateParser.y" + public function yy_r147(){ + $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')'; + } +// line 1056 "src/Parser/TemplateParser.y" + public function yy_r148(){ + if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') { + $this->_retvalue = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor; + } else { + $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -1]->minor['var']); + $this->_retvalue = '$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + -1]->minor['var'] . ')'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; + } + } +// line 1066 "src/Parser/TemplateParser.y" + public function yy_r149(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +// line 1071 "src/Parser/TemplateParser.y" + public function yy_r150(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1076 "src/Parser/TemplateParser.y" + public function yy_r151(){ + if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') { + $this->compiler->trigger_template_error (self::ERR1); + } + $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1083 "src/Parser/TemplateParser.y" + public function yy_r152(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::ERR2); + } + $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -1]->minor); + $this->_retvalue = '->{$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + -1]->minor . ')'.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +// line 1091 "src/Parser/TemplateParser.y" + public function yy_r153(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::ERR2); + } + $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +// line 1098 "src/Parser/TemplateParser.y" + public function yy_r154(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::ERR2); + } + $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +// line 1106 "src/Parser/TemplateParser.y" + public function yy_r155(){ + $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1114 "src/Parser/TemplateParser.y" + public function yy_r156(){ + + if ($this->yystack[$this->yyidx + -3]->minor == 'isset') { + $this->_retvalue = '(true'; + if (count($this->yystack[$this->yyidx + -1]->minor) == 0) { + throw new CompilerException("Invalid number of arguments for isset. isset expects at least one parameter."); + } + foreach ($this->yystack[$this->yyidx + -1]->minor as $value) { + if (is_array($value)) { + $this->_retvalue .= ' && (' . $value[0] . ' && null !== (' . $value[1] . ' ?? null))'; + } else { + $this->_retvalue .= ' && (' . $value . ' !== null)'; + } + } + $this->_retvalue .= ')'; + } elseif ($this->yystack[$this->yyidx + -3]->minor == 'empty') { + if (count($this->yystack[$this->yyidx + -1]->minor) != 1) { + throw new CompilerException("Invalid number of arguments for empty. empty expects at exactly one parameter."); + } + if (is_array($this->yystack[$this->yyidx + -1]->minor[0])) { + $this->_retvalue .= '( !' . $this->yystack[$this->yyidx + -1]->minor[0][0] . ' || empty(' . $this->yystack[$this->yyidx + -1]->minor[0][1] . '))'; + } else { + $this->_retvalue = 'false == ' . $this->yystack[$this->yyidx + -1]->minor[0]; + } + } else { + $p = array(); + foreach ($this->yystack[$this->yyidx + -1]->minor as $value) { + if (is_array($value)) { + $p[] = $value[1]; + } else { + $p[] = $value; + } + } + $this->_retvalue = $this->compiler->compileModifierInExpression($this->yystack[$this->yyidx + -3]->minor, $p); + } + } +// line 1155 "src/Parser/TemplateParser.y" + public function yy_r157(){ + if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') { + $this->compiler->trigger_template_error (self::ERR1); + } + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')'; + } +// line 1162 "src/Parser/TemplateParser.y" + public function yy_r158(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::ERR2); + } + $prefixVar = $this->compiler->getNewPrefixVariable(); + $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + -3]->minor,1)); + $this->compiler->appendPrefixCode("getValue('".substr($this->yystack[$this->yyidx + -3]->minor,1).'\')'.';?>'); + $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')'; + } +// line 1191 "src/Parser/TemplateParser.y" + public function yy_r162(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor))); + } +// line 1195 "src/Parser/TemplateParser.y" + public function yy_r163(){ + $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)); + } +// line 1203 "src/Parser/TemplateParser.y" + public function yy_r165(){ + $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); + } +// line 1211 "src/Parser/TemplateParser.y" + public function yy_r166(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor); + } +// line 1224 "src/Parser/TemplateParser.y" + public function yy_r169(){ + $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor); + } +// line 1233 "src/Parser/TemplateParser.y" + public function yy_r171(){ + $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method'); + } +// line 1238 "src/Parser/TemplateParser.y" + public function yy_r172(){ + $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method'); + } +// line 1243 "src/Parser/TemplateParser.y" + public function yy_r173(){ + $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, ''); + } +// line 1248 "src/Parser/TemplateParser.y" + public function yy_r174(){ + $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property'); + } +// line 1253 "src/Parser/TemplateParser.y" + public function yy_r175(){ + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property'); + } +// line 1259 "src/Parser/TemplateParser.y" + public function yy_r176(){ + $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' '; + } +// line 1263 "src/Parser/TemplateParser.y" + public function yy_r177(){ + static $lops = array( + 'eq' => ' == ', + 'ne' => ' != ', + 'neq' => ' != ', + 'gt' => ' > ', + 'ge' => ' >= ', + 'gte' => ' >= ', + 'lt' => ' < ', + 'le' => ' <= ', + 'lte' => ' <= ', + 'mod' => ' % ', + 'and' => ' && ', + 'or' => ' || ', + 'xor' => ' xor ', + ); + $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor)); + $this->_retvalue = $lops[$op]; + } +// line 1282 "src/Parser/TemplateParser.y" + public function yy_r178(){ + static $tlops = array( + 'isdivby' => array('op' => ' % ', 'pre' => '!('), + 'isnotdivby' => array('op' => ' % ', 'pre' => '('), + 'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '), + 'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '), + 'isoddby' => array('op' => ' / ', 'pre' => '(1 & '), + 'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '), + ); + $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor)); + $this->_retvalue = $tlops[$op]; + } +// line 1295 "src/Parser/TemplateParser.y" + public function yy_r179(){ + static $scond = array ( + 'iseven' => '!(1 & ', + 'isnoteven' => '(1 & ', + 'isodd' => '(1 & ', + 'isnotodd' => '!(1 & ', + ); + $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor)); + $this->_retvalue = $scond[$op]; + } +// line 1309 "src/Parser/TemplateParser.y" + public function yy_r180(){ + $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')'; + } +// line 1320 "src/Parser/TemplateParser.y" + public function yy_r183(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1324 "src/Parser/TemplateParser.y" + public function yy_r184(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.','; + } +// line 1332 "src/Parser/TemplateParser.y" + public function yy_r186(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1336 "src/Parser/TemplateParser.y" + public function yy_r187(){ + $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor; + } +// line 1352 "src/Parser/TemplateParser.y" + public function yy_r190(){ + $this->compiler->leaveDoubleQuote(); + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this); + } +// line 1358 "src/Parser/TemplateParser.y" + public function yy_r191(){ + $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +// line 1363 "src/Parser/TemplateParser.y" + public function yy_r192(){ + $this->_retvalue = new Dq($this, $this->yystack[$this->yyidx + 0]->minor); + } +// line 1367 "src/Parser/TemplateParser.y" + public function yy_r193(){ + $this->_retvalue = new Code('(string)'.$this->yystack[$this->yyidx + -1]->minor); + } +// line 1371 "src/Parser/TemplateParser.y" + public function yy_r194(){ + $this->_retvalue = new Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')'); + } +// line 1375 "src/Parser/TemplateParser.y" + public function yy_r195(){ + $this->_retvalue = new Code('(string)$_smarty_tpl->getValue(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')'); + } +// line 1387 "src/Parser/TemplateParser.y" + public function yy_r198(){ + $this->_retvalue = new Tag($this, $this->yystack[$this->yyidx + 0]->minor); + } +// line 1391 "src/Parser/TemplateParser.y" + public function yy_r199(){ + $this->_retvalue = new DqContent($this->yystack[$this->yyidx + 0]->minor); + } + + private $_retvalue; + + public function yy_reduce($yyruleno) + { + if ($this->yyTraceFILE && $yyruleno >= 0 + && $yyruleno < count(self::$yyRuleName)) { + fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", + $this->yyTracePrompt, $yyruleno, + self::$yyRuleName[$yyruleno]); + } + + $this->_retvalue = $yy_lefthand_side = null; + if (isset(self::$yyReduceMap[$yyruleno])) { + // call the action + $this->_retvalue = null; + $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}(); + $yy_lefthand_side = $this->_retvalue; + } + $yygoto = self::$yyRuleInfo[$yyruleno][0]; + $yysize = self::$yyRuleInfo[$yyruleno][1]; + $this->yyidx -= $yysize; + for ($i = $yysize; $i; $i--) { + // pop all of the right-hand side parameters + array_pop($this->yystack); + } + $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); + if ($yyact < self::YYNSTATE) { + if (!$this->yyTraceFILE && $yysize) { + $this->yyidx++; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = $yyact; + $x->major = $yygoto; + $x->minor = $yy_lefthand_side; + $this->yystack[$this->yyidx] = $x; + } else { + $this->yy_shift($yyact, $yygoto, $yy_lefthand_side); + } + } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) { + $this->yy_accept(); + } + } + + public function yy_parse_failed() + { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); + } while ($this->yyidx >= 0) { + $this->yy_pop_parser_stack(); + } + } + + public function yy_syntax_error($yymajor, $TOKEN) + { +// line 225 "src/Parser/TemplateParser.y" + + $this->internalError = true; + $this->yymajor = $yymajor; + $this->compiler->trigger_template_error(); + } + + public function yy_accept() + { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); + } while ($this->yyidx >= 0) { + $this->yy_pop_parser_stack(); + } +// line 218 "src/Parser/TemplateParser.y" + + $this->successful = !$this->internalError; + $this->internalError = false; + $this->retvalue = $this->_retvalue; + } + + public function doParse($yymajor, $yytokenvalue) + { + $yyerrorhit = 0; /* True if yymajor has invoked an error */ + + if ($this->yyidx === null || $this->yyidx < 0) { + $this->yyidx = 0; + $this->yyerrcnt = -1; + $x = (object) ['stateno' => null, 'major' => null, 'minor' => null]; + $x->stateno = 0; + $x->major = 0; + $this->yystack = array(); + $this->yystack[] = $x; + } + $yyendofinput = ($yymajor==0); + + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sInput %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + } + + do { + $yyact = $this->yy_find_shift_action($yymajor); + if ($yymajor < self::YYERRORSYMBOL && + !$this->yy_is_expected_token($yymajor)) { + // force a syntax error + $yyact = self::YY_ERROR_ACTION; + } + if ($yyact < self::YYNSTATE) { + $this->yy_shift($yyact, $yymajor, $yytokenvalue); + $this->yyerrcnt--; + if ($yyendofinput && $this->yyidx >= 0) { + $yymajor = 0; + } else { + $yymajor = self::YYNOCODE; + } + } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { + $this->yy_reduce($yyact - self::YYNSTATE); + } elseif ($yyact === self::YY_ERROR_ACTION) { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sSyntax Error!\n", + $this->yyTracePrompt); + } + if (self::YYERRORSYMBOL) { + if ($this->yyerrcnt < 0) { + $this->yy_syntax_error($yymajor, $yytokenvalue); + } + $yymx = $this->yystack[$this->yyidx]->major; + if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) { + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + } + $this->yy_destructor($yymajor, $yytokenvalue); + $yymajor = self::YYNOCODE; + } else { + while ($this->yyidx >= 0 && + $yymx !== self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ){ + $this->yy_pop_parser_stack(); + } + if ($this->yyidx < 0 || $yymajor==0) { + $this->yy_destructor($yymajor, $yytokenvalue); + $this->yy_parse_failed(); + $yymajor = self::YYNOCODE; + } elseif ($yymx !== self::YYERRORSYMBOL) { + $u2 = 0; + $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2); + } + } + $this->yyerrcnt = 3; + $yyerrorhit = 1; + } else { + if ($this->yyerrcnt <= 0) { + $this->yy_syntax_error($yymajor, $yytokenvalue); + } + $this->yyerrcnt = 3; + $this->yy_destructor($yymajor, $yytokenvalue); + if ($yyendofinput) { + $this->yy_parse_failed(); + } + $yymajor = self::YYNOCODE; + } + } else { + $this->yy_accept(); + $yymajor = self::YYNOCODE; + } + } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0); + } +} + diff --git a/include/smarty/lexer/smarty_internal_templateparser.y b/include/smarty/src/Parser/TemplateParser.y similarity index 75% rename from include/smarty/lexer/smarty_internal_templateparser.y rename to include/smarty/src/Parser/TemplateParser.y index 620498765..544148f13 100644 --- a/include/smarty/lexer/smarty_internal_templateparser.y +++ b/include/smarty/src/Parser/TemplateParser.y @@ -9,15 +9,27 @@ %stack_size 500 %name TP_ %declare_class { + +namespace Smarty\Parser; + +use \Smarty\Lexer\TemplateLexer as Lexer; +use \Smarty\ParseTree\Template as TemplateParseTree; +use \Smarty\Compiler\Template as TemplateCompiler; +use \Smarty\ParseTree\Code; +use \Smarty\ParseTree\Dq; +use \Smarty\ParseTree\DqContent; +use \Smarty\ParseTree\Tag; +use \Smarty\CompilerException; + /** * Smarty Template Parser Class * * This is the template parser. -* It is generated from the smarty_internal_templateparser.y file +* It is generated from the TemplateParser.y file * * @author Uwe Tews */ -class Smarty_Internal_Templateparser +class TemplateParser } %include_class { @@ -60,21 +72,21 @@ class Smarty_Internal_Templateparser /** * root parse tree buffer * - * @var Smarty_Internal_ParseTree_Template + * @var TemplateParseTree */ public $root_buffer; /** * current parse tree object * - * @var Smarty_Internal_ParseTree + * @var \Smarty\ParseTree\Base */ public $current_buffer; /** * lexer object * - * @var Smarty_Internal_Templatelexer + * @var Lexer */ public $lex; @@ -94,21 +106,21 @@ class Smarty_Internal_Templateparser /** * compiler object * - * @var Smarty_Internal_TemplateCompilerBase + * @var TemplateCompiler */ public $compiler = null; /** * smarty object * - * @var Smarty + * @var \Smarty\Smarty */ public $smarty = null; /** * template object * - * @var Smarty_Internal_Template + * @var \Smarty\Template */ public $template = null; @@ -122,38 +134,38 @@ class Smarty_Internal_Templateparser /** * security object * - * @var Smarty_Security + * @var \Smarty\Security */ public $security = null; /** * template prefix array * - * @var \Smarty_Internal_ParseTree[] + * @var \Smarty\ParseTree\Base[] */ public $template_prefix = array(); /** * template prefix array * - * @var \Smarty_Internal_ParseTree[] + * @var \Smarty\ParseTree\Base[] */ public $template_postfix = array(); /** * constructor * - * @param Smarty_Internal_Templatelexer $lex - * @param Smarty_Internal_TemplateCompilerBase $compiler + * @param Lexer $lex + * @param TemplateCompiler $compiler */ - public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler) + public function __construct(Lexer $lex, TemplateCompiler $compiler) { $this->lex = $lex; $this->compiler = $compiler; - $this->template = $this->compiler->template; - $this->smarty = $this->template->smarty; - $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false; - $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template(); + $this->template = $this->compiler->getTemplate(); + $this->smarty = $this->template->getSmarty(); + $this->security = $this->smarty->security_policy ?? false; + $this->current_buffer = $this->root_buffer = new TemplateParseTree(); } /** @@ -163,7 +175,7 @@ class Smarty_Internal_Templateparser */ public function insertPhpCode($code) { - $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code)); + $this->current_buffer->append_subtree($this, new Tag($this, $code)); } /** @@ -185,9 +197,9 @@ class Smarty_Internal_Templateparser * * @param string $code * - * @return Smarty_Internal_ParseTree_Tag + * @return Tag */ - public function mergePrefixCode($code) + private function mergePrefixCode($code) { $tmp = ''; foreach ($this->compiler->prefix_code as $preCode) { @@ -195,7 +207,7 @@ class Smarty_Internal_Templateparser } $this->compiler->prefix_code = array(); $tmp .= $code; - return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true)); + return new Tag($this, $this->compiler->processNocacheCode($tmp)); } } @@ -244,7 +256,7 @@ template ::= template TEXT(B). { $this->current_buffer->append_subtree($this, null); } - $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip)); + $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($text, $this->strip)); } // strip on template ::= template STRIPON. { @@ -257,7 +269,7 @@ template ::= template STRIPOFF. { // Literal template ::= template LITERALSTART literal_e2(B) LITERALEND. { - $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text(B)); + $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text(B)); } @@ -278,11 +290,9 @@ literal_e1(A) ::= . { } // Smarty tag template ::= template smartytag(B). { - if ($this->compiler->has_code) { - $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B)); - } + $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B)); $this->compiler->has_variable_string = false; - $this->block_nesting_level = count($this->compiler->_tag_stack); + $this->block_nesting_level = $this->compiler->getTagStackCount(); } @@ -291,11 +301,13 @@ template ::= . smartytag(A) ::= SIMPELOUTPUT(B). { $var = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $'); + $attributes = []; if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) { - A = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\''))); - } else { - A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\''))); + $attributes[] = 'nocache'; + $var = $match[1]; } + $this->compiler->triggerTagNoCache($var); + A = $this->compiler->compilePrintExpression('$_smarty_tpl->getValue(\''.$var.'\')', $attributes); } // simple tag like {name} @@ -309,7 +321,7 @@ smartytag(A)::= SIMPLETAG(B). { if ($this->security) { $this->security->isTrustedConstant($tag, $this->compiler); } - A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag)); + A = $this->compiler->compilePrintExpression($tag); } else { if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) { A = $this->compiler->compileTag($match[1],array('\'nocache\'')); @@ -324,10 +336,10 @@ smartytag(A) ::= SMARTYBLOCKCHILDPARENT(i). { $j = strrpos(i,'.'); if (i[$j+1] == 'c') { // {$smarty.block.child} - A = $this->compiler->compileTag('child',array(),array(i)); + A = $this->compiler->compileChildBlock(); } else { // {$smarty.block.parent} - A = $this->compiler->compileTag('parent',array(),array(i)); + A = $this->compiler->compileParentBlock(); } } @@ -340,7 +352,7 @@ smartytag(A) ::= LDEL tagbody(B) RDEL. { } // output with optional attributes tagbody(A) ::= outattr(B). { - A = $this->compiler->compileTag('private_print_expression',B[1],array('value'=>B[0])); + A = $this->compiler->compilePrintExpression(B[0], B[1]); } // @@ -364,7 +376,7 @@ outattr(A) ::= output(B) attributes(C). { A = array(B,C); } -output(A) ::= variable(B). { +output(A) ::= variablevalue(B). { A = B; } output(A) ::= value(B). { @@ -380,7 +392,7 @@ tag(res) ::= LDEL ID(i) attributes(a). { if ($this->security) { $this->security->isTrustedConstant(i, $this->compiler); } - res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i)); + res = $this->compiler->compilePrintExpression(i, a); } else { res = $this->compiler->compileTag(i,a); } @@ -390,7 +402,7 @@ tag(res) ::= LDEL ID(i). { if ($this->security) { $this->security->isTrustedConstant(i, $this->compiler); } - res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>i)); + res = $this->compiler->compilePrintExpression(i); } else { res = $this->compiler->compileTag(i,array()); } @@ -403,7 +415,7 @@ tag(res) ::= LDEL ID(i) modifierlist(l)attributes(a). { if ($this->security) { $this->security->isTrustedConstant(i, $this->compiler); } - res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i, 'modifierlist'=>l)); + res = $this->compiler->compilePrintExpression(i, a, l); } else { res = $this->compiler->compileTag(i,a, array('modifierlist'=>l)); } @@ -419,11 +431,6 @@ tag(res) ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). { res = $this->compiler->compileTag(i,a,array('modifierlist'=>l, 'object_method'=>me)); } - // nocache tag -tag(res) ::= LDELMAKENOCACHE DOLLARID(i). { - res = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr(i,1).'\''))); -} - // {if}, {elseif} and {while} tag tag(res) ::= LDELIF(i) expr(ie). { $tag = trim(substr(i,$this->compiler->getLdelLength())); @@ -609,11 +616,26 @@ expr(res) ::= value(v). { res = v; } + // nullcoalescing +expr(res) ::= nullcoalescing(v). { + res = v; +} + // ternary expr(res) ::= ternary(v). { res = v; } + // ++$a / --$a +expr(res) ::= INCDEC(i2) DOLLARID(i). { + res = '$_smarty_tpl->getVariable(\''. substr(i,1) .'\')->preIncDec(\'' . i2 . '\')'; +} + + // $a++ / $a-- +expr(res) ::= DOLLARID(i) INCDEC(i2). { + res = '$_smarty_tpl->getVariable(\''. substr(i,1) .'\')->postIncDec(\'' . i2 . '\')'; +} + // resources/streams expr(res) ::= DOLLARID(i) COLON ID(i2). { res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')'; @@ -642,28 +664,51 @@ expr(res) ::= expr(e1) scond(c). { res = c . e1 . ')'; } -expr(res) ::= expr(e1) ISIN array(a). { - res = 'in_array('.e1.','.a.')'; +isin(res) ::= ISIN(o). { + static $isin = [ + 'isin' => 'in_array(', + 'isnotin' => '!in_array(', + ]; + $op = strtolower(str_replace(' ', '', o)); + res = $isin[$op]; } -expr(res) ::= expr(e1) ISIN value(v). { - res = 'in_array('.e1.',(array)'.v.')'; +expr(res) ::= expr(e1) isin(c) array(a). { + res = c . e1.','.a.')'; } +expr(res) ::= expr(e1) isin(c) value(v). { + res = c . e1.',(array)'.v.')'; +} + +// null coalescing +nullcoalescing(res) ::= expr(v) QMARK QMARK expr(e2). { + res = v.' ?? '.e2; +} // // ternary // -ternary(res) ::= OPENP expr(v) CLOSEP QMARK DOLLARID(e1) COLON expr(e2). { - res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2; +ternary(res) ::= expr(v) QMARK DOLLARID(e1) COLON expr(e2). { + $this->compiler->triggerTagNoCache(substr(e1,1)); + res = v.' ? $_smarty_tpl->getValue(\''.substr(e1,1).'\') : '.e2; } -ternary(res) ::= OPENP expr(v) CLOSEP QMARK expr(e1) COLON expr(e2). { +ternary(res) ::= expr(v) QMARK value(e1) COLON expr(e2). { res = v.' ? '.e1.' : '.e2; } +ternary(res) ::= expr(v) QMARK expr(e1) COLON expr(e2). { + res = v.' ? '.e1.' : '.e2; +} + +// shorthand ternary +ternary(res) ::= expr(v) QMARK COLON expr(e2). { + res = v.' ?: '.e2; +} + // value -value(res) ::= variable(v). { +value(res) ::= variablevalue(v). { res = v; } @@ -681,7 +726,7 @@ value(res) ::= TYPECAST(t) value(v). { res = t.v; } -value(res) ::= variable(v) INCDEC(o). { +value(res) ::= variablevalue(v) INCDEC(o). { res = v.o; } @@ -728,10 +773,10 @@ value(res) ::= OPENP expr(e) CLOSEP. { res = '('. e .')'; } -value(res) ::= variable(v1) INSTANCEOF(i) ns1(v2). { +value(res) ::= variablevalue(v1) INSTANCEOF(i) ns1(v2). { res = v1.i.v2; } -value(res) ::= variable(v1) INSTANCEOF(i) variable(v2). { +value(res) ::= variablevalue(v1) INSTANCEOF(i) variablevalue(v2). { res = v1.i.v2; } @@ -752,9 +797,10 @@ value(res) ::= varindexed(vi) DOUBLECOLON static_class_access(r). { } $prefixVar = $this->compiler->getNewPrefixVariable(); if (vi['var'] === '\'smarty\'') { - $this->compiler->appendPrefixCode("compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>'); + $this->compiler->appendPrefixCode("compile(array(),$this->compiler,vi['smarty_internal_index']).';?>'); } else { - $this->compiler->appendPrefixCode("compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>'); + $this->compiler->triggerTagNoCache(vi['var']); + $this->compiler->appendPrefixCode("getValue(" . vi['var'] . ')'.vi['smarty_internal_index'].';?>'); } res = $prefixVar .'::'.r[0].r[1]; } @@ -762,13 +808,13 @@ value(res) ::= varindexed(vi) DOUBLECOLON static_class_access(r). { // Smarty tag value(res) ::= smartytag(st). { $prefixVar = $this->compiler->getNewPrefixVariable(); - $tmp = $this->compiler->appendCode('', st); + $tmp = $this->compiler->appendCode('', (string) st); $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "")); res = $prefixVar; } value(res) ::= value(v) modifierlist(l). { - res = $this->compiler->compileTag('private_modifier',array(),array('value'=>v,'modifierlist'=>l)); + res = $this->compiler->compileModifier(l, v); } // name space constant value(res) ::= NAMESPACE(c). { @@ -804,54 +850,88 @@ ns1(res) ::= NAMESPACE(i). { } +// variable lists +// multiple variables +variablelist(res) ::= variablelist(l) COMMA variable(v). { + res = array_merge(l,array(v)); +} + +variablelist(res) ::= variablelist(l) COMMA expr(e). { + res = array_merge(l,array(e)); +} + +// single variable +variablelist(res) ::= variable(v). { + res = array(v); +} + +// single expression +variablelist(res) ::= expr(e). { + res = array(e); +} + +// no variable +variablelist(res) ::= . { + res = array(); +} // // variables // // Smarty variable (optional array) variable(res) ::= DOLLARID(i). { - res = $this->compiler->compileVariable('\''.substr(i,1).'\''); + $this->compiler->triggerTagNoCache(substr(i,1)); + res = array('$_smarty_tpl->hasVariable(\''.substr(i,1).'\')','$_smarty_tpl->getValue(\''.substr(i,1).'\')'); } variable(res) ::= varindexed(vi). { if (vi['var'] === '\'smarty\'') { - $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']); - res = $smarty_var; + $smarty_var = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']); + res = array('true', $smarty_var); } else { // used for array reset,next,prev,end,current $this->last_variable = vi['var']; $this->last_index = vi['smarty_internal_index']; - res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index']; + $this->compiler->triggerTagNoCache(vi['var']); + res = array('true', '$_smarty_tpl->getValue(' . vi['var'] . ')'.vi['smarty_internal_index']); } } // variable with property variable(res) ::= varvar(v) AT ID(p). { - res = '$_smarty_tpl->tpl_vars['. v .']->'.p; + res = array('true', '$_smarty_tpl->getVariable('. v .')->'.p); } // object variable(res) ::= object(o). { - res = o; + res = array('true', o); } // config variable -variable(res) ::= HATCH ID(i) HATCH. { +configvariable(res) ::= HATCH ID(i) HATCH. { res = $this->compiler->compileConfigVariable('\'' . i . '\''); } -variable(res) ::= HATCH ID(i) HATCH arrayindex(a). { +configvariable(res) ::= HATCH ID(i) HATCH arrayindex(a). { res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . i . '\'') . ') ? $tmp'.a.' :null)'; } -variable(res) ::= HATCH variable(v) HATCH. { +configvariable(res) ::= HATCH variablevalue(v) HATCH. { res = $this->compiler->compileConfigVariable(v); } -variable(res) ::= HATCH variable(v) HATCH arrayindex(a). { +configvariable(res) ::= HATCH variablevalue(v) HATCH arrayindex(a). { res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable(v) . ') ? $tmp'.a.' : null)'; } +variablevalue(res) ::= variable(v). { + res = v[1]; +} + +variablevalue(res) ::= configvariable(v). { + res = v; +} + varindexed(res) ::= DOLLARID(i) arrayindex(a). { res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a); } @@ -875,14 +955,17 @@ arrayindex ::= . { // single index definition // Smarty2 style index indexdef(res) ::= DOT DOLLARID(i). { - res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']'; + $this->compiler->triggerTagNoCache(substr(i,1)); + res = '[$_smarty_tpl->getValue(\''.substr(i,1).'\')]'; } indexdef(res) ::= DOT varvar(v). { - res = '['.$this->compiler->compileVariable(v).']'; + $this->compiler->triggerTagNoCache(v); + res = '[$_smarty_tpl->getValue(' . v . ')]'; } indexdef(res) ::= DOT varvar(v) AT ID(p). { - res = '['.$this->compiler->compileVariable(v).'->'.p.']'; + $this->compiler->triggerTagNoCache(v); + res = '[$_smarty_tpl->getValue(' . v . ')->'.p.']'; } indexdef(res) ::= DOT ID(i). { @@ -900,11 +983,11 @@ indexdef(res) ::= DOT LDEL expr(e) RDEL. { // section tag index indexdef(res) ::= OPENB ID(i)CLOSEB. { - res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\'index\']').']'; + res = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.i.'\'][\'index\']').']'; } indexdef(res) ::= OPENB ID(i) DOT ID(i2) CLOSEB. { - res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\''.i2.'\']').']'; + res = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.i.'\'][\''.i2.'\']').']'; } indexdef(res) ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. { res = '['.s.']'; @@ -913,9 +996,10 @@ indexdef(res) ::= OPENB INTEGER(n) CLOSEB. { res = '['.n.']'; } indexdef(res) ::= OPENB DOLLARID(i) CLOSEB. { - res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']'; + $this->compiler->triggerTagNoCache(substr(i,1)); + res = '[$_smarty_tpl->getValue(\''.substr(i,1).'\')]'; } -indexdef(res) ::= OPENB variable(v) CLOSEB. { +indexdef(res) ::= OPENB variablevalue(v) CLOSEB. { res = '['.v.']'; } indexdef(res) ::= OPENB value(v) CLOSEB. { @@ -957,7 +1041,8 @@ varvarele(res) ::= ID(s). { } varvarele(res) ::= SIMPELOUTPUT(i). { $var = trim(substr(i, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $'); - res = $this->compiler->compileVariable('\''.$var.'\''); + $this->compiler->triggerTagNoCache($var); + res = '$_smarty_tpl->getValue(\''.$var.'\')'; } // variable sections of element @@ -970,9 +1055,10 @@ varvarele(res) ::= LDEL expr(e) RDEL. { // object(res) ::= varindexed(vi) objectchain(oc). { if (vi['var'] === '\'smarty\'') { - res = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).oc; + res = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']).oc; } else { - res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc; + $this->compiler->triggerTagNoCache(vi['var']); + res = '$_smarty_tpl->getValue(' . vi['var'] . ')'.vi['smarty_internal_index'].oc; } } @@ -998,7 +1084,8 @@ objectelement(res)::= PTR varvar(v) arrayindex(a). { if ($this->security) { $this->compiler->trigger_template_error (self::ERR2); } - res = '->{'.$this->compiler->compileVariable(v).a.'}'; + $this->compiler->triggerTagNoCache(v); + res = '->{$_smarty_tpl->getValue(' . v . ')'.a.'}'; } objectelement(res)::= PTR LDEL expr(e) RDEL arrayindex(a). { @@ -1024,8 +1111,41 @@ objectelement(res)::= PTR method(f). { // // function // -function(res) ::= ns1(f) OPENP params(p) CLOSEP. { - res = $this->compiler->compilePHPFunctionCall(f, p); +function(res) ::= ns1(f) OPENP variablelist(v) CLOSEP. { + + if (f == 'isset') { + res = '(true'; + if (count(v) == 0) { + throw new CompilerException("Invalid number of arguments for isset. isset expects at least one parameter."); + } + foreach (v as $value) { + if (is_array($value)) { + res .= ' && (' . $value[0] . ' && null !== (' . $value[1] . ' ?? null))'; + } else { + res .= ' && (' . $value . ' !== null)'; + } + } + res .= ')'; + } elseif (f == 'empty') { + if (count(v) != 1) { + throw new CompilerException("Invalid number of arguments for empty. empty expects at exactly one parameter."); + } + if (is_array(v[0])) { + res .= '( !' . v[0][0] . ' || empty(' . v[0][1] . '))'; + } else { + res = 'false == ' . v[0]; + } + } else { + $p = array(); + foreach (v as $value) { + if (is_array($value)) { + $p[] = $value[1]; + } else { + $p[] = $value; + } + } + res = $this->compiler->compileModifierInExpression(f, $p); + } } @@ -1044,7 +1164,8 @@ method(res) ::= DOLLARID(f) OPENP params(p) CLOSEP. { $this->compiler->trigger_template_error (self::ERR2); } $prefixVar = $this->compiler->getNewPrefixVariable(); - $this->compiler->appendPrefixCode("compiler->compileVariable('\''.substr(f,1).'\'').';?>'); + $this->compiler->triggerTagNoCache(substr(f,1)); + $this->compiler->appendPrefixCode("getValue('".substr(f,1).'\')'.';?>'); res = $prefixVar .'('. implode(',',p) .')'; } @@ -1059,7 +1180,7 @@ params(res) ::= expr(e). { res = array(e); } - // kein parameter + // no parameter params(res) ::= . { res = array(); } @@ -1200,6 +1321,10 @@ arrayelements(res) ::= arrayelements(a1) COMMA arrayelement(a). { res = a1.','.a; } +arrayelements(res) ::= arrayelements(a) COMMA. { + res = a.','; +} + arrayelements ::= . { return; } @@ -1236,34 +1361,34 @@ doublequoted(res) ::= doublequoted(o1) doublequotedcontent(o2). { } doublequoted(res) ::= doublequotedcontent(o). { - res = new Smarty_Internal_ParseTree_Dq($this, o); + res = new Dq($this, o); } -doublequotedcontent(res) ::= BACKTICK variable(v) BACKTICK. { - res = new Smarty_Internal_ParseTree_Code('(string)'.v); +doublequotedcontent(res) ::= BACKTICK variablevalue(v) BACKTICK. { + res = new Code('(string)'.v); } doublequotedcontent(res) ::= BACKTICK expr(e) BACKTICK. { - res = new Smarty_Internal_ParseTree_Code('(string)('.e.')'); + res = new Code('(string)('.e.')'); } doublequotedcontent(res) ::= DOLLARID(i). { - res = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value'); + res = new Code('(string)$_smarty_tpl->getValue(\''. substr(i,1) .'\')'); } -doublequotedcontent(res) ::= LDEL variable(v) RDEL. { - res = new Smarty_Internal_ParseTree_Code('(string)'.v); +doublequotedcontent(res) ::= LDEL variablevalue(v) RDEL. { + res = new Code('(string)'.v); } doublequotedcontent(res) ::= LDEL expr(e) RDEL. { - res = new Smarty_Internal_ParseTree_Code('(string)('.e.')'); + res = new Code('(string)('.e.')'); } doublequotedcontent(res) ::= smartytag(st). { - res = new Smarty_Internal_ParseTree_Tag($this, st); + res = new Tag($this, st); } doublequotedcontent(res) ::= TEXT(o). { - res = new Smarty_Internal_ParseTree_DqContent(o); + res = new DqContent(o); } diff --git a/include/smarty/src/Resource/BasePlugin.php b/include/smarty/src/Resource/BasePlugin.php new file mode 100644 index 000000000..6d2222237 --- /dev/null +++ b/include/smarty/src/Resource/BasePlugin.php @@ -0,0 +1,145 @@ + FilePlugin::class, + 'string' => StringPlugin::class, + 'extends' => ExtendsPlugin::class, + 'stream' => StreamPlugin::class, + 'eval' => StringEval::class, + ]; + + /** + * Source must be recompiled on every occasion + * + * @var boolean + */ + public $recompiled = false; + + /** + * Flag if resource does allow compilation + * + * @return bool + */ + public function supportsCompiledTemplates(): bool { + return true; + } + + /** + * Check if resource must check time stamps when loading compiled or cached templates. + * Resources like 'extends' which use source components my disable timestamp checks on own resource. + * @return bool + */ + public function checkTimestamps() + { + return true; + } + + /** + * Load Resource Handler + * + * @param Smarty $smarty smarty object + * @param string $type name of the resource + * + * @return BasePlugin Resource Handler + * @throws Exception + */ + public static function load(Smarty $smarty, $type) + { + // try smarty's cache + if (isset($smarty->_resource_handlers[ $type ])) { + return $smarty->_resource_handlers[ $type ]; + } + // try registered resource + if (isset($smarty->registered_resources[ $type ])) { + return $smarty->_resource_handlers[ $type ] = $smarty->registered_resources[ $type ]; + } + // try sysplugins dir + if (isset(self::$sysplugins[ $type ])) { + $_resource_class = self::$sysplugins[ $type ]; + return $smarty->_resource_handlers[ $type ] = new $_resource_class(); + } + // try plugins dir + $_resource_class = 'Smarty_Resource_' . \smarty_ucfirst_ascii($type); + if (class_exists($_resource_class, false)) { + return $smarty->_resource_handlers[ $type ] = new $_resource_class(); + } + // try streams + $_known_stream = stream_get_wrappers(); + if (in_array($type, $_known_stream)) { + // is known stream + if (is_object($smarty->security_policy)) { + $smarty->security_policy->isTrustedStream($type); + } + return $smarty->_resource_handlers[ $type ] = new StreamPlugin(); + } + // TODO: try default_(template|config)_handler + // give up + throw new \Smarty\Exception("Unknown resource type '{$type}'"); + } + + /** + * Load template's source into current template object + * + * @param Source $source source object + * + * @return string template source + * @throws \Smarty\Exception if source cannot be loaded + */ + abstract public function getContent(Source $source); + + /** + * populate Source Object with metadata from Resource + * + * @param Source $source source object + * @param Template|null $_template template object + */ + abstract public function populate(Source $source, ?\Smarty\Template $_template = null); + + /** + * populate Source Object with timestamp and exists from Resource + * + * @param Source $source source object + */ + public function populateTimestamp(Source $source) + { + // intentionally left blank + } + + /* + * Check if resource must check time stamps when when loading complied or cached templates. + * Resources like 'extends' which use source components my disable timestamp checks on own resource. + * + * @return bool + */ + /** + * Determine basename for compiled filename + * + * @param \Smarty\Template\Source $source source object + * + * @return string resource's basename + */ + public function getBasename(\Smarty\Template\Source $source) + { + return basename(preg_replace('![^\w]+!', '_', $source->name)); + } + +} diff --git a/include/smarty/src/Resource/CustomPlugin.php b/include/smarty/src/Resource/CustomPlugin.php new file mode 100644 index 000000000..895e97108 --- /dev/null +++ b/include/smarty/src/Resource/CustomPlugin.php @@ -0,0 +1,105 @@ +uid = sha1($source->type . ':' . $source->name); + $mtime = $this->fetchTimestamp($source->name); + if ($mtime !== null) { + $source->timestamp = $mtime; + } else { + $this->fetch($source->name, $content, $timestamp); + $source->timestamp = $timestamp ?? false; + if (isset($content)) { + $source->content = $content; + } + } + $source->exists = !!$source->timestamp; + } + + /** + * Load template's source into current template object + * + * @param Source $source source object + * + * @return string template source + * @throws Exception if source cannot be loaded + */ + public function getContent(Source $source) { + $this->fetch($source->name, $content, $timestamp); + if (isset($content)) { + return $content; + } + throw new Exception("Unable to read template {$source->type} '{$source->name}'"); + } + + /** + * Determine basename for compiled filename + * + * @param Source $source source object + * + * @return string resource's basename + */ + public function getBasename(Source $source) { + return basename($this->generateSafeName($source->name)); + } + + /** + * Removes special characters from $name and limits its length to 127 characters. + * + * @param $name + * + * @return string + */ + private function generateSafeName($name): string { + return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string)$name), 0, 127); + } +} diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/include/smarty/src/Resource/ExtendsPlugin.php similarity index 50% rename from include/smarty/libs/sysplugins/smarty_internal_resource_extends.php rename to include/smarty/src/Resource/ExtendsPlugin.php index 80946932e..960e37971 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php +++ b/include/smarty/src/Resource/ExtendsPlugin.php @@ -1,59 +1,45 @@ name); - $smarty = &$source->smarty; + $smarty = $source->getSmarty(); $exists = true; foreach ($components as $component) { - /* @var \Smarty_Template_Source $_s */ - $_s = Smarty_Template_Source::load(null, $smarty, $component); - if ($_s->type === 'php') { - throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type"); - } + $_s = Source::load(null, $smarty, $component); $sources[ $_s->uid ] = $_s; - $uid .= $_s->filepath; + $uid .= $_s->uid; if ($_template) { $exists = $exists && $_s->exists; } } $source->components = $sources; - $source->filepath = $_s->filepath; - $source->uid = sha1($uid . $source->smarty->_joined_template_dir); + $source->uid = sha1($uid . $source->getSmarty()->_joined_template_dir); $source->exists = $exists; if ($_template) { $source->timestamp = $_s->timestamp; @@ -63,12 +49,12 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource /** * populate Source Object with timestamp and exists from Resource * - * @param Smarty_Template_Source $source source object + * @param Source $source source object */ - public function populateTimestamp(Smarty_Template_Source $source) + public function populateTimestamp(Source $source) { $source->exists = true; - /* @var \Smarty_Template_Source $_s */ + /* @var Source $_s */ foreach ($source->components as $_s) { $source->exists = $source->exists && $_s->exists; } @@ -78,19 +64,19 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource /** * Load template's source from files into current template object * - * @param Smarty_Template_Source $source source object + * @param Source $source source object * * @return string template source - * @throws SmartyException if source cannot be loaded + * @throws \Smarty\Exception if source cannot be loaded */ - public function getContent(Smarty_Template_Source $source) + public function getContent(Source $source) { if (!$source->exists) { - throw new SmartyException("Unable to load template '{$source->type}:{$source->name}'"); + throw new \Smarty\Exception("Unable to load '{$source->type}:{$source->name}'"); } $_components = array_reverse($source->components); $_content = ''; - /* @var \Smarty_Template_Source $_s */ + /* @var Source $_s */ foreach ($_components as $_s) { // read content $_content .= $_s->getContent(); @@ -101,13 +87,17 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object + * @param Source $source source object * * @return string resource's basename */ - public function getBasename(Smarty_Template_Source $source) + public function getBasename(Source $source) { - return str_replace(':', '.', basename($source->filepath)); + $search = array(':'); + if (\Smarty\Smarty::$_IS_WINDOWS) { + $search = array(':', '|'); + } + return str_replace($search, '.', basename($source->getResourceName())); } /* diff --git a/include/smarty/src/Resource/FilePlugin.php b/include/smarty/src/Resource/FilePlugin.php new file mode 100644 index 000000000..0033c8348 --- /dev/null +++ b/include/smarty/src/Resource/FilePlugin.php @@ -0,0 +1,183 @@ +uid = sha1( + $source->name . ($source->isConfig ? $source->getSmarty()->_joined_config_dir : + $source->getSmarty()->_joined_template_dir) + ); + + if ($path = $this->getFilePath($source->name, $source->getSmarty(), $source->isConfig)) { + if (isset($source->getSmarty()->security_policy) && is_object($source->getSmarty()->security_policy)) { + $source->getSmarty()->security_policy->isTrustedResourceDir($path, $source->isConfig); + } + $source->exists = true; + $source->timestamp = filemtime($path); + } else { + $source->timestamp = $source->exists = false; + } + } + + /** + * populate Source Object with timestamp and exists from Resource + * + * @param Source $source source object + */ + public function populateTimestamp(Source $source) { + $path = $this->getFilePath($source->name, $source->getSmarty(), $source->isConfig); + if (!$source->exists) { + $source->exists = ($path !== false && is_file($path)); + } + if ($source->exists && $path !== false) { + $source->timestamp = filemtime($path); + } else { + $source->timestamp = 0; + } + } + + /** + * Load template's source from file into current template object + * + * @param Source $source source object + * + * @return string template source + * @throws Exception if source cannot be loaded + */ + public function getContent(Source $source) { + if ($source->exists) { + return file_get_contents($this->getFilePath($source->getResourceName(), $source->getSmarty(), $source->isConfig())); + } + throw new Exception( + 'Unable to read ' . ($source->isConfig ? 'config' : 'template') . + " {$source->type} '{$source->name}'" + ); + } + + /** + * Determine basename for compiled filename + * + * @param Source $source source object + * + * @return string resource's basename + */ + public function getBasename(Source $source) { + return basename($source->getResourceName()); + } + + /** + * build template filepath by traversing the template_dir array + * + * @param $file + * @param Smarty $smarty + * @param bool $isConfig + * + * @return string fully qualified filepath + */ + public function getFilePath($file, \Smarty\Smarty $smarty, bool $isConfig = false) { + // absolute file ? + if ($file[0] === '/' || $file[1] === ':') { + $file = $smarty->_realpath($file, true); + return is_file($file) ? $file : false; + } + + // normalize DIRECTORY_SEPARATOR + if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) { + $file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file); + } + $_directories = $smarty->getTemplateDir(null, $isConfig); + // template_dir index? + if ($file[0] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) { + $file = $fileMatch[2]; + $_indices = explode(',', $fileMatch[1]); + $_index_dirs = []; + foreach ($_indices as $index) { + $index = trim($index); + // try string indexes + if (isset($_directories[$index])) { + $_index_dirs[] = $_directories[$index]; + } elseif (is_numeric($index)) { + // try numeric index + $index = (int)$index; + if (isset($_directories[$index])) { + $_index_dirs[] = $_directories[$index]; + } else { + // try at location index + $keys = array_keys($_directories); + if (isset($_directories[$keys[$index]])) { + $_index_dirs[] = $_directories[$keys[$index]]; + } + } + } + } + if (empty($_index_dirs)) { + // index not found + return false; + } else { + $_directories = $_index_dirs; + } + } + // relative file name? + foreach ($_directories as $_directory) { + $path = $_directory . $file; + if (is_file($path)) { + return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $smarty->_realpath($path) : $path; + } + } + if (!isset($_index_dirs)) { + // Could be relative to cwd + $path = $smarty->_realpath($file, true); + if (is_file($path)) { + return $path; + } + } + return false; + } + + /** + * Returns the timestamp of the resource indicated by $resourceName, or false if it doesn't exist. + * + * @param string $resourceName + * @param Smarty $smarty + * @param bool $isConfig + * + * @return false|int + */ + public function getResourceNameTimestamp(string $resourceName, \Smarty\Smarty $smarty, bool $isConfig = false) { + if ($path = $this->getFilePath($resourceName, $smarty, $isConfig)) { + return filemtime($path); + } + return false; + } +} diff --git a/include/smarty/src/Resource/RecompiledPlugin.php b/include/smarty/src/Resource/RecompiledPlugin.php new file mode 100644 index 000000000..f1c64bc78 --- /dev/null +++ b/include/smarty/src/Resource/RecompiledPlugin.php @@ -0,0 +1,50 @@ +uid = false; + $source->content = $this->getContent($source); + $source->timestamp = $source->exists = !!$source->content; + } + + /** + * Load template's source from stream into current template object + * + * @param Source $source source object + * + * @return string template source + */ + public function getContent(Source $source) { + + if (strpos($source->getResourceName(), '://') !== false) { + $filepath = $source->getResourceName(); + } else { + $filepath = str_replace(':', '://', $source->getFullResourceName()); + } + + $t = ''; + // the availability of the stream has already been checked in Smarty\Resource\Base::fetch() + $fp = fopen($filepath, 'r+'); + if ($fp) { + while (!feof($fp) && ($current_line = fgets($fp)) !== false) { + $t .= $current_line; + } + fclose($fp); + return $t; + } else { + return false; + } + } + +} diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/include/smarty/src/Resource/StringEval.php similarity index 53% rename from include/smarty/libs/sysplugins/smarty_internal_resource_eval.php rename to include/smarty/src/Resource/StringEval.php index 3b552a589..2aa60ffb7 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php +++ b/include/smarty/src/Resource/StringEval.php @@ -1,9 +1,14 @@ uid = $source->filepath = sha1($source->name); + $source->uid = sha1($source->name); $source->timestamp = $source->exists = true; } /** * Load template's source from $resource_name into current template object * - * @uses decode() to decode base64 and urlencoded template_resources - * - * @param Smarty_Template_Source $source source object + * @param \Smarty\Template\Source $source source object * * @return string template source + *@uses decode() to decode base64 and urlencoded template_resources + * */ - public function getContent(Smarty_Template_Source $source) + public function getContent(\Smarty\Template\Source $source) { return $this->decode($source->name); } @@ -66,28 +71,14 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled return $string; } - /** - * modify resource_name according to resource handlers specifications - * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @param boolean $isConfig flag for config resource - * - * @return string unique resource name - */ - public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false) - { - return get_class($this) . '#' . $this->decode($resource_name); - } - /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object + * @param \Smarty\Template\Source $source source object * * @return string resource's basename */ - public function getBasename(Smarty_Template_Source $source) + public function getBasename(\Smarty\Template\Source $source) { return ''; } diff --git a/include/smarty/src/Resource/StringPlugin.php b/include/smarty/src/Resource/StringPlugin.php new file mode 100644 index 000000000..fb3692c73 --- /dev/null +++ b/include/smarty/src/Resource/StringPlugin.php @@ -0,0 +1,94 @@ +uid = sha1($source->name); + $source->timestamp = $source->exists = true; + } + + /** + * Load template's source from $resource_name into current template object + * + * @param Source $source source object + * + * @return string template source + * @uses decode() to decode base64 and urlencoded template_resources + * + */ + public function getContent(Source $source) { + return $this->decode($source->name); + } + + /** + * decode base64 and urlencode + * + * @param string $string template_resource to decode + * + * @return string decoded template_resource + */ + protected function decode($string) { + // decode if specified + if (($pos = strpos($string, ':')) !== false) { + if (!strncmp($string, 'base64', 6)) { + return base64_decode(substr($string, 7)); + } elseif (!strncmp($string, 'urlencode', 9)) { + return urldecode(substr($string, 10)); + } + } + return $string; + } + + /** + * Determine basename for compiled filename + * Always returns an empty string. + * + * @param Source $source source object + * + * @return string resource's basename + */ + public function getBasename(Source $source) { + return ''; + } + + /* + * Disable timestamp checks for string resource. + * + * @return bool + */ + /** + * @return bool + */ + public function checkTimestamps() { + return false; + } +} diff --git a/include/smarty/libs/sysplugins/smarty_internal_block.php b/include/smarty/src/Runtime/Block.php similarity index 81% rename from include/smarty/libs/sysplugins/smarty_internal_block.php rename to include/smarty/src/Runtime/Block.php index 9956d642b..90eab9cbb 100644 --- a/include/smarty/libs/sysplugins/smarty_internal_block.php +++ b/include/smarty/src/Runtime/Block.php @@ -1,13 +1,15 @@ registerCallbacks($_template); + + $this->captureStack[] = [ + $buffer, + $assign, + $append, + ]; + $this->captureCount++; + ob_start(); + } + + /** + * Register callbacks in template class + * + * @param \Smarty\Template $_template + */ + private function registerCallbacks(Template $_template) { + + foreach ($_template->startRenderCallbacks as $callback) { + if (is_array($callback) && get_class($callback[0]) == self::class) { + // already registered + return; + } + } + + $_template->startRenderCallbacks[] = [ + $this, + 'startRender', + ]; + $_template->endRenderCallbacks[] = [ + $this, + 'endRender', + ]; + $this->startRender($_template); + } + + /** + * Start render callback + * + * @param \Smarty\Template $_template + */ + public function startRender(Template $_template) { + $this->countStack[] = $this->captureCount; + $this->captureCount = 0; + } + + /** + * Close capture section + * + * @param \Smarty\Template $_template + * + * @throws \Smarty\Exception + */ + public function close(Template $_template) { + if ($this->captureCount) { + [$buffer, $assign, $append] = array_pop($this->captureStack); + $this->captureCount--; + if (isset($assign)) { + $_template->assign($assign, ob_get_contents()); + } + if (isset($append)) { + $_template->append($append, ob_get_contents()); + } + $this->namedBuffer[$buffer] = ob_get_clean(); + } else { + $this->error($_template); + } + } + + /** + * Error exception on not matching {capture}{/capture} + * + * @param \Smarty\Template $_template + * + * @throws \Smarty\Exception + */ + public function error(Template $_template) { + throw new \Smarty\Exception("Not matching {capture}{/capture} in '{$_template->template_resource}'"); + } + + /** + * Return content of named capture buffer by key or as array + * + * @param \Smarty\Template $_template + * @param string|null $name + * + * @return string|string[]|null + */ + public function getBuffer(Template $_template, $name = null) { + if (isset($name)) { + return $this->namedBuffer[$name] ?? null; + } else { + return $this->namedBuffer; + } + } + + /** + * End render callback + * + * @param \Smarty\Template $_template + * + * @throws \Smarty\Exception + */ + public function endRender(Template $_template) { + if ($this->captureCount) { + $this->error($_template); + } else { + $this->captureCount = array_pop($this->countStack); + } + } +} diff --git a/include/smarty/src/Runtime/DefaultPluginHandlerRuntime.php b/include/smarty/src/Runtime/DefaultPluginHandlerRuntime.php new file mode 100644 index 000000000..f3be85ca6 --- /dev/null +++ b/include/smarty/src/Runtime/DefaultPluginHandlerRuntime.php @@ -0,0 +1,73 @@ +defaultPluginHandler = $defaultPluginHandler; + } + + public function hasPlugin($tag, $plugin_type): bool { + if ($this->defaultPluginHandler === null) { + return false; + } + + $callback = null; + + // these are not used here + $script = null; + $cacheable = null; + + return (\call_user_func_array( + $this->defaultPluginHandler, + [ + $tag, + $plugin_type, + null, // This used to pass $this->template, but this parameter has been removed in 5.0 + &$callback, + &$script, + &$cacheable, + ] + ) && $callback); + } + + /** + * @throws Exception + */ + public function getCallback($tag, $plugin_type) { + + if ($this->defaultPluginHandler === null) { + return false; + } + + $callback = null; + + // these are not used here + $script = null; + $cacheable = null; + + if (\call_user_func_array( + $this->defaultPluginHandler, + [ + $tag, + $plugin_type, + null, // This used to pass $this->template, but this parameter has been removed in 5.0 + &$callback, + &$script, + &$cacheable, + ] + ) && $callback) { + return $callback; + } + throw new Exception("Default plugin handler: Returned callback for '{$tag}' not callable at runtime"); + } + +} \ No newline at end of file diff --git a/include/smarty/src/Runtime/ForeachRuntime.php b/include/smarty/src/Runtime/ForeachRuntime.php new file mode 100644 index 000000000..06da7d546 --- /dev/null +++ b/include/smarty/src/Runtime/ForeachRuntime.php @@ -0,0 +1,160 @@ +count($from); + } + } else { + settype($from, 'array'); + } + } + if (!isset($total)) { + $total = empty($from) ? 0 : ($needTotal ? count($from) : 1); + } + if ($tpl->hasVariable($item)) { + $saveVars['item'] = [ + $item, + $tpl->getVariable($item)->getValue(), + ]; + } + $tpl->assign($item,null); + if ($total === 0) { + $from = null; + } else { + if ($key) { + if ($tpl->hasVariable($key)) { + $saveVars['key'] = [ + $key, + clone $tpl->getVariable($key), + ]; + } + $tpl->assign($key, null); + } + } + if ($needTotal) { + $tpl->getVariable($item)->total = $total; + } + if ($name) { + $namedVar = "__smarty_foreach_{$name}"; + if ($tpl->hasVariable($namedVar)) { + $saveVars['named'] = [ + $namedVar, + clone $tpl->getVariable($namedVar), + ]; + } + $namedProp = []; + if (isset($properties['total'])) { + $namedProp['total'] = $total; + } + if (isset($properties['iteration'])) { + $namedProp['iteration'] = 0; + } + if (isset($properties['index'])) { + $namedProp['index'] = -1; + } + if (isset($properties['show'])) { + $namedProp['show'] = ($total > 0); + } + $tpl->assign($namedVar, $namedProp); + } + $this->stack[] = $saveVars; + return $from; + } + + /** + * [util function] counts an array, arrayAccess/traversable or PDOStatement object + * + * @param mixed $value + * + * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 + * for empty elements + * @throws \Exception + */ + public function count($value): int + { + if ($value instanceof \IteratorAggregate) { + // Note: getIterator() returns a Traversable, not an Iterator + // thus rewind() and valid() methods may not be present + return iterator_count($value->getIterator()); + } elseif ($value instanceof \Iterator) { + return $value instanceof \Generator ? 1 : iterator_count($value); + } elseif ($value instanceof \Countable) { + return count($value); + } + return count((array) $value); + } + + /** + * Restore saved variables + * + * will be called by {break n} or {continue n} for the required number of levels + * + * @param \Smarty\Template $tpl + * @param int $levels number of levels + */ + public function restore(Template $tpl, $levels = 1) { + while ($levels) { + $saveVars = array_pop($this->stack); + if (!empty($saveVars)) { + if (isset($saveVars['item'])) { + $tpl->getVariable($saveVars['item'][0])->setValue($saveVars['item'][1]); + } + if (isset($saveVars['key'])) { + $tpl->setVariable($saveVars['key'][0], $saveVars['key'][1]); + } + if (isset($saveVars['named'])) { + $tpl->setVariable($saveVars['named'][0], $saveVars['named'][1]); + } + } + $levels--; + } + } +} diff --git a/include/smarty/src/Runtime/InheritanceRuntime.php b/include/smarty/src/Runtime/InheritanceRuntime.php new file mode 100644 index 000000000..74ea85440 --- /dev/null +++ b/include/smarty/src/Runtime/InheritanceRuntime.php @@ -0,0 +1,243 @@ +state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) { + $tpl->setInheritance(clone $tpl->getSmarty()->getRuntime('Inheritance')); + $tpl->getInheritance()->init($tpl, $initChild, $blockNames); + return; + } + ++$this->tplIndex; + $this->sources[$this->tplIndex] = $tpl->getSource(); + // start of child sub template(s) + if ($initChild) { + $this->state = 1; + if (!$this->inheritanceLevel) { + //grab any output of child templates + ob_start(); + } + ++$this->inheritanceLevel; + } + // if state was waiting for parent change state to parent + if ($this->state === 2) { + $this->state = 3; + } + } + + /** + * End of child template(s) + * - if outer level is reached flush output buffer and switch to wait for parent template state + * + * @param \Smarty\Template $tpl + * @param null|string $template optional name of inheritance parent template + * + * @throws \Exception + * @throws \Smarty\Exception + */ + public function endChild(Template $tpl, $template = null, ?string $currentDir = null) { + --$this->inheritanceLevel; + if (!$this->inheritanceLevel) { + ob_end_clean(); + $this->state = 2; + } + if (isset($template)) { + $tpl->renderSubTemplate( + $template, + $tpl->cache_id, + $tpl->compile_id, + $tpl->caching ? \Smarty\Template::CACHING_NOCACHE_CODE : 0, + $tpl->cache_lifetime, + [], + null, + $currentDir + ); + } + } + + /** + * \Smarty\Runtime\Block constructor. + * - if outer level {block} of child template ($state === 1) save it as child root block + * - otherwise process inheritance and render + * + * @param \Smarty\Template $tpl + * @param $className + * @param string $name + * @param int|null $tplIndex index of outer level {block} if nested + * + * @throws \Smarty\Exception + */ + public function instanceBlock(Template $tpl, $className, $name, $tplIndex = null) { + $block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex); + if (isset($this->childRoot[$name])) { + $block->child = $this->childRoot[$name]; + } + if ($this->state === 1) { + $this->childRoot[$name] = $block; + return; + } + // make sure we got child block of child template of current block + while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) { + $block->child = $block->child->child; + } + $this->processBlock($tpl, $block); + } + + /** + * Goto child block or render this + * + * @param Template $tpl + * @param \Smarty\Runtime\Block $block + * @param \Smarty\Runtime\Block|null $parent + * + * @throws Exception + */ + private function processBlock( + Template $tpl, + \Smarty\Runtime\Block $block, + ?\Smarty\Runtime\Block $parent = null + ) { + if ($block->hide && !isset($block->child)) { + return; + } + if (isset($block->child) && $block->child->hide && !isset($block->child->child)) { + $block->child = null; + } + $block->parent = $parent; + if ($block->append && !$block->prepend && isset($parent)) { + $this->callParent($tpl, $block, '\'{block append}\''); + } + if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) { + $this->callBlock($block, $tpl); + } else { + $this->processBlock($tpl, $block->child, $block); + } + if ($block->prepend && isset($parent)) { + $this->callParent($tpl, $block, '{block prepend}'); + if ($block->append) { + if ($block->callsChild || !isset($block->child) + || ($block->child->hide && !isset($block->child->child)) + ) { + $this->callBlock($block, $tpl); + } else { + $this->processBlock($tpl, $block->child, $block); + } + } + } + $block->parent = null; + } + + /** + * Render child on \$smarty.block.child + * + * @param Template $tpl + * @param \Smarty\Runtime\Block $block + * + * @return null|string block content + * @throws Exception + */ + public function callChild(Template $tpl, \Smarty\Runtime\Block $block) { + if (isset($block->child)) { + $this->processBlock($tpl, $block->child, $block); + } + } + + /** + * Render parent block on \$smarty.block.parent or {block append/prepend} + * + * @param Template $tpl + * @param \Smarty\Runtime\Block $block + * @param string $tag + * + * @return null|string block content + * @throws Exception + */ + public function callParent(Template $tpl, \Smarty\Runtime\Block $block) { + if (isset($block->parent)) { + $this->callBlock($block->parent, $tpl); + } else { + throw new Exception("inheritance: illegal '{\$smarty.block.parent}' used in child template '" . + "{$tpl->getInheritance()->sources[$block->tplIndex]->getResourceName()}' block '{$block->name}'"); + } + } + + /** + * render block + * + * @param \Smarty\Runtime\Block $block + * @param Template $tpl + */ + public function callBlock(\Smarty\Runtime\Block $block, Template $tpl) { + $this->sourceStack[] = $tpl->getSource(); + $tpl->setSource($this->sources[$block->tplIndex]); + $block->callBlock($tpl); + $tpl->setSource(array_pop($this->sourceStack)); + } +} diff --git a/include/smarty/src/Runtime/TplFunctionRuntime.php b/include/smarty/src/Runtime/TplFunctionRuntime.php new file mode 100644 index 000000000..6c4b93d73 --- /dev/null +++ b/include/smarty/src/Runtime/TplFunctionRuntime.php @@ -0,0 +1,144 @@ +tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? null); + if (!isset($funcParam)) { + throw new \Smarty\Exception("Unable to find template function '{$name}'"); + } + + if (!$tpl->caching || ($tpl->caching && $nocache)) { + $function = $funcParam['call_name']; + } else { + if (isset($funcParam['call_name_caching'])) { + $function = $funcParam['call_name_caching']; + } else { + $function = $funcParam['call_name']; + } + } + if (!function_exists($function) && !$this->addTplFuncToCache($tpl, $name, $function)) { + throw new \Smarty\Exception("Unable to find template function '{$name}'"); + } + + $tpl->pushStack(); + $function($tpl, $params); + $tpl->popStack(); + } + + /** + * Register template functions defined by template + * + * @param \Smarty|\Smarty\Template|\Smarty\TemplateBase $obj + * @param array $tplFunctions source information array of + * template functions defined + * in template + * @param bool $override if true replace existing + * functions with same name + */ + public function registerTplFunctions(TemplateBase $obj, $tplFunctions, $override = true) { + $obj->tplFunctions = + $override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions); + // make sure that the template functions are known in parent templates + if ($obj->_isSubTpl()) { + $this->registerTplFunctions($obj->parent, $tplFunctions, false); + } else { + $obj->getSmarty()->tplFunctions = $override ? array_merge($obj->getSmarty()->tplFunctions, $tplFunctions) : + array_merge($tplFunctions, $obj->getSmarty()->tplFunctions); + } + } + + /** + * Return source parameter array for single or all template functions + * + * @param \Smarty\Template $tpl template object + * @param null|string $name template function name + * + * @return array|bool|mixed + */ + public function getTplFunction(Template $tpl, $name = null) { + if (isset($name)) { + return $tpl->tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? false); + } else { + return empty($tpl->tplFunctions) ? $tpl->getSmarty()->tplFunctions : $tpl->tplFunctions; + } + } + + /** + * Add template function to cache file for nocache calls + * + * @param Template $tpl + * @param string $_name template function name + * @param string $_function PHP function name + * + * @return bool + * @throws Exception + */ + private function addTplFuncToCache(Template $tpl, $_name, $_function) { + $funcParam = $tpl->tplFunctions[$_name]; + if (is_file($funcParam['compiled_filepath'])) { + // read compiled file + $code = file_get_contents($funcParam['compiled_filepath']); + // grab template function + if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) { + // grab source info from file dependency + preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1); + unset($code); + // make PHP function known + eval($match[0]); + if (function_exists($_function)) { + + // Some magic code existed here, testing if the cached property had been set + // and then bubbling up until it found a parent template that had the cached property. + // This is no longer possible, so somehow this might break. + + // add template function code to cache file + $content = $tpl->getCached()->readCache($tpl); + if ($content) { + // check if we must update file dependency + if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) { + $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content); + } + $tpl->getCached()->writeCache( + $tpl, + preg_replace('/\s*\?>\s*$/', "\n", $content) . + "\n" . preg_replace( + [ + '/^\s*<\?php\s+/', + '/\s*\?>\s*$/', + ], + "\n", + $match[0] + ) + ); + } + return true; + } + } + } + return false; + } + +} diff --git a/include/smarty/src/Security.php b/include/smarty/src/Security.php new file mode 100644 index 000000000..250b3bca7 --- /dev/null +++ b/include/smarty/src/Security.php @@ -0,0 +1,560 @@ + array('method_1', 'method_2'), // allowed methods listed + * 'class_2' => array(), // all methods of class allowed + * ) + * If set to null none is allowed. + * + * @var array + */ + public $trusted_static_methods = []; + + /** + * This is an array of trusted static properties. + * If empty access to all static classes and properties is allowed. + * Format: + * array ( + * 'class_1' => array('prop_1', 'prop_2'), // allowed properties listed + * 'class_2' => array(), // all properties of class allowed + * ) + * If set to null none is allowed. + * + * @var array + */ + public $trusted_static_properties = []; + + /** + * This is an array of allowed tags. + * If empty no restriction by allowed_tags. + * + * @var array + */ + public $allowed_tags = []; + + /** + * This is an array of disabled tags. + * If empty no restriction by disabled_tags. + * + * @var array + */ + public $disabled_tags = []; + + /** + * This is an array of allowed modifier plugins. + * If empty no restriction by allowed_modifiers. + * + * @var array + */ + public $allowed_modifiers = []; + + /** + * This is an array of disabled modifier plugins. + * If empty no restriction by disabled_modifiers. + * + * @var array + */ + public $disabled_modifiers = []; + + /** + * This is an array of disabled special $smarty variables. + * + * @var array + */ + public $disabled_special_smarty_vars = []; + + /** + * This is an array of trusted streams. + * If empty all streams are allowed. + * To disable all streams set $streams = null. + * + * @var array + */ + public $streams = ['file']; + + /** + * + flag if constants can be accessed from template + * + * @var boolean + */ + public $allow_constants = true; + + /** + * + flag if super globals can be accessed from template + * + * @var boolean + */ + public $allow_super_globals = true; + + /** + * max template nesting level + * + * @var int + */ + public $max_template_nesting = 0; + + /** + * current template nesting level + * + * @var int + */ + private $_current_template_nesting = 0; + + /** + * Cache for $resource_dir lookup + * + * @var array + */ + protected $_resource_dir = []; + + /** + * Cache for $template_dir lookup + * + * @var array + */ + protected $_template_dir = []; + + /** + * Cache for $config_dir lookup + * + * @var array + */ + protected $_config_dir = []; + + /** + * Cache for $secure_dir lookup + * + * @var array + */ + protected $_secure_dir = []; + + /** + * @param Smarty $smarty + */ + public function __construct(Smarty $smarty) { + $this->smarty = $smarty; + } + + /** + * Check if static class is trusted. + * + * @param string $class_name + * @param object $compiler compiler object + * + * @return boolean true if class is trusted + */ + public function isTrustedStaticClass($class_name, $compiler) { + if (isset($this->static_classes) + && (empty($this->static_classes) || in_array($class_name, $this->static_classes)) + ) { + return true; + } + $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting"); + return false; // should not, but who knows what happens to the compiler in the future? + } + + /** + * Check if static class method/property is trusted. + * + * @param string $class_name + * @param string $params + * @param object $compiler compiler object + * + * @return boolean true if class method is trusted + */ + public function isTrustedStaticClassAccess($class_name, $params, $compiler) { + if (!isset($params[2])) { + // fall back + return $this->isTrustedStaticClass($class_name, $compiler); + } + if ($params[2] === 'method') { + $allowed = $this->trusted_static_methods; + $name = substr($params[0], 0, strpos($params[0], '(')); + } else { + $allowed = $this->trusted_static_properties; + // strip '$' + $name = substr($params[0], 1); + } + if (isset($allowed)) { + if (empty($allowed)) { + // fall back + return $this->isTrustedStaticClass($class_name, $compiler); + } + if (isset($allowed[$class_name]) + && (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name])) + ) { + return true; + } + } + $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting"); + return false; // should not, but who knows what happens to the compiler in the future? + } + + /** + * Check if tag is trusted. + * + * @param string $tag_name + * @param object $compiler compiler object + * + * @return boolean true if tag is trusted + */ + public function isTrustedTag($tag_name, $compiler) { + $tag_name = strtolower($tag_name); + + // check for internal always required tags + if (in_array($tag_name, ['assign', 'call'])) { + return true; + } + // check security settings + if (empty($this->allowed_tags)) { + if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) { + return true; + } else { + $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true); + } + } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) { + return true; + } else { + $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true); + } + return false; // should not, but who knows what happens to the compiler in the future? + } + + /** + * Check if special $smarty variable is trusted. + * + * @param string $var_name + * @param object $compiler compiler object + * + * @return boolean true if tag is trusted + */ + public function isTrustedSpecialSmartyVar($var_name, $compiler) { + if (!in_array($var_name, $this->disabled_special_smarty_vars)) { + return true; + } else { + $compiler->trigger_template_error( + "special variable '\$smarty.{$var_name}' not allowed by security setting", + null, + true + ); + } + return false; // should not, but who knows what happens to the compiler in the future? + } + + /** + * Check if modifier plugin is trusted. + * + * @param string $modifier_name + * @param object $compiler compiler object + * + * @return boolean true if tag is trusted + */ + public function isTrustedModifier($modifier_name, $compiler) { + // check for internal always allowed modifier + if (in_array($modifier_name, ['default'])) { + return true; + } + // check security settings + if (empty($this->allowed_modifiers)) { + if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) { + return true; + } else { + $compiler->trigger_template_error( + "modifier '{$modifier_name}' disabled by security setting", + null, + true + ); + } + } elseif (in_array($modifier_name, $this->allowed_modifiers) + && !in_array($modifier_name, $this->disabled_modifiers) + ) { + return true; + } else { + $compiler->trigger_template_error( + "modifier '{$modifier_name}' not allowed by security setting", + null, + true + ); + } + return false; // should not, but who knows what happens to the compiler in the future? + } + + /** + * Check if constants are enabled or trusted + * + * @param string $const constant name + * @param object $compiler compiler object + * + * @return bool + */ + public function isTrustedConstant($const, $compiler) { + if (in_array($const, ['true', 'false', 'null'])) { + return true; + } + if (!empty($this->trusted_constants)) { + if (!in_array(strtolower($const), $this->trusted_constants)) { + $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted"); + return false; + } + return true; + } + if ($this->allow_constants) { + return true; + } + $compiler->trigger_template_error("Security: access to constants not permitted"); + return false; + } + + /** + * Check if stream is trusted. + * + * @param string $stream_name + * + * @return boolean true if stream is trusted + * @throws Exception if stream is not trusted + */ + public function isTrustedStream($stream_name) { + if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) { + return true; + } + throw new Exception("stream '{$stream_name}' not allowed by security setting"); + } + + /** + * Check if directory of file resource is trusted. + * + * @param string $filepath + * @param null|bool $isConfig + * + * @return bool true if directory is trusted + * @throws \Smarty\Exception if directory is not trusted + */ + public function isTrustedResourceDir($filepath, $isConfig = null) { + $_dir = $this->smarty->getTemplateDir(); + if ($this->_template_dir !== $_dir) { + $this->_updateResourceDir($this->_template_dir, $_dir); + $this->_template_dir = $_dir; + } + $_dir = $this->smarty->getConfigDir(); + if ($this->_config_dir !== $_dir) { + $this->_updateResourceDir($this->_config_dir, $_dir); + $this->_config_dir = $_dir; + } + if ($this->_secure_dir !== $this->secure_dir) { + $this->secure_dir = (array)$this->secure_dir; + foreach ($this->secure_dir as $k => $d) { + $this->secure_dir[$k] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true); + } + $this->_updateResourceDir($this->_secure_dir, $this->secure_dir); + $this->_secure_dir = $this->secure_dir; + } + $addPath = $this->_checkDir($filepath, $this->_resource_dir); + if ($addPath !== false) { + $this->_resource_dir = array_merge($this->_resource_dir, $addPath); + } + return true; + } + + /** + * Check if URI (e.g. {fetch} or {html_image}) is trusted + * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}". + * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string" + * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}. + * + * @param string $uri + * + * @return boolean true if URI is trusted + * @throws Exception if URI is not trusted + * @uses $trusted_uri for list of patterns to match against $uri + */ + public function isTrustedUri($uri) { + $_uri = parse_url($uri); + if (!empty($_uri['scheme']) && !empty($_uri['host'])) { + $_uri = $_uri['scheme'] . '://' . $_uri['host']; + foreach ($this->trusted_uri as $pattern) { + if (preg_match($pattern, $_uri)) { + return true; + } + } + } + throw new Exception("URI '{$uri}' not allowed by security setting"); + } + + /** + * Remove old directories and its sub folders, add new directories + * + * @param array $oldDir + * @param array $newDir + */ + private function _updateResourceDir($oldDir, $newDir) { + foreach ($oldDir as $directory) { + // $directory = $this->smarty->_realpath($directory, true); + $length = strlen($directory); + foreach ($this->_resource_dir as $dir) { + if (substr($dir, 0, $length) === $directory) { + unset($this->_resource_dir[$dir]); + } + } + } + foreach ($newDir as $directory) { + // $directory = $this->smarty->_realpath($directory, true); + $this->_resource_dir[$directory] = true; + } + } + + /** + * Check if file is inside a valid directory + * + * @param string $filepath + * @param array $dirs valid directories + * + * @return array|bool + * @throws \Smarty\Exception + */ + private function _checkDir($filepath, $dirs) { + $directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR; + $_directory = []; + if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) { + while (true) { + // test if the directory is trusted + if (isset($dirs[$directory])) { + return $_directory; + } + // abort if we've reached root + if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) { + // give up + break; + } + // remember the directory to add it to _resource_dir in case we're successful + $_directory[$directory] = true; + // bubble up one level + $directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory); + } + } + // give up + throw new Exception(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath)); + } + + /** + * Loads security class and enables security + * + * @param \Smarty $smarty + * @param string|Security $security_class if a string is used, it must be class-name + * + * @return \Smarty current Smarty instance for chaining + * @throws \Smarty\Exception when an invalid class name is provided + */ + public static function enableSecurity(Smarty $smarty, $security_class) { + if ($security_class instanceof Security) { + $smarty->security_policy = $security_class; + return $smarty; + } elseif (is_object($security_class)) { + throw new Exception("Class '" . get_class($security_class) . "' must extend \\Smarty\\Security."); + } + if ($security_class === null) { + $security_class = $smarty->security_class; + } + if (!class_exists($security_class)) { + throw new Exception("Security class '$security_class' is not defined"); + } elseif ($security_class !== Security::class && !is_subclass_of($security_class, Security::class)) { + throw new Exception("Class '$security_class' must extend " . Security::class . "."); + } else { + $smarty->security_policy = new $security_class($smarty); + } + return $smarty; + } + + /** + * Start template processing + * + * @param $template + * + * @throws Exception + */ + public function startTemplate($template) { + if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) { + throw new Exception("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'"); + } + } + + /** + * Exit template processing + */ + public function endTemplate() { + if ($this->max_template_nesting > 0) { + $this->_current_template_nesting--; + } + } + + /** + * Register callback functions call at start/end of template rendering + * + * @param \Smarty\Template $template + */ + public function registerCallBacks(Template $template) { + $template->startRenderCallbacks[] = [$this, 'startTemplate']; + $template->endRenderCallbacks[] = [$this, 'endTemplate']; + } +} diff --git a/include/smarty/src/Smarty.php b/include/smarty/src/Smarty.php new file mode 100644 index 000000000..efad0c1d5 --- /dev/null +++ b/include/smarty/src/Smarty.php @@ -0,0 +1,2239 @@ + + * @author Uwe Tews + * @author Rodney Rehm + * @author Simon Wisselink + */ + +/** + * This is the main Smarty class + */ +class Smarty extends \Smarty\TemplateBase { + + /** + * smarty version + */ + const SMARTY_VERSION = '5.5.2'; + + /** + * define caching modes + */ + const CACHING_OFF = 0; + const CACHING_LIFETIME_CURRENT = 1; + const CACHING_LIFETIME_SAVED = 2; + /** + * define constant for clearing cache files be saved expiration dates + */ + const CLEAR_EXPIRED = -1; + /** + * define compile check modes + */ + const COMPILECHECK_OFF = 0; + const COMPILECHECK_ON = 1; + /** + * filter types + */ + const FILTER_POST = 'post'; + const FILTER_PRE = 'pre'; + const FILTER_OUTPUT = 'output'; + const FILTER_VARIABLE = 'variable'; + /** + * plugin types + */ + const PLUGIN_FUNCTION = 'function'; + const PLUGIN_BLOCK = 'block'; + const PLUGIN_COMPILER = 'compiler'; + const PLUGIN_MODIFIER = 'modifier'; + const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler'; + + /** + * The character set to adhere to (defaults to "UTF-8") + */ + public static $_CHARSET = 'UTF-8'; + + /** + * The date format to be used internally + * (accepts date() and strftime()) + */ + public static $_DATE_FORMAT = '%b %e, %Y'; + + /** + * Flag denoting if PCRE should run in UTF-8 mode + */ + public static $_UTF8_MODIFIER = 'u'; + + /** + * Flag denoting if operating system is windows + */ + public static $_IS_WINDOWS = false; + + /** + * auto literal on delimiters with whitespace + * + * @var boolean + */ + public $auto_literal = true; + + /** + * display error on not assigned variables + * + * @var boolean + */ + public $error_unassigned = false; + + /** + * flag if template_dir is normalized + * + * @var bool + */ + public $_templateDirNormalized = false; + + /** + * joined template directory string used in cache keys + * + * @var string + */ + public $_joined_template_dir = null; + + /** + * flag if config_dir is normalized + * + * @var bool + */ + public $_configDirNormalized = false; + + /** + * joined config directory string used in cache keys + * + * @var string + */ + public $_joined_config_dir = null; + + /** + * default template handler + * + * @var callable + */ + public $default_template_handler_func = null; + + /** + * default config handler + * + * @var callable + */ + public $default_config_handler_func = null; + + /** + * default plugin handler + * + * @var callable + */ + private $default_plugin_handler_func = null; + + /** + * flag if template_dir is normalized + * + * @var bool + */ + public $_compileDirNormalized = false; + + /** + * flag if template_dir is normalized + * + * @var bool + */ + public $_cacheDirNormalized = false; + + /** + * force template compiling? + * + * @var boolean + */ + public $force_compile = false; + + /** + * use sub dirs for compiled/cached files? + * + * @var boolean + */ + public $use_sub_dirs = false; + + /** + * merge compiled includes + * + * @var boolean + */ + public $merge_compiled_includes = false; + + /** + * force cache file creation + * + * @var boolean + */ + public $force_cache = false; + + /** + * template left-delimiter + * + * @var string + */ + private $left_delimiter = "{"; + + /** + * template right-delimiter + * + * @var string + */ + private $right_delimiter = "}"; + + /** + * array of strings which shall be treated as literal by compiler + * + * @var array string + */ + public $literals = []; + + /** + * class name + * This should be instance of \Smarty\Security. + * + * @var string + * @see \Smarty\Security + */ + public $security_class = \Smarty\Security::class; + + /** + * implementation of security class + * + * @var \Smarty\Security + */ + public $security_policy = null; + + /** + * debug mode + * Setting this to true enables the debug-console. Setting it to 2 enables individual Debug Console window by + * template name. + * + * @var boolean|int + */ + public $debugging = false; + + /** + * This determines if debugging is enable-able from the browser. + *
      + *
    • NONE => no debugging control allowed
      • + *
    • URL => enable debugging when SMARTY_DEBUG is found in the URL.
      • + *
    + * + * @var string + */ + public $debugging_ctrl = 'NONE'; + + /** + * Name of debugging URL-param. + * Only used when $debugging_ctrl is set to 'URL'. + * The name of the URL-parameter that activates debugging. + * + * @var string + */ + public $smarty_debug_id = 'SMARTY_DEBUG'; + + /** + * Path of debug template. + * + * @var string + */ + public $debug_tpl = null; + + /** + * When set, smarty uses this value as error_reporting-level. + * + * @var int + */ + public $error_reporting = null; + + /** + * Controls whether variables with the same name overwrite each other. + * + * @var boolean + */ + public $config_overwrite = true; + + /** + * Controls whether config values of on/true/yes and off/false/no get converted to boolean. + * + * @var boolean + */ + public $config_booleanize = true; + + /** + * Controls whether hidden config sections/vars are read from the file. + * + * @var boolean + */ + public $config_read_hidden = false; + + /** + * locking concurrent compiles + * + * @var boolean + */ + public $compile_locking = true; + + /** + * Controls whether cache resources should use locking mechanism + * + * @var boolean + */ + public $cache_locking = false; + + /** + * seconds to wait for acquiring a lock before ignoring the write lock + * + * @var float + */ + public $locking_timeout = 10; + + /** + * resource type used if none given + * Must be a valid key of $registered_resources. + * + * @var string + */ + public $default_resource_type = 'file'; + + /** + * cache resource + * Must be a subclass of \Smarty\Cacheresource\Base + * + * @var \Smarty\Cacheresource\Base + */ + private $cacheResource; + + /** + * config type + * + * @var string + */ + public $default_config_type = 'file'; + + /** + * check If-Modified-Since headers + * + * @var boolean + */ + public $cache_modified_check = false; + + /** + * registered plugins + * + * @var array + */ + public $registered_plugins = []; + + /** + * registered objects + * + * @var array + */ + public $registered_objects = []; + + /** + * registered classes + * + * @var array + */ + public $registered_classes = []; + + /** + * registered resources + * + * @var array + */ + public $registered_resources = []; + + /** + * registered cache resources + * + * @var array + * @deprecated since 5.0 + */ + private $registered_cache_resources = []; + + /** + * default modifier + * + * @var array + */ + public $default_modifiers = []; + + /** + * autoescape variable output + * + * @var boolean + */ + public $escape_html = false; + + /** + * start time for execution time calculation + * + * @var int + */ + public $start_time = 0; + + /** + * internal flag to enable parser debugging + * + * @var bool + */ + public $_parserdebug = false; + + /** + * Debug object + * + * @var \Smarty\Debug + */ + public $_debug = null; + + /** + * template directory + * + * @var array + */ + protected $template_dir = ['./templates/']; + + /** + * flags for normalized template directory entries + * + * @var array + */ + protected $_processedTemplateDir = []; + + /** + * config directory + * + * @var array + */ + protected $config_dir = ['./configs/']; + + /** + * flags for normalized template directory entries + * + * @var array + */ + protected $_processedConfigDir = []; + + /** + * compile directory + * + * @var string + */ + protected $compile_dir = './templates_c/'; + + /** + * cache directory + * + * @var string + */ + protected $cache_dir = './cache/'; + + /** + * PHP7 Compatibility mode + * + * @var bool + */ + private $isMutingUndefinedOrNullWarnings = false; + + /** + * Cache of loaded resource handlers. + * + * @var array + */ + public $_resource_handlers = []; + + /** + * Cache of loaded cacheresource handlers. + * + * @var array + */ + public $_cacheresource_handlers = []; + + /** + * List of extensions + * + * @var ExtensionInterface[] + */ + private $extensions = []; + /** + * @var BCPluginsAdapter + */ + private $BCPluginsAdapter; + + /** + * Initialize new Smarty object + */ + public function __construct() { + + $this->start_time = microtime(true); + // Check if we're running on Windows + \Smarty\Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'; + // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8 + if (\Smarty\Smarty::$_CHARSET !== 'UTF-8') { + \Smarty\Smarty::$_UTF8_MODIFIER = ''; + } + + $this->BCPluginsAdapter = new BCPluginsAdapter($this); + + $this->extensions[] = new CoreExtension(); + $this->extensions[] = new DefaultExtension(); + $this->extensions[] = $this->BCPluginsAdapter; + + $this->cacheResource = new File(); + } + + /** + * Load an additional extension. + * + * @return void + */ + public function addExtension(ExtensionInterface $extension) { + $this->extensions[] = $extension; + } + + /** + * Returns all loaded extensions + * + * @return array|ExtensionInterface[] + */ + public function getExtensions(): array { + return $this->extensions; + } + + /** + * Replace the entire list extensions, allowing you to determine the exact order of the extensions. + * + * @param ExtensionInterface[] $extensions + * + * @return void + */ + public function setExtensions(array $extensions): void { + $this->extensions = $extensions; + } + + /** + * Check if a template resource exists + * + * @param string $resource_name template name + * + * @return bool status + * @throws \Smarty\Exception + */ + public function templateExists($resource_name) { + // create source object + $source = Template\Source::load(null, $this, $resource_name); + return $source->exists; + } + + /** + * Loads security class and enables security + * + * @param string|\Smarty\Security $security_class if a string is used, it must be class-name + * + * @return static current Smarty instance for chaining + * @throws \Smarty\Exception + */ + public function enableSecurity($security_class = null) { + \Smarty\Security::enableSecurity($this, $security_class); + return $this; + } + + /** + * Disable security + * + * @return static current Smarty instance for chaining + */ + public function disableSecurity() { + $this->security_policy = null; + return $this; + } + + /** + * Add template directory(s) + * + * @param string|array $template_dir directory(s) of template sources + * @param string $key of the array element to assign the template dir to + * @param bool $isConfig true for config_dir + * + * @return static current Smarty instance for chaining + */ + public function addTemplateDir($template_dir, $key = null, $isConfig = false) { + if ($isConfig) { + $processed = &$this->_processedConfigDir; + $dir = &$this->config_dir; + $this->_configDirNormalized = false; + } else { + $processed = &$this->_processedTemplateDir; + $dir = &$this->template_dir; + $this->_templateDirNormalized = false; + } + if (is_array($template_dir)) { + foreach ($template_dir as $k => $v) { + if (is_int($k)) { + // indexes are not merged but appended + $dir[] = $v; + } else { + // string indexes are overridden + $dir[$k] = $v; + unset($processed[$key]); + } + } + } else { + if ($key !== null) { + // override directory at specified index + $dir[$key] = $template_dir; + unset($processed[$key]); + } else { + // append new directory + $dir[] = $template_dir; + } + } + return $this; + } + + /** + * Get template directories + * + * @param mixed $index index of directory to get, null to get all + * @param bool $isConfig true for config_dir + * + * @return array|string list of template directories, or directory of $index + */ + public function getTemplateDir($index = null, $isConfig = false) { + if ($isConfig) { + $dir = &$this->config_dir; + } else { + $dir = &$this->template_dir; + } + if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) { + $this->_normalizeTemplateConfig($isConfig); + } + if ($index !== null) { + return isset($dir[$index]) ? $dir[$index] : null; + } + return $dir; + } + + /** + * Set template directory + * + * @param string|array $template_dir directory(s) of template sources + * @param bool $isConfig true for config_dir + * + * @return static current Smarty instance for chaining + */ + public function setTemplateDir($template_dir, $isConfig = false) { + if ($isConfig) { + $this->config_dir = []; + $this->_processedConfigDir = []; + } else { + $this->template_dir = []; + $this->_processedTemplateDir = []; + } + $this->addTemplateDir($template_dir, null, $isConfig); + return $this; + } + + /** + * Adds a template directory before any existing directoires + * + * @param string $new_template_dir directory of template sources + * @param bool $is_config true for config_dir + * + * @return static current Smarty instance for chaining + */ + public function prependTemplateDir($new_template_dir, $is_config = false) { + $current_template_dirs = $is_config ? $this->config_dir : $this->template_dir; + array_unshift($current_template_dirs, $new_template_dir); + $this->setTemplateDir($current_template_dirs, $is_config); + return $this; + } + + /** + * Add config directory(s) + * + * @param string|array $config_dir directory(s) of config sources + * @param mixed $key key of the array element to assign the config dir to + * + * @return static current Smarty instance for chaining + */ + public function addConfigDir($config_dir, $key = null) { + return $this->addTemplateDir($config_dir, $key, true); + } + + /** + * Get config directory + * + * @param mixed $index index of directory to get, null to get all + * + * @return array configuration directory + */ + public function getConfigDir($index = null) { + return $this->getTemplateDir($index, true); + } + + /** + * Set config directory + * + * @param $config_dir + * + * @return static current Smarty instance for chaining + */ + public function setConfigDir($config_dir) { + return $this->setTemplateDir($config_dir, true); + } + + /** + * Registers plugin to be used in templates + * + * @param string $type plugin type + * @param string $name name of template tag + * @param callable $callback PHP callback to register + * @param bool $cacheable if true (default) this function is cache able + * + * @return $this + * @throws \Smarty\Exception + * + * @api Smarty::registerPlugin() + */ + public function registerPlugin($type, $name, $callback, $cacheable = true) { + if (isset($this->registered_plugins[$type][$name])) { + throw new Exception("Plugin tag '{$name}' already registered"); + } elseif (!is_callable($callback) && !class_exists($callback)) { + throw new Exception("Plugin '{$name}' not callable"); + } else { + $this->registered_plugins[$type][$name] = [$callback, (bool)$cacheable]; + } + return $this; + } + + /** + * Returns plugin previously registered using ::registerPlugin as a numerical array as follows or null if not found: + * [ + * 0 => the callback + * 1 => (bool) $cacheable + * 2 => (array) $cache_attr + * ] + * + * @param string $type plugin type + * @param string $name name of template tag + * + * @return array|null + * + * @api Smarty::unregisterPlugin() + */ + public function getRegisteredPlugin($type, $name): ?array { + if (isset($this->registered_plugins[$type][$name])) { + return $this->registered_plugins[$type][$name]; + } + return null; + } + + /** + * Unregisters plugin previously registered using ::registerPlugin + * + * @param string $type plugin type + * @param string $name name of template tag + * + * @return $this + * + * @api Smarty::unregisterPlugin() + */ + public function unregisterPlugin($type, $name) { + if (isset($this->registered_plugins[$type][$name])) { + unset($this->registered_plugins[$type][$name]); + } + return $this; + } + + /** + * Adds directory of plugin files + * + * @param null|array|string $plugins_dir + * + * @return static current Smarty instance for chaining + * @deprecated since 5.0 + */ + public function addPluginsDir($plugins_dir) { + trigger_error('Using Smarty::addPluginsDir() to load plugins is deprecated and will be ' . + 'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::registerPlugin to ' . + 'quickly register a plugin using a callback function.', E_USER_DEPRECATED); + + foreach ((array)$plugins_dir as $v) { + $path = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true); + $this->BCPluginsAdapter->loadPluginsFromDir($path); + } + + return $this; + } + + /** + * Get plugin directories + * + * @return array list of plugin directories + * @deprecated since 5.0 + */ + public function getPluginsDir() { + trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' . + 'removed in a future release. It will always return an empty array.', E_USER_DEPRECATED); + return []; + } + + /** + * Set plugins directory + * + * @param string|array $plugins_dir directory(s) of plugins + * + * @return static current Smarty instance for chaining + * @deprecated since 5.0 + */ + public function setPluginsDir($plugins_dir) { + trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' . + 'removed in a future release. For now, it will remove the DefaultExtension from the extensions list and ' . + 'proceed to call Smartyy::addPluginsDir..', E_USER_DEPRECATED); + + $this->extensions = array_filter( + $this->extensions, + function ($extension) { + return !($extension instanceof DefaultExtension); + } + ); + + return $this->addPluginsDir($plugins_dir); + } + + /** + * Registers a default plugin handler + * + * @param callable $callback class/method name + * + * @return $this + * @throws Exception if $callback is not callable + * + * @api Smarty::registerDefaultPluginHandler() + * + * @deprecated since 5.0 + */ + public function registerDefaultPluginHandler($callback) { + + trigger_error('Using Smarty::registerDefaultPluginHandler() is deprecated and will be ' . + 'removed in a future release. Please rewrite your plugin handler as an extension.', + E_USER_DEPRECATED); + + if (is_callable($callback)) { + $this->default_plugin_handler_func = $callback; + } else { + throw new Exception("Default plugin handler '$callback' not callable"); + } + return $this; + } + + /** + * Get compiled directory + * + * @return string path to compiled templates + */ + public function getCompileDir() { + if (!$this->_compileDirNormalized) { + $this->_normalizeDir('compile_dir', $this->compile_dir); + $this->_compileDirNormalized = true; + } + return $this->compile_dir; + } + + /** + * + * @param string $compile_dir directory to store compiled templates in + * + * @return static current Smarty instance for chaining + */ + public function setCompileDir($compile_dir) { + $this->_normalizeDir('compile_dir', $compile_dir); + $this->_compileDirNormalized = true; + return $this; + } + + /** + * Get cache directory + * + * @return string path of cache directory + */ + public function getCacheDir() { + if (!$this->_cacheDirNormalized) { + $this->_normalizeDir('cache_dir', $this->cache_dir); + $this->_cacheDirNormalized = true; + } + return $this->cache_dir; + } + + /** + * Set cache directory + * + * @param string $cache_dir directory to store cached templates in + * + * @return static current Smarty instance for chaining + */ + public function setCacheDir($cache_dir) { + $this->_normalizeDir('cache_dir', $cache_dir); + $this->_cacheDirNormalized = true; + return $this; + } + + private $templates = []; + + /** + * Creates a template object + * + * @param string $template_name + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param null $parent next higher level of Smarty variables + * + * @return Template template object + * @throws Exception + */ + public function createTemplate($template_name, $cache_id = null, $compile_id = null, $parent = null): Template { + + $data = []; + + // Shuffle params for backward compatibility: if 2nd param is an object, it's the parent + if (is_object($cache_id)) { + $parent = $cache_id; + $cache_id = null; + } + + // Shuffle params for backward compatibility: if 2nd param is an array, it's data + if (is_array($cache_id)) { + $data = $cache_id; + $cache_id = null; + } + + return $this->doCreateTemplate($template_name, $cache_id, $compile_id, $parent, null, null, false, $data); + } + + /** + * Get unique template id + * + * @param string $resource_name + * @param null|mixed $cache_id + * @param null|mixed $compile_id + * @param null $caching + * + * @return string + */ + private function generateUniqueTemplateId( + $resource_name, + $cache_id = null, + $compile_id = null, + $caching = null + ): string { + // defaults for optional params + $cache_id = $cache_id ?? $this->cache_id; + $compile_id = $compile_id ?? $this->compile_id; + $caching = (int)$caching ?? $this->caching; + + // Add default resource type to resource name if it is missing + if (strpos($resource_name, ':') === false) { + $resource_name = "{$this->default_resource_type}:{$resource_name}"; + } + + $_templateId = $resource_name . '#' . $cache_id . '#' . $compile_id . '#' . $caching; + + // hash very long IDs to prevent problems with filename length + // do not hash shorter IDs, so they remain recognizable + if (strlen($_templateId) > 150) { + $_templateId = sha1($_templateId); + } + + return $_templateId; + } + + /** + * Normalize path + * - remove /./ and /../ + * - make it absolute if required + * + * @param string $path file path + * @param bool $realpath if true - convert to absolute + * false - convert to relative + * null - keep as it is but + * remove /./ /../ + * + * @return string + */ + public function _realpath($path, $realpath = null) { + $nds = ['/' => '\\', '\\' => '/']; + preg_match( + '%^(?(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?(.*))$%u', + $path, + $parts + ); + $path = $parts['path']; + if ($parts['root'] === '\\') { + $parts['root'] = substr(getcwd(), 0, 2) . $parts['root']; + } else { + if ($realpath !== null && !$parts['root']) { + $path = getcwd() . DIRECTORY_SEPARATOR . $path; + } + } + // normalize DIRECTORY_SEPARATOR + $path = str_replace($nds[DIRECTORY_SEPARATOR], DIRECTORY_SEPARATOR, $path); + $parts['root'] = str_replace($nds[DIRECTORY_SEPARATOR], DIRECTORY_SEPARATOR, $parts['root']); + do { + $path = preg_replace( + ['#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'], + DIRECTORY_SEPARATOR, + $path, + -1, + $count + ); + } while ($count > 0); + return $realpath !== false ? $parts['root'] . $path : str_ireplace(getcwd(), '.', $parts['root'] . $path); + } + + /** + * @param boolean $use_sub_dirs + */ + public function setUseSubDirs($use_sub_dirs) { + $this->use_sub_dirs = $use_sub_dirs; + } + + /** + * @param int $error_reporting + */ + public function setErrorReporting($error_reporting) { + $this->error_reporting = $error_reporting; + } + + /** + * @param boolean $escape_html + */ + public function setEscapeHtml($escape_html) { + $this->escape_html = $escape_html; + } + + /** + * Return auto_literal flag + * + * @return boolean + */ + public function getAutoLiteral() { + return $this->auto_literal; + } + + /** + * Set auto_literal flag + * + * @param boolean $auto_literal + */ + public function setAutoLiteral($auto_literal = true) { + $this->auto_literal = $auto_literal; + } + + /** + * @param boolean $force_compile + */ + public function setForceCompile($force_compile) { + $this->force_compile = $force_compile; + } + + /** + * @param boolean $merge_compiled_includes + */ + public function setMergeCompiledIncludes($merge_compiled_includes) { + $this->merge_compiled_includes = $merge_compiled_includes; + } + + /** + * Get left delimiter + * + * @return string + */ + public function getLeftDelimiter() { + return $this->left_delimiter; + } + + /** + * Set left delimiter + * + * @param string $left_delimiter + */ + public function setLeftDelimiter($left_delimiter) { + $this->left_delimiter = $left_delimiter; + } + + /** + * Get right delimiter + * + * @return string $right_delimiter + */ + public function getRightDelimiter() { + return $this->right_delimiter; + } + + /** + * Set right delimiter + * + * @param string + */ + public function setRightDelimiter($right_delimiter) { + $this->right_delimiter = $right_delimiter; + } + + /** + * @param boolean $debugging + */ + public function setDebugging($debugging) { + $this->debugging = $debugging; + } + + /** + * @param boolean $config_overwrite + */ + public function setConfigOverwrite($config_overwrite) { + $this->config_overwrite = $config_overwrite; + } + + /** + * @param boolean $config_booleanize + */ + public function setConfigBooleanize($config_booleanize) { + $this->config_booleanize = $config_booleanize; + } + + /** + * @param boolean $config_read_hidden + */ + public function setConfigReadHidden($config_read_hidden) { + $this->config_read_hidden = $config_read_hidden; + } + + /** + * @param boolean $compile_locking + */ + public function setCompileLocking($compile_locking) { + $this->compile_locking = $compile_locking; + } + + /** + * @param string $default_resource_type + */ + public function setDefaultResourceType($default_resource_type) { + $this->default_resource_type = $default_resource_type; + } + + /** + * Test install + * + * @param null $errors + */ + public function testInstall(&$errors = null) { + \Smarty\TestInstall::testInstall($this, $errors); + } + + /** + * Get Smarty object + * + * @return static + */ + public function getSmarty() { + return $this; + } + + /** + * Normalize and set directory string + * + * @param string $dirName cache_dir or compile_dir + * @param string $dir filepath of folder + */ + private function _normalizeDir($dirName, $dir) { + $this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true); + } + + /** + * Normalize template_dir or config_dir + * + * @param bool $isConfig true for config_dir + */ + private function _normalizeTemplateConfig($isConfig) { + if ($isConfig) { + $processed = &$this->_processedConfigDir; + $dir = &$this->config_dir; + } else { + $processed = &$this->_processedTemplateDir; + $dir = &$this->template_dir; + } + if (!is_array($dir)) { + $dir = (array)$dir; + } + foreach ($dir as $k => $v) { + if (!isset($processed[$k])) { + $dir[$k] = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true); + $processed[$k] = true; + } + } + + if ($isConfig) { + $this->_configDirNormalized = true; + $this->_joined_config_dir = join('#', $this->config_dir); + } else { + $this->_templateDirNormalized = true; + $this->_joined_template_dir = join('#', $this->template_dir); + } + + } + + /** + * Mutes errors for "undefined index", "undefined array key" and "trying to read property of null". + * + * @void + */ + public function muteUndefinedOrNullWarnings(): void { + $this->isMutingUndefinedOrNullWarnings = true; + } + + /** + * Indicates if Smarty will mute errors for "undefined index", "undefined array key" and "trying to read property of null". + * + * @return bool + */ + public function isMutingUndefinedOrNullWarnings(): bool { + return $this->isMutingUndefinedOrNullWarnings; + } + + /** + * Empty cache for a specific template + * + * @param string $template_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer $exp_time expiration time + * @param string $type resource type + * + * @return int number of cache files deleted + * @throws \Smarty\Exception + * + * @api Smarty::clearCache() + */ + public function clearCache( + $template_name, + $cache_id = null, + $compile_id = null, + $exp_time = null + ) { + return $this->getCacheResource()->clear($this, $template_name, $cache_id, $compile_id, $exp_time); + } + + /** + * Empty cache folder + * + * @param integer $exp_time expiration time + * @param string $type resource type + * + * @return int number of cache files deleted + * + * @api Smarty::clearAllCache() + */ + public function clearAllCache($exp_time = null) { + return $this->getCacheResource()->clearAll($this, $exp_time); + } + + /** + * Delete compiled template file + * + * @param string $resource_name template name + * @param string $compile_id compile id + * @param integer $exp_time expiration time + * + * @return int number of template files deleted + * @throws \Smarty\Exception + * + * @api Smarty::clearCompiledTemplate() + */ + public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) { + $_compile_dir = $this->getCompileDir(); + if ($_compile_dir === '/') { //We should never want to delete this! + return 0; + } + $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null; + $_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^'; + if (isset($resource_name)) { + $_save_stat = $this->caching; + $this->caching = \Smarty\Smarty::CACHING_OFF; + /* @var Template $tpl */ + $tpl = $this->doCreateTemplate($resource_name); + $this->caching = $_save_stat; + if (!$tpl->getSource()->handler->recompiled && $tpl->getSource()->exists) { + $_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->getCompiled()->filepath)); + $_resource_part_1_length = strlen($_resource_part_1); + } else { + return 0; + } + $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1); + $_resource_part_2_length = strlen($_resource_part_2); + } + $_dir = $_compile_dir; + if ($this->use_sub_dirs && isset($_compile_id)) { + $_dir .= $_compile_id . $_dir_sep; + } + if (isset($_compile_id)) { + $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep; + $_compile_id_part_length = strlen($_compile_id_part); + } + $_count = 0; + try { + $_compileDirs = new RecursiveDirectoryIterator($_dir); + } catch (\UnexpectedValueException $e) { + // path not found / not a dir + return 0; + } + $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST); + foreach ($_compile as $_file) { + if (substr(basename($_file->getPathname()), 0, 1) === '.') { + continue; + } + $_filepath = (string)$_file; + if ($_file->isDir()) { + if (!$_compile->isDot()) { + // delete folder if empty + @rmdir($_file->getPathname()); + } + } else { + // delete only php files + if (substr($_filepath, -4) !== '.php') { + continue; + } + $unlink = false; + if ((!isset($_compile_id) || + (isset($_filepath[$_compile_id_part_length]) && + $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) + && (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length]) + && substr_compare( + $_filepath, + $_resource_part_1, + -$_resource_part_1_length, + $_resource_part_1_length + ) === 0) || (isset($_filepath[$_resource_part_2_length]) + && substr_compare( + $_filepath, + $_resource_part_2, + -$_resource_part_2_length, + $_resource_part_2_length + ) === 0)) + ) { + if (isset($exp_time)) { + if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) { + $unlink = true; + } + } else { + $unlink = true; + } + } + if ($unlink && is_file($_filepath) && @unlink($_filepath)) { + $_count++; + if (function_exists('opcache_invalidate') + && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1) + ) { + opcache_invalidate($_filepath, true); + } elseif (function_exists('apc_delete_file')) { + apc_delete_file($_filepath); + } + } + } + } + return $_count; + } + + /** + * Compile all template files + * + * @param string $extension file extension + * @param bool $force_compile force all to recompile + * @param int $time_limit + * @param int $max_errors + * + * @return integer number of template files recompiled + * @api Smarty::compileAllTemplates() + * + */ + public function compileAllTemplates( + $extension = '.tpl', + $force_compile = false, + $time_limit = 0, + $max_errors = null + ) { + return $this->compileAll($extension, $force_compile, $time_limit, $max_errors); + } + + /** + * Compile all config files + * + * @param string $extension file extension + * @param bool $force_compile force all to recompile + * @param int $time_limit + * @param int $max_errors + * + * @return int number of template files recompiled + * @api Smarty::compileAllConfig() + * + */ + public function compileAllConfig( + $extension = '.conf', + $force_compile = false, + $time_limit = 0, + $max_errors = null + ) { + return $this->compileAll($extension, $force_compile, $time_limit, $max_errors, true); + } + + /** + * Compile all template or config files + * + * @param string $extension template file name extension + * @param bool $force_compile force all to recompile + * @param int $time_limit set maximum execution time + * @param int $max_errors set maximum allowed errors + * @param bool $isConfig flag true if called for config files + * + * @return int number of template files compiled + */ + protected function compileAll( + $extension, + $force_compile, + $time_limit, + $max_errors, + $isConfig = false + ) { + // switch off time limit + if (function_exists('set_time_limit')) { + @set_time_limit($time_limit); + } + $_count = 0; + $_error_count = 0; + $sourceDir = $isConfig ? $this->getConfigDir() : $this->getTemplateDir(); + // loop over array of source directories + foreach ($sourceDir as $_dir) { + $_dir_1 = new RecursiveDirectoryIterator( + $_dir, + defined('FilesystemIterator::FOLLOW_SYMLINKS') ? + FilesystemIterator::FOLLOW_SYMLINKS : 0 + ); + $_dir_2 = new RecursiveIteratorIterator($_dir_1); + foreach ($_dir_2 as $_fileinfo) { + $_file = $_fileinfo->getFilename(); + if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) { + continue; + } + if (substr_compare($_file, $extension, -strlen($extension)) !== 0) { + continue; + } + if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) { + $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file; + } + echo "\n", $_dir, '---', $_file; + flush(); + $_start_time = microtime(true); + $_smarty = clone $this; + // + $_smarty->force_compile = $force_compile; + try { + $_tpl = $this->doCreateTemplate($_file); + $_tpl->caching = self::CACHING_OFF; + $_tpl->setSource( + $isConfig ? \Smarty\Template\Config::load($_tpl) : \Smarty\Template\Source::load($_tpl) + ); + if ($_tpl->mustCompile()) { + $_tpl->compileTemplateSource(); + $_count++; + echo ' compiled in ', microtime(true) - $_start_time, ' seconds'; + flush(); + } else { + echo ' is up to date'; + flush(); + } + } catch (\Exception $e) { + echo "\n ------>Error: ", $e->getMessage(), "\n"; + $_error_count++; + } + // free memory + unset($_tpl); + if ($max_errors !== null && $_error_count === $max_errors) { + echo "\ntoo many errors\n"; + exit(1); + } + } + } + echo "\n"; + return $_count; + } + + /** + * check client side cache + * + * @param \Smarty\Template\Cached $cached + * @param Template $_template + * @param string $content + * + * @throws \Exception + * @throws \Smarty\Exception + */ + public function cacheModifiedCheck(Template\Cached $cached, Template $_template, $content) { + $_isCached = $_template->isCached() && !$_template->getCompiled()->getNocacheCode(); + $_last_modified_date = + @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3); + if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) { + switch (PHP_SAPI) { + case 'cgi': // php-cgi < 5.3 + case 'cgi-fcgi': // php-cgi >= 5.3 + case 'fpm-fcgi': // php-fpm >= 5.3.3 + header('Status: 304 Not Modified'); + break; + case 'cli': + if (/* ^phpunit */ + !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */ + ) { + $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified'; + } + break; + default: + if (/* ^phpunit */ + !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */ + ) { + $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified'; + } else { + header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified'); + } + break; + } + } else { + switch (PHP_SAPI) { + case 'cli': + if (/* ^phpunit */ + !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */ + ) { + $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = + 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT'; + } + break; + default: + header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT'); + break; + } + echo $content; + } + } + + public function getModifierCallback(string $modifierName) { + foreach ($this->getExtensions() as $extension) { + if ($callback = $extension->getModifierCallback($modifierName)) { + return [new CallbackWrapper($modifierName, $callback), 'handle']; + } + } + return null; + } + + public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface { + foreach ($this->getExtensions() as $extension) { + if ($handler = $extension->getFunctionHandler($functionName)) { + return $handler; + } + } + return null; + } + + public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface { + foreach ($this->getExtensions() as $extension) { + if ($handler = $extension->getBlockHandler($blockTagName)) { + return $handler; + } + } + return null; + } + + public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface { + foreach ($this->getExtensions() as $extension) { + if ($handler = $extension->getModifierCompiler($modifier)) { + return $handler; + } + } + return null; + } + + /** + * Run pre-filters over template source + * + * @param string $source the content which shall be processed by the filters + * @param Template $template template object + * + * @return string the filtered source + */ + public function runPreFilters($source, Template $template) { + + foreach ($this->getExtensions() as $extension) { + /** @var \Smarty\Filter\FilterInterface $filter */ + foreach ($extension->getPreFilters() as $filter) { + $source = $filter->filter($source, $template); + } + } + + // return filtered output + return $source; + } + + /** + * Run post-filters over template's compiled code + * + * @param string $code the content which shall be processed by the filters + * @param Template $template template object + * + * @return string the filtered code + */ + public function runPostFilters($code, Template $template) { + + foreach ($this->getExtensions() as $extension) { + /** @var \Smarty\Filter\FilterInterface $filter */ + foreach ($extension->getPostFilters() as $filter) { + $code = $filter->filter($code, $template); + } + } + + // return filtered output + return $code; + } + + /** + * Run filters over template output + * + * @param string $content the content which shall be processed by the filters + * @param Template $template template object + * + * @return string the filtered (modified) output + */ + public function runOutputFilters($content, Template $template) { + + foreach ($this->getExtensions() as $extension) { + /** @var \Smarty\Filter\FilterInterface $filter */ + foreach ($extension->getOutputFilters() as $filter) { + $content = $filter->filter($content, $template); + } + } + + // return filtered output + return $content; + } + + /** + * Writes file in a safe way to disk + * + * @param string $_filepath complete filepath + * @param string $_contents file content + * + * @return boolean true + * @throws Exception + */ + public function writeFile($_filepath, $_contents) { + $_error_reporting = error_reporting(); + error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING); + $_dirpath = dirname($_filepath); + // if subdirs, create dir structure + if ($_dirpath !== '.') { + $i = 0; + // loop if concurrency problem occurs + // see https://bugs.php.net/bug.php?id=35326 + while (!is_dir($_dirpath)) { + if (@mkdir($_dirpath, 0777, true)) { + break; + } + clearstatcache(); + if (++$i === 3) { + error_reporting($_error_reporting); + throw new Exception("unable to create directory {$_dirpath}"); + } + sleep(1); + } + } + // write to tmp file, then move to overt file lock race condition + $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(['.', ','], '_', uniqid('wrt', true)); + if (!file_put_contents($_tmp_file, $_contents)) { + error_reporting($_error_reporting); + throw new Exception("unable to write file {$_tmp_file}"); + } + /* + * Windows' rename() fails if the destination exists, + * Linux' rename() properly handles the overwrite. + * Simply unlink()ing a file might cause other processes + * currently reading that file to fail, but linux' rename() + * seems to be smart enough to handle that for us. + */ + if (\Smarty\Smarty::$_IS_WINDOWS) { + // remove original file + if (is_file($_filepath)) { + @unlink($_filepath); + } + // rename tmp file + $success = @rename($_tmp_file, $_filepath); + } else { + // rename tmp file + $success = @rename($_tmp_file, $_filepath); + if (!$success) { + // remove original file + if (is_file($_filepath)) { + @unlink($_filepath); + } + // rename tmp file + $success = @rename($_tmp_file, $_filepath); + } + } + if (!$success) { + error_reporting($_error_reporting); + throw new Exception("unable to write file {$_filepath}"); + } + // set file permissions + @chmod($_filepath, 0666 & ~umask()); + error_reporting($_error_reporting); + return true; + } + + private $runtimes = []; + + /** + * Loads and returns a runtime extension or null if not found + * + * @param string $type + * + * @return object|null + */ + public function getRuntime(string $type) { + + if (isset($this->runtimes[$type])) { + return $this->runtimes[$type]; + } + + // Lazy load runtimes when/if needed + switch ($type) { + case 'Capture': + return $this->runtimes[$type] = new CaptureRuntime(); + case 'Foreach': + return $this->runtimes[$type] = new ForeachRuntime(); + case 'Inheritance': + return $this->runtimes[$type] = new InheritanceRuntime(); + case 'TplFunction': + return $this->runtimes[$type] = new TplFunctionRuntime(); + case 'DefaultPluginHandler': + return $this->runtimes[$type] = new DefaultPluginHandlerRuntime( + $this->getDefaultPluginHandlerFunc() + ); + } + + throw new \Smarty\Exception('Trying to load invalid runtime ' . $type); + } + + /** + * Indicates if a runtime is available. + * + * @param string $type + * + * @return bool + */ + public function hasRuntime(string $type): bool { + try { + $this->getRuntime($type); + return true; + } catch (\Smarty\Exception $e) { + return false; + } + } + + /** + * @return callable|null + */ + public function getDefaultPluginHandlerFunc(): ?callable { + return $this->default_plugin_handler_func; + } + + /** + * load a filter of specified type and name + * + * @param string $type filter type + * @param string $name filter name + * + * @return bool + * @throws \Smarty\Exception + * @api Smarty::loadFilter() + * + * @deprecated since 5.0 + */ + public function loadFilter($type, $name) { + + if ($type == \Smarty\Smarty::FILTER_VARIABLE) { + foreach ($this->getExtensions() as $extension) { + if ($extension->getModifierCallback($name)) { + + trigger_error('Using Smarty::loadFilter() to load variable filters is deprecated and will ' . + 'be removed in a future release. Use Smarty::addDefaultModifiers() to add a modifier.', + E_USER_DEPRECATED); + + $this->addDefaultModifiers([$name]); + return true; + } + } + } + + trigger_error('Using Smarty::loadFilter() to load filters is deprecated and will be ' . + 'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::registerFilter to ' . + 'quickly register a filter using a callback function.', E_USER_DEPRECATED); + + if ($type == \Smarty\Smarty::FILTER_OUTPUT && $name == 'trimwhitespace') { + $this->BCPluginsAdapter->addOutputFilter(new TrimWhitespace()); + return true; + } + + $_plugin = "smarty_{$type}filter_{$name}"; + if (!is_callable($_plugin) && class_exists($_plugin, false)) { + $_plugin = [$_plugin, 'execute']; + } + + if (is_callable($_plugin)) { + $this->registerFilter($type, $_plugin, $name); + return true; + } + + throw new Exception("{$type}filter '{$name}' not found or callable"); + } + + /** + * load a filter of specified type and name + * + * @param string $type filter type + * @param string $name filter name + * + * @return static + * @throws \Smarty\Exception + * @api Smarty::unloadFilter() + * + * + * @deprecated since 5.0 + */ + public function unloadFilter($type, $name) { + trigger_error('Using Smarty::unloadFilter() to unload filters is deprecated and will be ' . + 'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::(un)registerFilter to ' . + 'quickly (un)register a filter using a callback function.', E_USER_DEPRECATED); + + return $this->unregisterFilter($type, $name); + } + + private $_caching_type = 'file'; + + /** + * @param $type + * + * @return void + * @deprecated since 5.0 + */ + public function setCachingType($type) { + trigger_error('Using Smarty::setCachingType() is deprecated and will be ' . + 'removed in a future release. Use Smarty::setCacheResource() instead.', E_USER_DEPRECATED); + $this->_caching_type = $type; + $this->activateBCCacheResource(); + } + + /** + * @return string + * @deprecated since 5.0 + */ + public function getCachingType(): string { + trigger_error('Using Smarty::getCachingType() is deprecated and will be ' . + 'removed in a future release.', E_USER_DEPRECATED); + return $this->_caching_type; + } + + /** + * Registers a resource to fetch a template + * + * @param string $name name of resource type + * @param Base $resource_handler + * + * @return static + * + * @api Smarty::registerCacheResource() + * + * @deprecated since 5.0 + */ + public function registerCacheResource($name, \Smarty\Cacheresource\Base $resource_handler) { + + trigger_error('Using Smarty::registerCacheResource() is deprecated and will be ' . + 'removed in a future release. Use Smarty::setCacheResource() instead.', E_USER_DEPRECATED); + + $this->registered_cache_resources[$name] = $resource_handler; + $this->activateBCCacheResource(); + return $this; + } + + /** + * Unregisters a resource to fetch a template + * + * @param $name + * + * @return static + * @api Smarty::unregisterCacheResource() + * + * @deprecated since 5.0 + * + */ + public function unregisterCacheResource($name) { + + trigger_error('Using Smarty::unregisterCacheResource() is deprecated and will be ' . + 'removed in a future release.', E_USER_DEPRECATED); + + if (isset($this->registered_cache_resources[$name])) { + unset($this->registered_cache_resources[$name]); + } + return $this; + } + + private function activateBCCacheResource() { + if ($this->_caching_type == 'file') { + $this->setCacheResource(new File()); + } + if (isset($this->registered_cache_resources[$this->_caching_type])) { + $this->setCacheResource($this->registered_cache_resources[$this->_caching_type]); + } + } + + /** + * Registers a filter function + * + * @param string $type filter type + * @param callable $callback + * @param string|null $name optional filter name + * + * @return static + * @throws \Smarty\Exception + * + * @api Smarty::registerFilter() + */ + public function registerFilter($type, $callback, $name = null) { + $name = $name ?? $this->_getFilterName($callback); + if (!is_callable($callback)) { + throw new Exception("{$type}filter '{$name}' not callable"); + } + switch ($type) { + case 'variable': + $this->registerPlugin(self::PLUGIN_MODIFIER, $name, $callback); + trigger_error('Using Smarty::registerFilter() to register variable filters is deprecated and ' . + 'will be removed in a future release. Use Smarty::addDefaultModifiers() to add a modifier.', + E_USER_DEPRECATED); + + $this->addDefaultModifiers([$name]); + break; + case 'output': + $this->BCPluginsAdapter->addCallableAsOutputFilter($callback, $name); + break; + case 'pre': + $this->BCPluginsAdapter->addCallableAsPreFilter($callback, $name); + break; + case 'post': + $this->BCPluginsAdapter->addCallableAsPostFilter($callback, $name); + break; + default: + throw new Exception("Illegal filter type '{$type}'"); + } + + return $this; + } + + /** + * Return internal filter name + * + * @param callback $callable + * + * @return string|null internal filter name or null if callable cannot be serialized + */ + private function _getFilterName($callable) { + if (is_array($callable)) { + $_class_name = is_object($callable[0]) ? get_class($callable[0]) : $callable[0]; + return $_class_name . '_' . $callable[1]; + } elseif (is_string($callable)) { + return $callable; + } + return null; + } + + /** + * Unregisters a filter function. Smarty cannot unregister closures/anonymous functions if + * no name was given in ::registerFilter. + * + * @param string $type filter type + * @param callback|string $name the name previously used in ::registerFilter + * + * @return static + * @throws \Smarty\Exception + * @api Smarty::unregisterFilter() + * + * + */ + public function unregisterFilter($type, $name) { + + if (!is_string($name)) { + $name = $this->_getFilterName($name); + } + + if ($name) { + switch ($type) { + case 'output': + $this->BCPluginsAdapter->removeOutputFilter($name); + break; + case 'pre': + $this->BCPluginsAdapter->removePreFilter($name); + break; + case 'post': + $this->BCPluginsAdapter->removePostFilter($name); + break; + default: + throw new Exception("Illegal filter type '{$type}'"); + } + } + + return $this; + } + + /** + * Add default modifiers + * + * @param array|string $modifiers modifier or list of modifiers + * to add + * + * @return static + * @api Smarty::addDefaultModifiers() + * + */ + public function addDefaultModifiers($modifiers) { + if (is_array($modifiers)) { + $this->default_modifiers = array_merge($this->default_modifiers, $modifiers); + } else { + $this->default_modifiers[] = $modifiers; + } + return $this; + } + + /** + * Get default modifiers + * + * @return array list of default modifiers + * @api Smarty::getDefaultModifiers() + * + */ + public function getDefaultModifiers() { + return $this->default_modifiers; + } + + /** + * Set default modifiers + * + * @param array|string $modifiers modifier or list of modifiers + * to set + * + * @return static + * @api Smarty::setDefaultModifiers() + * + */ + public function setDefaultModifiers($modifiers) { + $this->default_modifiers = (array)$modifiers; + return $this; + } + + /** + * @return Cacheresource\Base + */ + public function getCacheResource(): Cacheresource\Base { + return $this->cacheResource; + } + + /** + * @param Cacheresource\Base $cacheResource + */ + public function setCacheResource(Cacheresource\Base $cacheResource): void { + $this->cacheResource = $cacheResource; + } + + /** + * fetches a rendered Smarty template + * + * @param string $template the resource handle of the template file or template object + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * + * @return string rendered template output + * @throws Exception + * @throws Exception + */ + public function fetch($template = null, $cache_id = null, $compile_id = null) { + return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->fetch(); + } + + /** + * displays a Smarty template + * + * @param string $template the resource handle of the template file or template object + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * + * @throws \Exception + * @throws \Smarty\Exception + */ + public function display($template = null, $cache_id = null, $compile_id = null) { + $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->display(); + } + + /** + * @param $resource_name + * @param $cache_id + * @param $compile_id + * @param $parent + * @param $caching + * @param $cache_lifetime + * @param bool $isConfig + * @param array $data + * + * @return Template + * @throws Exception + */ + public function doCreateTemplate( + $resource_name, + $cache_id = null, + $compile_id = null, + $parent = null, + $caching = null, + $cache_lifetime = null, + bool $isConfig = false, + array $data = []): Template { + + if (!$this->_templateDirNormalized) { + $this->_normalizeTemplateConfig(false); + } + + $_templateId = $this->generateUniqueTemplateId($resource_name, $cache_id, $compile_id, $caching); + + if (!isset($this->templates[$_templateId])) { + $newTemplate = new Template($resource_name, $this, $parent ?: $this, $cache_id, $compile_id, $caching, $isConfig); + $newTemplate->templateId = $_templateId; // @TODO this could go in constructor ^? + $this->templates[$_templateId] = $newTemplate; + } + + $tpl = clone $this->templates[$_templateId]; + + $tpl->setParent($parent ?: $this); + + if ($cache_lifetime) { + $tpl->setCacheLifetime($cache_lifetime); + } + + // fill data if present + foreach ($data as $_key => $_val) { + $tpl->assign($_key, $_val); + } + + $tpl->tplFunctions = array_merge($parent->tplFunctions ?? [], $tpl->tplFunctions ?? []); + + if (!$this->debugging && $this->debugging_ctrl === 'URL') { + $tpl->getSmarty()->getDebug()->debugUrl($tpl->getSmarty()); + } + return $tpl; + } + + /** + * test if cache is valid + * + * @param null|string|Template $template the resource handle of the template file or template + * object + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * + * @return bool cache status + * @throws \Exception + * @throws \Smarty\Exception + * + * @api Smarty::isCached() + */ + public function isCached($template = null, $cache_id = null, $compile_id = null) { + return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->isCached(); + } + + /** + * @param $template + * @param $cache_id + * @param $compile_id + * @param $parent + * + * @return Template + * @throws Exception + */ + private function returnOrCreateTemplate($template, $cache_id = null, $compile_id = null) { + if (!($template instanceof Template)) { + $template = $this->createTemplate($template, $cache_id, $compile_id, $this); + $template->caching = $this->caching; + } + return $template; + } + + /** + * Sets if Smarty should check If-Modified-Since headers to determine cache validity. + * @param bool $cache_modified_check + * @return void + */ + public function setCacheModifiedCheck($cache_modified_check): void { + $this->cache_modified_check = (bool) $cache_modified_check; + } + +} + diff --git a/include/smarty/src/Template.php b/include/smarty/src/Template.php new file mode 100644 index 000000000..242fb2388 --- /dev/null +++ b/include/smarty/src/Template.php @@ -0,0 +1,732 @@ +getSmarty()-getLeftDelimiter(). + * + * @var string + */ + private $left_delimiter = null; + + /** + * Template right-delimiter. If null, defaults to $this->getSmarty()-getRightDelimiter(). + * + * @var string + */ + private $right_delimiter = null; + + /** + * @var InheritanceRuntime|null + */ + private $inheritance; + + /** + * Create template data object + * Some of the global Smarty settings copied to template scope + * It load the required template resources and caching plugins + * + * @param string $template_resource template resource string + * @param Smarty $smarty Smarty instance + * @param \Smarty\Data|null $_parent back pointer to parent object with variables or null + * @param mixed $_cache_id cache id or null + * @param mixed $_compile_id compile id or null + * @param bool|int|null $_caching use caching? + * @param bool $_isConfig + * + * @throws \Smarty\Exception + */ + public function __construct( + $template_resource, + Smarty $smarty, + ?\Smarty\Data $_parent = null, + $_cache_id = null, + $_compile_id = null, + $_caching = null, + $_isConfig = false + ) { + $this->smarty = $smarty; + // Smarty parameter + $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id; + $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id; + $this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching); + $this->cache_lifetime = $this->smarty->cache_lifetime; + $this->compile_check = (int)$smarty->compile_check; + $this->parent = $_parent; + // Template resource + $this->template_resource = $template_resource; + + $this->source = $_isConfig ? Config::load($this) : Source::load($this); + $this->compiled = Compiled::load($this); + + if ($smarty->security_policy) { + $smarty->security_policy->registerCallBacks($this); + } + } + + /** + * render template + * + * @param bool $no_output_filter if true do not run output filter + * @param null|bool $display true: display, false: fetch null: sub-template + * + * @return string + * @throws \Exception + * @throws \Smarty\Exception + */ + private function render($no_output_filter = true, $display = null) { + if ($this->smarty->debugging) { + $this->smarty->getDebug()->start_template($this, $display); + } + // checks if template exists + if ($this->compile_check && !$this->getSource()->exists) { + throw new Exception( + "Unable to load '{$this->getSource()->type}:{$this->getSource()->name}'" . + ($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '') + ); + } + + // disable caching for evaluated code + if ($this->getSource()->handler->recompiled) { + $this->caching = \Smarty\Smarty::CACHING_OFF; + } + + foreach ($this->startRenderCallbacks as $callback) { + call_user_func($callback, $this); + } + + try { + + // read from cache or render + if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT || $this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED) { + $this->getCached()->render($this, $no_output_filter); + } else { + $this->getCompiled()->render($this); + } + + } finally { + foreach ($this->endRenderCallbacks as $callback) { + call_user_func($callback, $this); + } + } + + // display or fetch + if ($display) { + if ($this->caching && $this->smarty->cache_modified_check) { + $this->smarty->cacheModifiedCheck( + $this->getCached(), + $this, + isset($content) ? $content : ob_get_clean() + ); + } else { + if ((!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled) + && !$no_output_filter + ) { + echo $this->smarty->runOutputFilters(ob_get_clean(), $this); + } else { + echo ob_get_clean(); + } + } + if ($this->smarty->debugging) { + $this->smarty->getDebug()->end_template($this); + // debug output + $this->smarty->getDebug()->display_debug($this, true); + } + return ''; + } else { + if ($this->smarty->debugging) { + $this->smarty->getDebug()->end_template($this); + if ($this->smarty->debugging === 2 && $display === false) { + $this->smarty->getDebug()->display_debug($this, true); + } + } + if ( + !$no_output_filter + && (!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled) + ) { + + return $this->smarty->runOutputFilters(ob_get_clean(), $this); + } + // return cache content + return null; + } + } + + /** + * Runtime function to render sub-template + * + * @param string $template_name template name + * @param mixed $cache_id cache id + * @param mixed $compile_id compile id + * @param integer $caching cache mode + * @param integer $cache_lifetime lifetime of cache data + * @param array $extra_vars passed parameter template variables + * @param int|null $scope + * + * @throws Exception + */ + public function renderSubTemplate( + $template_name, + $cache_id, + $compile_id, + $caching, + $cache_lifetime, + array $extra_vars = [], + ?int $scope = null, + ?string $currentDir = null + ) { + + $name = $this->parseResourceName($template_name); + if ($currentDir && preg_match('/^\.{1,2}\//', $name)) { + // relative template resource name, append it to current template name + $template_name = $currentDir . DIRECTORY_SEPARATOR . $name; + } + + $tpl = $this->smarty->doCreateTemplate($template_name, $cache_id, $compile_id, $this, $caching, $cache_lifetime); + + $tpl->inheritance = $this->getInheritance(); // re-use the same Inheritance object inside the inheritance tree + + if ($scope) { + $tpl->defaultScope = $scope; + } + + if ($caching) { + if ($tpl->templateId !== $this->templateId && $caching !== \Smarty\Template::CACHING_NOCACHE_CODE) { + $tpl->getCached(true); + } else { + // re-use the same Cache object across subtemplates to gather hashes and file dependencies. + $tpl->setCached($this->getCached()); + } + } + + foreach ($extra_vars as $_key => $_val) { + $tpl->assign($_key, $_val); + } + if ($tpl->caching === \Smarty\Template::CACHING_NOCACHE_CODE) { + if ($tpl->getCompiled()->getNocacheCode()) { + $this->getCached()->hashes[$tpl->getCompiled()->nocache_hash] = true; + } + } + + $tpl->render(); + } + + /** + * Remove type indicator from resource name if present. + * E.g. $this->parseResourceName('file:template.tpl') returns 'template.tpl' + * + * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including). + * + * @param string $resource_name template_resource or config_resource to parse + * + * @return string + */ + private function parseResourceName($resource_name): string { + if (preg_match('/^([A-Za-z0-9_\-]{2,}):/', $resource_name, $match)) { + return substr($resource_name, strlen($match[0])); + } + return $resource_name; + } + + /** + * Check if this is a sub template + * + * @return bool true is sub template + */ + public function _isSubTpl() { + return isset($this->parent) && $this->parent instanceof Template; + } + + public function assign($tpl_var, $value = null, $nocache = false, $scope = null) { + return parent::assign($tpl_var, $value, $nocache, $scope); + } + + /** + * Compiles the template + * If the template is not evaluated the compiled template is saved on disk + * + * @TODO only used in compileAll and 1 unit test: can we move this and make compileAndWrite private? + * + * @throws \Exception + */ + public function compileTemplateSource() { + return $this->getCompiled()->compileAndWrite($this); + } + + /** + * Return cached content + * + * @return null|string + * @throws Exception + */ + public function getCachedContent() { + return $this->getCached()->getContent($this); + } + + /** + * Writes the content to cache resource + * + * @param string $content + * + * @return bool + * + * @TODO this method is only used in unit tests that (mostly) try to test CacheResources. + */ + public function writeCachedContent($content) { + if ($this->getSource()->handler->recompiled || !$this->caching + ) { + // don't write cache file + return false; + } + $codeframe = $this->createCodeFrame($content, '', true); + return $this->getCached()->writeCache($this, $codeframe); + } + + /** + * Get unique template id + * + * @return string + */ + public function getTemplateId() { + return $this->templateId; + } + + /** + * runtime error not matching capture tags + * + * @throws \Smarty\Exception + */ + public function capture_error() { + throw new Exception("Not matching {capture} open/close in '{$this->template_resource}'"); + } + + /** + * Return Compiled object + * + * @param bool $forceNew force new compiled object + */ + public function getCompiled($forceNew = false) { + if ($forceNew || !isset($this->compiled)) { + $this->compiled = Compiled::load($this); + } + return $this->compiled; + } + + /** + * Return Cached object + * + * @param bool $forceNew force new cached object + * + * @throws Exception + */ + public function getCached($forceNew = false): Cached { + if ($forceNew || !isset($this->cached)) { + $cacheResource = $this->smarty->getCacheResource(); + $this->cached = new Cached( + $this->source, + $cacheResource, + $this->compile_id, + $this->cache_id + ); + if ($this->isCachingEnabled()) { + $cacheResource->populate($this->cached, $this); + } else { + $this->cached->setValid(false); + } + } + return $this->cached; + } + + private function isCachingEnabled(): bool { + return $this->caching && !$this->getSource()->handler->recompiled; + } + + /** + * Helper function for InheritanceRuntime object + * + * @return InheritanceRuntime + * @throws Exception + */ + public function getInheritance(): InheritanceRuntime { + if (is_null($this->inheritance)) { + $this->inheritance = clone $this->getSmarty()->getRuntime('Inheritance'); + } + return $this->inheritance; + } + + /** + * Sets a new InheritanceRuntime object. + * + * @param InheritanceRuntime $inheritanceRuntime + * + * @return void + */ + public function setInheritance(InheritanceRuntime $inheritanceRuntime) { + $this->inheritance = $inheritanceRuntime; + } + + /** + * Return Compiler object + */ + public function getCompiler() { + if (!isset($this->compiler)) { + $this->compiler = $this->getSource()->createCompiler(); + } + return $this->compiler; + } + + /** + * Create code frame for compiled and cached templates + * + * @param string $content optional template content + * @param string $functions compiled template function and block code + * @param bool $cache flag for cache file + * @param Compiler\Template|null $compiler + * + * @return string + * @throws Exception + */ + public function createCodeFrame($content = '', $functions = '', $cache = false, ?\Smarty\Compiler\Template $compiler = null) { + return $this->getCodeFrameCompiler()->create($content, $functions, $cache, $compiler); + } + + /** + * Template data object destructor + */ + public function __destruct() { + if ($this->smarty->cache_locking && $this->getCached()->is_locked) { + $this->getCached()->handler->releaseLock($this->smarty, $this->getCached()); + } + } + + /** + * Returns if the current template must be compiled by the Smarty compiler + * It does compare the timestamps of template source and the compiled templates and checks the force compile + * configuration + * + * @return bool + * @throws \Smarty\Exception + */ + public function mustCompile(): bool { + if (!$this->getSource()->exists) { + if ($this->_isSubTpl()) { + $parent_resource = " in '{$this->parent->template_resource}'"; + } else { + $parent_resource = ''; + } + throw new Exception("Unable to load {$this->getSource()->type} '{$this->getSource()->name}'{$parent_resource}"); + } + + // @TODO move this logic to Compiled + return $this->smarty->force_compile + || $this->getSource()->handler->recompiled + || !$this->getCompiled()->exists + || ($this->compile_check && $this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp()); + } + + private function getCodeFrameCompiler(): Compiler\CodeFrame { + return new \Smarty\Compiler\CodeFrame($this); + } + + /** + * Get left delimiter + * + * @return string + */ + public function getLeftDelimiter() + { + return $this->left_delimiter ?? $this->getSmarty()->getLeftDelimiter(); + } + + /** + * Set left delimiter + * + * @param string $left_delimiter + */ + public function setLeftDelimiter($left_delimiter) + { + $this->left_delimiter = $left_delimiter; + } + + /** + * Get right delimiter + * + * @return string $right_delimiter + */ + public function getRightDelimiter() + { + return $this->right_delimiter ?? $this->getSmarty()->getRightDelimiter();; + } + + /** + * Set right delimiter + * + * @param string + */ + public function setRightDelimiter($right_delimiter) + { + $this->right_delimiter = $right_delimiter; + } + + /** + * gets a stream variable + * + * @param string $variable the stream of the variable + * + * @return mixed + * @throws \Smarty\Exception + * + */ + public function getStreamVariable($variable) + { + + trigger_error("Using stream variables (\`\{\$foo:bar\}\`)is deprecated.", E_USER_DEPRECATED); + + $_result = ''; + $fp = fopen($variable, 'r+'); + if ($fp) { + while (!feof($fp) && ($current_line = fgets($fp)) !== false) { + $_result .= $current_line; + } + fclose($fp); + return $_result; + } + if ($this->getSmarty()->error_unassigned) { + throw new Exception('Undefined stream variable "' . $variable . '"'); + } + return null; + } + /** + * @inheritdoc + */ + public function configLoad($config_file, $sections = null) + { + $confObj = parent::configLoad($config_file, $sections); + + $this->getCompiled()->file_dependency[ $confObj->getSource()->uid ] = + array($confObj->getSource()->getResourceName(), $confObj->getSource()->getTimeStamp(), $confObj->getSource()->type); + + return $confObj; + } + + public function fetch() { + $result = $this->_execute(0); + return $result === null ? ob_get_clean() : $result; + } + + public function display() { + $this->_execute(1); + } + + /** + * test if cache is valid + * + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param object $parent next higher level of Smarty variables + * + * @return bool cache status + * @throws \Exception + * @throws \Smarty\Exception + * + * @api Smarty::isCached() + */ + public function isCached(): bool { + return (bool) $this->_execute(2); + } + + /** + * fetches a rendered Smarty template + * + * @param string $function function type 0 = fetch, 1 = display, 2 = isCache + * + * @return mixed + * @throws Exception + * @throws \Throwable + */ + private function _execute($function) { + + $smarty = $this->getSmarty(); + + // make sure we have integer values + $this->caching = (int)$this->caching; + // fetch template content + $level = ob_get_level(); + try { + $_smarty_old_error_level = + isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null; + + if ($smarty->isMutingUndefinedOrNullWarnings()) { + $errorHandler = new \Smarty\ErrorHandler(); + $errorHandler->activate(); + } + + if ($function === 2) { + if ($this->caching) { + // return cache status of template + $result = $this->getCached()->isCached($this); + } else { + return false; + } + } else { + + // After rendering a template, the tpl/config variables are reset, so the template can be re-used. + $this->pushStack(); + + // Start output-buffering. + ob_start(); + + $result = $this->render(false, $function); + + // Restore the template to its previous state + $this->popStack(); + } + + if (isset($errorHandler)) { + $errorHandler->deactivate(); + } + + if (isset($_smarty_old_error_level)) { + error_reporting($_smarty_old_error_level); + } + return $result; + } catch (\Throwable $e) { + while (ob_get_level() > $level) { + ob_end_clean(); + } + if (isset($errorHandler)) { + $errorHandler->deactivate(); + } + + if (isset($_smarty_old_error_level)) { + error_reporting($_smarty_old_error_level); + } + throw $e; + } + } + + /** + * @return Config|Source|null + */ + public function getSource() { + return $this->source; + } + + /** + * @param Config|Source|null $source + */ + public function setSource($source): void { + $this->source = $source; + } + + /** + * Sets the Cached object, so subtemplates can share one Cached object to gather meta-data. + * + * @param Cached $cached + * + * @return void + */ + private function setCached(Cached $cached) { + $this->cached = $cached; + } + + /** + * @param string $compile_id + * + * @throws Exception + */ + public function setCompileId($compile_id) { + parent::setCompileId($compile_id); + $this->getCompiled(true); + if ($this->caching) { + $this->getCached(true); + } + } + + /** + * @param string $cache_id + * + * @throws Exception + */ + public function setCacheId($cache_id) { + parent::setCacheId($cache_id); + $this->getCached(true); + } + +} diff --git a/include/smarty/src/Template/Cached.php b/include/smarty/src/Template/Cached.php new file mode 100644 index 000000000..78635db06 --- /dev/null +++ b/include/smarty/src/Template/Cached.php @@ -0,0 +1,428 @@ +valid = $valid; + } + + /** + * CacheResource Handler + * + * @var \Smarty\Cacheresource\Base + */ + public $handler = null; + + /** + * Template Cache Id (\Smarty\Template::$cache_id) + * + * @var string + */ + public $cache_id = null; + + /** + * saved cache lifetime in seconds + * + * @var int + */ + public $cache_lifetime = 0; + + /** + * Id for cache locking + * + * @var string + */ + public $lock_id = null; + + /** + * flag that cache is locked by this instance + * + * @var bool + */ + public $is_locked = false; + + /** + * Source Object + * + * @var Source + */ + public $source = null; + + /** + * Nocache hash codes of processed compiled templates + * + * @var array + */ + public $hashes = []; + + /** + * Content buffer + * + * @var string + */ + public $content = null; + + /** + * create Cached Object container + * + * @param Source $source + * @param \Smarty\Cacheresource\Base $handler + * @param $compile_id + * @param $cache_id + */ + public function __construct(Source $source, \Smarty\Cacheresource\Base $handler, $compile_id, $cache_id) { + $this->compile_id = $compile_id; + $this->cache_id = $cache_id; + $this->source = $source; + $this->handler = $handler; + } + + /** + * Render cache template + * + * @param \Smarty\Template $_template + * @param bool $no_output_filter + * + * @throws \Exception + */ + public function render(Template $_template, $no_output_filter = true) { + + if (!$this->isCached($_template)) { + $this->updateCache($_template, $no_output_filter); + } else { + if (!$this->processed) { + $this->process($_template); + } + } + + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->start_cache($_template); + } + + $this->getRenderedTemplateCode($_template, $this->unifunc); + + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->end_cache($_template); + } + + } + + /** + * Check if cache is valid, lock cache if required + * + * @param Template $_template + * + * @return bool flag true if cache is valid + * @throws Exception + */ + public function isCached(Template $_template) { + if ($this->valid !== null) { + return $this->valid; + } + while (true) { + while (true) { + if ($this->exists === false || $_template->getSmarty()->force_compile || $_template->getSmarty()->force_cache) { + $this->valid = false; + } else { + $this->valid = true; + } + if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT + && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime) + ) { + // lifetime expired + $this->valid = false; + } + if ($this->valid && $_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON + && $_template->getSource()->getTimeStamp() > $this->timestamp + ) { + $this->valid = false; + } + if ($this->valid || !$_template->getSmarty()->cache_locking) { + break; + } + if (!$this->handler->locked($_template->getSmarty(), $this)) { + $this->handler->acquireLock($_template->getSmarty(), $this); + break 2; + } + $this->handler->populate($this, $_template); + } + if ($this->valid) { + if (!$_template->getSmarty()->cache_locking || $this->handler->locked($_template->getSmarty(), $this) === null) { + // load cache file for the following checks + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->start_cache($_template); + } + if ($this->handler->process($_template, $this) === false) { + $this->valid = false; + } else { + $this->processed = true; + } + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->end_cache($_template); + } + } else { + $this->is_locked = true; + continue; + } + } else { + return $this->valid; + } + if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED + && $_template->getCached()->cache_lifetime >= 0 + && (time() > ($_template->getCached()->timestamp + $_template->getCached()->cache_lifetime)) + ) { + $this->valid = false; + } + if ($_template->getSmarty()->cache_locking) { + if (!$this->valid) { + $this->handler->acquireLock($_template->getSmarty(), $this); + } elseif ($this->is_locked) { + $this->handler->releaseLock($_template->getSmarty(), $this); + } + } + return $this->valid; + } + return $this->valid; + } + + /** + * Process cached template + * + * @param Template $_template template object + */ + private function process(Template $_template) { + if ($this->handler->process($_template, $this) === false) { + $this->valid = false; + } + $this->processed = $this->valid; + } + + /** + * Read cache content from handler + * + * @param Template $_template template object + * + * @return string|false content + */ + public function readCache(Template $_template) { + if (!$_template->getSource()->handler->recompiled) { + return $this->handler->retrieveCachedContent($_template); + } + return false; + } + + /** + * Write this cache object to handler + * + * @param string $content content to cache + * + * @return bool success + */ + public function writeCache(Template $_template, $content) { + if (!$_template->getSource()->handler->recompiled) { + if ($this->handler->storeCachedContent($_template, $content)) { + $this->content = null; + $this->timestamp = time(); + $this->exists = true; + $this->valid = true; + $this->cache_lifetime = $_template->cache_lifetime; + $this->processed = false; + if ($_template->getSmarty()->cache_locking) { + $this->handler->releaseLock($_template->getSmarty(), $this); + } + return true; + } + $this->content = null; + $this->timestamp = false; + $this->exists = false; + $this->valid = false; + $this->processed = false; + } + return false; + } + + /** + * Cache was invalid , so render from compiled and write to cache + * + * @param Template $_template + * @param bool $no_output_filter + * + * @throws \Smarty\Exception + */ + private function updateCache(Template $_template, $no_output_filter) { + + ob_start(); + + $_template->getCompiled()->render($_template); + + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->start_cache($_template); + } + + $this->removeNoCacheHash($_template, $no_output_filter); + $this->process($_template); + + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->end_cache($_template); + } + } + + /** + * Sanitize content and write it to cache resource + * + * @param Template $_template + * @param bool $no_output_filter + * + * @throws \Smarty\Exception + */ + private function removeNoCacheHash(Template $_template, $no_output_filter) { + $php_pattern = '/(<%|%>|<\?php|<\?|\?>|)/'; + $content = ob_get_clean(); + $hash_array = $this->hashes; + $hash_array[$_template->getCompiled()->nocache_hash] = true; + $hash_array = array_keys($hash_array); + $nocache_hash = '(' . implode('|', $hash_array) . ')'; + $_template->getCached()->setNocacheCode(false); + // get text between non-cached items + $cache_split = + preg_split( + "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", + $content + ); + // get non-cached items + preg_match_all( + "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", + $content, + $cache_parts + ); + $content = ''; + // loop over items, stitch back together + foreach ($cache_split as $curr_idx => $curr_split) { + if (preg_match($php_pattern, $curr_split)) { + // escape PHP tags in template content + $php_split = preg_split( + $php_pattern, + $curr_split + ); + preg_match_all( + $php_pattern, + $curr_split, + $php_parts + ); + foreach ($php_split as $idx_php => $curr_php) { + $content .= $curr_php; + if (isset($php_parts[0][$idx_php])) { + $content .= "\n"; + } + } + } else { + $content .= $curr_split; + } + if (isset($cache_parts[0][$curr_idx])) { + $_template->getCached()->setNocacheCode(true); + $content .= $cache_parts[2][$curr_idx]; + } + } + if ( + !$no_output_filter + && !$_template->getCached()->getNocacheCode() + ) { + $content = $_template->getSmarty()->runOutputFilters($content, $_template); + } + + $codeframe = (new \Smarty\Compiler\CodeFrame($_template))->create($content, '', true); + $this->writeCache($_template, $codeframe); + } + + /** + * @return Source|null + */ + public function getSource(): ?Source { + return $this->source; + } + + /** + * @param Source|null $source + */ + public function setSource(?Source $source): void { + $this->source = $source; + } + + /** + * Returns the generated content + * + * @param Template $template + * + * @return string|null + * @throws \Exception + */ + public function getContent(Template $template) { + ob_start(); + $this->render($template); + return ob_get_clean(); + } + + /** + * This function is executed automatically when a generated file is included + * - Decode saved properties + * - Check if file is valid + * + * @param Template $_template + * @param array $properties special template properties + * + * @return bool flag if compiled or cache file is valid + * @throws Exception + */ + public function isFresh(Template $_template, array $properties): bool { + + // on cache resources other than file check version stored in cache code + if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) { + return false; + } + + $is_valid = true; + + if (!empty($properties['file_dependency']) && ($_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON)) { + $is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template); + } + + // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc + if ($_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0 + && (time() > ($this->timestamp + $properties['cache_lifetime'])) + ) { + $is_valid = false; + } + + $this->cache_lifetime = $properties['cache_lifetime']; + $this->setValid($is_valid); + + if ($is_valid) { + $this->unifunc = $properties['unifunc']; + $this->setNocacheCode($properties['has_nocache_code']); + $this->file_dependency = $properties['file_dependency']; + } + return $is_valid && !function_exists($properties['unifunc']); + } + +} diff --git a/include/smarty/src/Template/Compiled.php b/include/smarty/src/Template/Compiled.php new file mode 100644 index 000000000..5a07db0e6 --- /dev/null +++ b/include/smarty/src/Template/Compiled.php @@ -0,0 +1,305 @@ +getSource()->handler->supportsCompiledTemplates()) { + $compiled->populateCompiledFilepath($_template); + } + return $compiled; + } + + /** + * populate Compiled Object with compiled filepath + * + * @param Template $_template template object + **/ + private function populateCompiledFilepath(Template $_template) { + $source = $_template->getSource(); + $smarty = $_template->getSmarty(); + $this->filepath = $smarty->getCompileDir(); + if (isset($_template->compile_id)) { + $this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . + ($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^'); + } + // if use_sub_dirs, break file into directories + if ($smarty->use_sub_dirs) { + $this->filepath .= $source->uid[0] . $source->uid[1] . DIRECTORY_SEPARATOR . $source->uid[2] . + $source->uid[3] . DIRECTORY_SEPARATOR . $source->uid[4] . $source->uid[5] . + DIRECTORY_SEPARATOR; + } + $this->filepath .= $source->uid . '_'; + if ($source->isConfig) { + $this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 + + (int)$smarty->config_overwrite * 4; + } else { + $this->filepath .= (int)$smarty->escape_html * 2; + } + $this->filepath .= '.' . $source->type . '_' . $source->getBasename(); + + if ($_template->caching) { + $this->filepath .= '.cache'; + } + $this->filepath .= '.php'; + $this->timestamp = $this->exists = is_file($this->filepath); + if ($this->exists) { + $this->timestamp = filemtime($this->filepath); + } + } + + /** + * render compiled template code + * + * @param Template $_template + * + * @return string + * @throws \Smarty\Exception + */ + public function render(Template $_template) { + + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->start_render($_template); + } + if (!$this->processed) { + $this->compileAndLoad($_template); + } + + // @TODO Can't Cached handle this? Maybe introduce an event to decouple. + if ($_template->caching) { + $_template->getCached()->file_dependency = + array_merge($_template->getCached()->file_dependency, $this->file_dependency); + } + + $this->getRenderedTemplateCode($_template, $this->unifunc); + + // @TODO Can't Cached handle this? Maybe introduce an event to decouple and remove the $_template->caching property. + if ($_template->caching && $this->getNocacheCode()) { + $_template->getCached()->hashes[$this->nocache_hash] = true; + } + + if ($_template->getSmarty()->debugging) { + $_template->getSmarty()->getDebug()->end_render($_template); + } + } + + /** + * load compiled template or compile from source + * + * @param Template $_smarty_tpl do not change variable name, is used by compiled template + * + * @throws Exception + */ + private function compileAndLoad(Template $_smarty_tpl) { + + if ($_smarty_tpl->getSource()->handler->recompiled) { + $this->recompile($_smarty_tpl); + return; + } + + if ($this->exists && !$_smarty_tpl->getSmarty()->force_compile + && !($_smarty_tpl->compile_check && $_smarty_tpl->getSource()->getTimeStamp() > $this->getTimeStamp()) + ) { + $this->loadCompiledTemplate($_smarty_tpl, false); + } + + if (!$this->isValid) { + $this->compileAndWrite($_smarty_tpl); + $this->loadCompiledTemplate($_smarty_tpl); + } + + $this->processed = true; + } + + /** + * compile template from source + * + * @param Template $_smarty_tpl do not change variable name, is used by compiled template + * + * @throws Exception + */ + private function recompile(Template $_smarty_tpl) { + $level = ob_get_level(); + ob_start(); + // call compiler + try { + eval('?>' . $this->doCompile($_smarty_tpl)); + } catch (\Exception $e) { + while (ob_get_level() > $level) { + ob_end_clean(); + } + throw $e; + } + ob_get_clean(); + $this->timestamp = time(); + $this->exists = true; + } + + /** + * compile template from source + * + * @param Template $_template + * + * @throws Exception + */ + public function compileAndWrite(Template $_template) { + // compile locking + if ($saved_timestamp = (!$_template->getSource()->handler->recompiled && is_file($this->filepath))) { + $saved_timestamp = $this->getTimeStamp(); + touch($this->filepath); + } + // compile locking + try { + // call compiler + $this->write($_template, $this->doCompile($_template)); + } catch (\Exception $e) { + // restore old timestamp in case of error + if ($saved_timestamp && is_file($this->filepath)) { + touch($this->filepath, $saved_timestamp); + } + throw $e; + } + } + + /** + * Do the actual compiling. + * + * @param Template $_smarty_tpl + * + * @return string + * @throws Exception + */ + private function doCompile(Template $_smarty_tpl): string { + $this->file_dependency = []; + $this->includes = []; + $this->nocache_hash = null; + $this->unifunc = null; + return $_smarty_tpl->getCompiler()->compileTemplate($_smarty_tpl); + } + + /** + * Write compiled code by handler + * + * @param Template $_template template object + * @param string $code compiled code + * + * @return bool success + * @throws \Smarty\Exception + */ + private function write(Template $_template, $code) { + if (!$_template->getSource()->handler->recompiled) { + if ($_template->getSmarty()->writeFile($this->filepath, $code) === true) { + $this->timestamp = $this->exists = is_file($this->filepath); + if ($this->exists) { + $this->timestamp = filemtime($this->filepath); + return true; + } + } + return false; + } + return true; + } + + /** + * Load fresh compiled template by including the PHP file + * HHVM requires a workaround because of a PHP incompatibility + * + * @param Template $_smarty_tpl do not change/remove variable name, is used by compiled template + * @param bool $invalidateCachedFiles forces a revalidation of the file in opcache or apc cache (if available) + * + */ + private function loadCompiledTemplate(Template $_smarty_tpl, bool $invalidateCachedFiles = true) { + + if ($invalidateCachedFiles) { + if (function_exists('opcache_invalidate') + && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1) + ) { + opcache_invalidate($this->filepath, true); + } elseif (function_exists('apc_compile_file')) { + apc_compile_file($this->filepath); + } + } + if (defined('HHVM_VERSION')) { + eval('?>' . file_get_contents($this->filepath)); + } else { + include $this->filepath; + } + + } + + /** + * This function is executed automatically when a compiled or cached template file is included + * - Decode saved properties from compiled template and cache files + * - Check if compiled or cache file is valid + * + * @param Template $_template + * @param array $properties special template properties + * + * @return bool flag if compiled or cache file is valid + * @throws Exception + */ + public function isFresh(Template $_template, array $properties): bool { + + // on cache resources other than file check version stored in cache code + if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) { + return false; + } + + $is_valid = true; + if (!empty($properties['file_dependency']) && $_template->compile_check) { + $is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template); + } + + $this->isValid = $is_valid; + $this->includes = $properties['includes'] ?? []; + + if ($is_valid) { + $this->unifunc = $properties['unifunc']; + $this->setNocacheCode($properties['has_nocache_code']); + $this->file_dependency = $properties['file_dependency']; + } + return $is_valid && !function_exists($properties['unifunc']); + } + + /** + * This method is here only to fix an issue when upgrading from Smarty v4 to v5. + */ + public function _decodeProperties($a, $b, $c = false): bool { return false; } + +} diff --git a/include/smarty/src/Template/Config.php b/include/smarty/src/Template/Config.php new file mode 100644 index 000000000..b2fcbf813 --- /dev/null +++ b/include/smarty/src/Template/Config.php @@ -0,0 +1,36 @@ + true]; + + public function createCompiler(): \Smarty\Compiler\BaseCompiler { + return new \Smarty\Compiler\Configfile($this->smarty); + } + + protected static function getDefaultHandlerFunc(Smarty $smarty) { + return $smarty->default_config_handler_func; + } +} diff --git a/include/smarty/src/Template/GeneratedPhpFile.php b/include/smarty/src/Template/GeneratedPhpFile.php new file mode 100644 index 000000000..f436e9769 --- /dev/null +++ b/include/smarty/src/Template/GeneratedPhpFile.php @@ -0,0 +1,159 @@ +exists && !$this->timestamp) { + $this->timestamp = filemtime($this->filepath); + } + return $this->timestamp; + } + + /** + * @return bool + */ + public function getNocacheCode(): bool { + return $this->has_nocache_code; + } + + /** + * @param bool $has_nocache_code + */ + public function setNocacheCode(bool $has_nocache_code): void { + $this->has_nocache_code = $has_nocache_code; + } + + /** + * get rendered template content by calling compiled or cached template code + * + * @param string $unifunc function with template code + * + * @throws \Exception + */ + protected function getRenderedTemplateCode(\Smarty\Template $_template, $unifunc) { + $level = ob_get_level(); + try { + if (empty($unifunc) || !function_exists($unifunc)) { + throw new \Smarty\Exception("Invalid compiled template for '{$this->filepath}'"); + } + $unifunc($_template); + } catch (\Exception $e) { + while (ob_get_level() > $level) { + ob_end_clean(); + } + + throw $e; + } + } + + /** + * @param $file_dependency + * @param Template $_template + * + * @return bool + * @throws Exception + */ + protected function checkFileDependencies($file_dependency, Template $_template): bool { + // check file dependencies at compiled code + foreach ($file_dependency as $_file_to_check) { + + $handler = \Smarty\Resource\BasePlugin::load($_template->getSmarty(), $_file_to_check[2]); + + if ($handler instanceof FilePlugin) { + if ($_template->getSource()->getResourceName() === $_file_to_check[0]) { + // do not recheck current template + continue; + } + $mtime = $handler->getResourceNameTimestamp($_file_to_check[0], $_template->getSmarty(), $_template->getSource()->isConfig); + } else { + + if ($handler->checkTimestamps()) { + // @TODO this doesn't actually check any dependencies, but only the main source file + // and that might to be irrelevant, as the comment "do not recheck current template" above suggests + $source = Source::load($_template, $_template->getSmarty()); + $mtime = $source->getTimeStamp(); + } else { + continue; + } + } + + if ($mtime === false || $mtime > $_file_to_check[1]) { + return false; + } + } + return true; + } + +} diff --git a/include/smarty/src/Template/Source.php b/include/smarty/src/Template/Source.php new file mode 100644 index 000000000..2c2022ee5 --- /dev/null +++ b/include/smarty/src/Template/Source.php @@ -0,0 +1,285 @@ +handler = \Smarty\Resource\BasePlugin::load($smarty, $type); + + $this->smarty = $smarty; + $this->resource = $type . ':' . $name; + $this->type = $type; + $this->name = $name; + } + + /** + * initialize Source Object for given resource + * Either [$_template] or [$smarty, $template_resource] must be specified + * + * @param Template|null $_template template object + * @param Smarty|null $smarty smarty object + * @param null $template_resource resource identifier + * + * @return Source Source Object + * @throws Exception + */ + public static function load( + ?Template $_template = null, + ?Smarty $smarty = null, + $template_resource = null + ) { + if ($_template) { + $smarty = $_template->getSmarty(); + $template_resource = $_template->template_resource; + } + if (empty($template_resource)) { + throw new Exception('Source: Missing name'); + } + // parse resource_name, load resource handler, identify unique resource name + if (preg_match('/^([A-Za-z0-9_\-]{2,}):([\s\S]*)$/', $template_resource, $match)) { + $type = $match[1]; + $name = $match[2]; + } else { + // no resource given, use default + // or single character before the colon is not a resource type, but part of the filepath + $type = $smarty->default_resource_type; + $name = $template_resource; + } + + if (isset(self::$_incompatible_resources[$type])) { + throw new Exception("Unable to use resource '{$type}' for " . __METHOD__); + } + + // create new source object + $source = new static($smarty, $type, $name); + $source->handler->populate($source, $_template); + if (!$source->exists && static::getDefaultHandlerFunc($smarty)) { + $source->_getDefaultTemplate(static::getDefaultHandlerFunc($smarty)); + $source->handler->populate($source, $_template); + } + return $source; + } + + protected static function getDefaultHandlerFunc(Smarty $smarty) { + return $smarty->default_template_handler_func; + } + + /** + * Get source time stamp + * + * @return int + */ + public function getTimeStamp() { + if (!isset($this->timestamp)) { + $this->handler->populateTimestamp($this); + } + return $this->timestamp; + } + + /** + * Get source content + * + * @return string + * @throws \Smarty\Exception + */ + public function getContent() { + return $this->content ?? $this->handler->getContent($this); + } + + /** + * get default content from template or config resource handler + * + * @throws \Smarty\Exception + */ + public function _getDefaultTemplate($default_handler) { + $_content = $_timestamp = null; + $_return = \call_user_func_array( + $default_handler, + [$this->type, $this->name, &$_content, &$_timestamp, $this->smarty] + ); + if (is_string($_return)) { + $this->exists = is_file($_return); + if ($this->exists) { + $this->timestamp = filemtime($_return); + } else { + throw new Exception( + 'Default handler: Unable to load ' . + "default file '{$_return}' for '{$this->type}:{$this->name}'" + ); + } + $this->name = $_return; + $this->uid = sha1($_return); + } elseif ($_return === true) { + $this->content = $_content; + $this->exists = true; + $this->uid = $this->name = sha1($_content); + $this->handler = \Smarty\Resource\BasePlugin::load($this->smarty, 'eval'); + } else { + $this->exists = false; + throw new Exception( + 'Default handler: No ' . ($this->isConfig ? 'config' : 'template') . + " default content for '{$this->type}:{$this->name}'" + ); + } + } + + public function createCompiler(): \Smarty\Compiler\BaseCompiler { + return new \Smarty\Compiler\Template($this->smarty); + } + + public function getSmarty() { + return $this->smarty; + } + + /** + * Determine basename for compiled filename + * + * @return string resource's basename + */ + public function getBasename() + { + return $this->handler->getBasename($this); + } + + /** + * Return source name + * e.g.: 'sub/index.tpl' + * + * @return string + */ + public function getResourceName(): string { + return (string) $this->name; + } + + /** + * Return source name, including the type prefix. + * e.g.: 'file:sub/index.tpl' + * + * @return string + */ + public function getFullResourceName(): string { + return $this->type . ':' . $this->name; + } + + public function getFilepath(): ?string { + if ($this->handler instanceof FilePlugin) { + return $this->handler->getFilePath($this->name, $this->smarty, $this->isConfig); + } + return null; + } + + public function isConfig(): bool { + return $this->isConfig; + } + +} diff --git a/include/smarty/src/TemplateBase.php b/include/smarty/src/TemplateBase.php new file mode 100644 index 000000000..e06b5917a --- /dev/null +++ b/include/smarty/src/TemplateBase.php @@ -0,0 +1,425 @@ +getSmarty(); + // test if allowed methods callable + if (!empty($allowed_methods_properties)) { + foreach ((array)$allowed_methods_properties as $method) { + if (!is_callable([$object, $method]) && !property_exists($object, $method)) { + throw new Exception("Undefined method or property '$method' in registered object"); + } + } + } + // test if block methods callable + if (!empty($block_methods)) { + foreach ((array)$block_methods as $method) { + if (!is_callable([$object, $method])) { + throw new Exception("Undefined method '$method' in registered object"); + } + } + } + // register the object + $smarty->registered_objects[$object_name] = + [$object, (array)$allowed_methods_properties, (bool)$format, (array)$block_methods]; + return $this; + } + + /** + * Registers plugin to be used in templates + * + * @param string $object_name name of object + * + * @return static + * @api Smarty::unregisterObject() + * + */ + public function unregisterObject($object_name) { + $smarty = $this->getSmarty(); + if (isset($smarty->registered_objects[$object_name])) { + unset($smarty->registered_objects[$object_name]); + } + return $this; + } + + /** + * @return int + */ + public function getCompileCheck(): int { + return $this->compile_check; + } + + /** + * @param int $compile_check + */ + public function setCompileCheck($compile_check) { + $this->compile_check = (int)$compile_check; + } + + /** + * @param int $caching + */ + public function setCaching($caching) { + $this->caching = (int)$caching; + } + + /** + * @param int $cache_lifetime + */ + public function setCacheLifetime($cache_lifetime) { + $this->cache_lifetime = $cache_lifetime; + } + + /** + * @param string $compile_id + */ + public function setCompileId($compile_id) { + $this->compile_id = $compile_id; + } + + /** + * @param string $cache_id + */ + public function setCacheId($cache_id) { + $this->cache_id = $cache_id; + } + + /** + * creates a data object + * + * @param Data|null $parent next higher level of Smarty + * variables + * @param null $name optional data block name + * + * @return Data data object + * @throws Exception + * @api Smarty::createData() + * + */ + public function createData(?Data $parent = null, $name = null) { + /* @var Smarty $smarty */ + $smarty = $this->getSmarty(); + $dataObj = new Data($parent, $smarty, $name); + if ($smarty->debugging) { + $smarty->getDebug()->register_data($dataObj); + } + return $dataObj; + } + + /** + * return name of debugging template + * + * @return string + * @api Smarty::getDebugTemplate() + * + */ + public function getDebugTemplate() { + $smarty = $this->getSmarty(); + return $smarty->debug_tpl; + } + + /** + * @return Debug + */ + public function getDebug(): Debug { + if (!isset($this->debug)) { + $this->debug = new \Smarty\Debug(); + } + return $this->debug; + } + + + /** + * return a reference to a registered object + * + * @param string $object_name object name + * + * @return object + * @throws \Smarty\Exception if no such object is found + * + * @api Smarty::getRegisteredObject() + */ + public function getRegisteredObject($object_name) { + $smarty = $this->getSmarty(); + if (!isset($smarty->registered_objects[$object_name])) { + throw new Exception("'$object_name' is not a registered object"); + } + if (!is_object($smarty->registered_objects[$object_name][0])) { + throw new Exception("registered '$object_name' is not an object"); + } + return $smarty->registered_objects[$object_name][0]; + } + + /** + * Get literals + * + * @return array list of literals + * @api Smarty::getLiterals() + * + */ + public function getLiterals() { + $smarty = $this->getSmarty(); + return (array)$smarty->literals; + } + + /** + * Add literals + * + * @param array|string $literals literal or list of literals + * to addto add + * + * @return static + * @throws \Smarty\Exception + * @api Smarty::addLiterals() + * + */ + public function addLiterals($literals = null) { + if (isset($literals)) { + $this->_setLiterals($this->getSmarty(), (array)$literals); + } + return $this; + } + + /** + * Set literals + * + * @param array|string $literals literal or list of literals + * to setto set + * + * @return static + * @throws \Smarty\Exception + * @api Smarty::setLiterals() + * + */ + public function setLiterals($literals = null) { + $smarty = $this->getSmarty(); + $smarty->literals = []; + if (!empty($literals)) { + $this->_setLiterals($smarty, (array)$literals); + } + return $this; + } + + /** + * common setter for literals for easier handling of duplicates the + * Smarty::$literals array gets filled with identical key values + * + * @param Smarty $smarty + * @param array $literals + * + * @throws \Smarty\Exception + */ + private function _setLiterals(Smarty $smarty, $literals) { + $literals = array_combine($literals, $literals); + $error = isset($literals[$smarty->getLeftDelimiter()]) ? [$smarty->getLeftDelimiter()] : []; + $error = isset($literals[$smarty->getRightDelimiter()]) ? $error[] = $smarty->getRightDelimiter() : $error; + if (!empty($error)) { + throw new Exception( + 'User defined literal(s) "' . $error . + '" may not be identical with left or right delimiter' + ); + } + $smarty->literals = array_merge((array)$smarty->literals, (array)$literals); + } + + /** + * Registers static classes to be used in templates + * + * @param string $class_name + * @param string $class_impl the referenced PHP class to + * register + * + * @return static + * @throws \Smarty\Exception + * @api Smarty::registerClass() + * + */ + public function registerClass($class_name, $class_impl) { + $smarty = $this->getSmarty(); + // test if exists + if (!class_exists($class_impl)) { + throw new Exception("Undefined class '$class_impl' in register template class"); + } + // register the class + $smarty->registered_classes[$class_name] = $class_impl; + return $this; + } + + /** + * Register config default handler + * + * @param callable $callback class/method name + * + * @return static + * @throws Exception if $callback is not callable + * @api Smarty::registerDefaultConfigHandler() + * + */ + public function registerDefaultConfigHandler($callback) { + $smarty = $this->getSmarty(); + if (is_callable($callback)) { + $smarty->default_config_handler_func = $callback; + } else { + throw new Exception('Default config handler not callable'); + } + return $this; + } + + /** + * Register template default handler + * + * @param callable $callback class/method name + * + * @return static + * @throws Exception if $callback is not callable + * @api Smarty::registerDefaultTemplateHandler() + * + */ + public function registerDefaultTemplateHandler($callback) { + $smarty = $this->getSmarty(); + if (is_callable($callback)) { + $smarty->default_template_handler_func = $callback; + } else { + throw new Exception('Default template handler not callable'); + } + return $this; + } + + /** + * Registers a resource to fetch a template + * + * @param string $name name of resource type + * @param \Smarty\Resource\BasePlugin $resource_handler instance of Smarty\Resource\BasePlugin + * + * @return static + * + * @api Smarty::registerResource() + */ + public function registerResource($name, \Smarty\Resource\BasePlugin $resource_handler) { + $smarty = $this->getSmarty(); + $smarty->registered_resources[$name] = $resource_handler; + return $this; + } + + /** + * Unregisters a resource to fetch a template + * + * @param string $type name of resource type + * + * @return static + * @api Smarty::unregisterResource() + * + */ + public function unregisterResource($type) { + $smarty = $this->getSmarty(); + if (isset($smarty->registered_resources[$type])) { + unset($smarty->registered_resources[$type]); + } + return $this; + } + + /** + * set the debug template + * + * @param string $tpl_name + * + * @return static + * @throws Exception if file is not readable + * @api Smarty::setDebugTemplate() + * + */ + public function setDebugTemplate($tpl_name) { + $smarty = $this->getSmarty(); + if (!is_readable($tpl_name)) { + throw new Exception("Unknown file '{$tpl_name}'"); + } + $smarty->debug_tpl = $tpl_name; + return $this; + } + + + +} diff --git a/include/smarty/src/TestInstall.php b/include/smarty/src/TestInstall.php new file mode 100644 index 000000000..e24c39848 --- /dev/null +++ b/include/smarty/src/TestInstall.php @@ -0,0 +1,211 @@ +\n"; + echo "Smarty Installation test...\n"; + echo "Testing template directory...\n"; + } + $_stream_resolve_include_path = function_exists('stream_resolve_include_path'); + // test if all registered template_dir are accessible + foreach ($smarty->getTemplateDir() as $template_dir) { + $_template_dir = $template_dir; + $template_dir = realpath($template_dir); + // resolve include_path or fail existence + if (!$template_dir) { + $status = false; + $message = "FAILED: $_template_dir does not exist"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'template_dir' ] = $message; + } + continue; + } + if (!is_dir($template_dir)) { + $status = false; + $message = "FAILED: $template_dir is not a directory"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'template_dir' ] = $message; + } + } elseif (!is_readable($template_dir)) { + $status = false; + $message = "FAILED: $template_dir is not readable"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'template_dir' ] = $message; + } + } else { + if ($errors === null) { + echo "$template_dir is OK.\n"; + } + } + } + if ($errors === null) { + echo "Testing compile directory...\n"; + } + // test if registered compile_dir is accessible + $__compile_dir = $smarty->getCompileDir(); + $_compile_dir = realpath($__compile_dir); + if (!$_compile_dir) { + $status = false; + $message = "FAILED: {$__compile_dir} does not exist"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'compile_dir' ] = $message; + } + } elseif (!is_dir($_compile_dir)) { + $status = false; + $message = "FAILED: {$_compile_dir} is not a directory"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'compile_dir' ] = $message; + } + } elseif (!is_readable($_compile_dir)) { + $status = false; + $message = "FAILED: {$_compile_dir} is not readable"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'compile_dir' ] = $message; + } + } elseif (!is_writable($_compile_dir)) { + $status = false; + $message = "FAILED: {$_compile_dir} is not writable"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'compile_dir' ] = $message; + } + } else { + if ($errors === null) { + echo "{$_compile_dir} is OK.\n"; + } + } + if ($errors === null) { + echo "Testing plugins directory...\n"; + } + if ($errors === null) { + echo "Testing cache directory...\n"; + } + // test if all registered cache_dir is accessible + $__cache_dir = $smarty->getCacheDir(); + $_cache_dir = realpath($__cache_dir); + if (!$_cache_dir) { + $status = false; + $message = "FAILED: {$__cache_dir} does not exist"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'cache_dir' ] = $message; + } + } elseif (!is_dir($_cache_dir)) { + $status = false; + $message = "FAILED: {$_cache_dir} is not a directory"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'cache_dir' ] = $message; + } + } elseif (!is_readable($_cache_dir)) { + $status = false; + $message = "FAILED: {$_cache_dir} is not readable"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'cache_dir' ] = $message; + } + } elseif (!is_writable($_cache_dir)) { + $status = false; + $message = "FAILED: {$_cache_dir} is not writable"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'cache_dir' ] = $message; + } + } else { + if ($errors === null) { + echo "{$_cache_dir} is OK.\n"; + } + } + if ($errors === null) { + echo "Testing configs directory...\n"; + } + // test if all registered config_dir are accessible + foreach ($smarty->getConfigDir() as $config_dir) { + $_config_dir = $config_dir; + // resolve include_path or fail existence + if (!$config_dir) { + $status = false; + $message = "FAILED: $_config_dir does not exist"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'config_dir' ] = $message; + } + continue; + } + if (!is_dir($config_dir)) { + $status = false; + $message = "FAILED: $config_dir is not a directory"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'config_dir' ] = $message; + } + } elseif (!is_readable($config_dir)) { + $status = false; + $message = "FAILED: $config_dir is not readable"; + if ($errors === null) { + echo $message . ".\n"; + } else { + $errors[ 'config_dir' ] = $message; + } + } else { + if ($errors === null) { + echo "$config_dir is OK.\n"; + } + } + } + if ($errors === null) { + echo "Tests complete.\n"; + echo "\n"; + } + return $status; + } +} diff --git a/include/smarty/src/UndefinedVariable.php b/include/smarty/src/UndefinedVariable.php new file mode 100644 index 000000000..53f13f416 --- /dev/null +++ b/include/smarty/src/UndefinedVariable.php @@ -0,0 +1,19 @@ +value = $value; + } + + /** + * if true any output of this variable will be not cached + * + * @var boolean + */ + private $nocache = false; + + /** + * @param bool $nocache + */ + public function setNocache(bool $nocache): void { + $this->nocache = $nocache; + } + + /** + * create Smarty variable object + * + * @param mixed $value the value to assign + * @param boolean $nocache if true any output of this variable will be not cached + */ + public function __construct($value = null, $nocache = false) + { + $this->value = $value; + $this->nocache = $nocache; + } + + public function getValue() { + return $this->value; + } + + /** + * <> String conversion + * + * @return string + */ + public function __toString() + { + return (string)$this->value; + } + + /** + * Handles ++$a and --$a in templates. + * + * @param $operator '++' or '--', defaults to '++' + * + * @return int|mixed + * @throws Exception + */ + public function preIncDec($operator = '++') { + if ($operator == '--') { + return --$this->value; + } elseif ($operator == '++') { + return ++$this->value; + } else { + throw new Exception("Invalid incdec operator. Use '--' or '++'."); + } + return $this->value; + } + + /** + * Handles $a++ and $a-- in templates. + * + * @param $operator '++' or '--', defaults to '++' + * + * @return int|mixed + * @throws Exception + */ + public function postIncDec($operator = '++') { + if ($operator == '--') { + return $this->value--; + } elseif ($operator == '++') { + return $this->value++; + } else { + throw new Exception("Invalid incdec operator. Use '--' or '++'."); + } + } + + /** + * @return bool + */ + public function isNocache(): bool { + return $this->nocache; + } + +} diff --git a/include/smarty/libs/debug.tpl b/include/smarty/src/debug.tpl similarity index 92% rename from include/smarty/libs/debug.tpl rename to include/smarty/src/debug.tpl index 4f82a5820..ab093581d 100644 --- a/include/smarty/libs/debug.tpl +++ b/include/smarty/src/debug.tpl @@ -1,4 +1,4 @@ -{capture name='_smarty_debug' assign=debug_output} +{capture name='_smarty_debug' assign='debug_output'} @@ -108,7 +108,7 @@ -

    Smarty {Smarty::SMARTY_VERSION} Debug Console +

    Smarty {$smarty.version} Debug Console - {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}

    {if !empty($template_data)} @@ -144,6 +144,7 @@ {$vars['attributes']|debug_print_var nofilter} {/if} + {/foreach} @@ -166,10 +167,8 @@ {/capture} - diff --git a/include/smarty/src/functions.php b/include/smarty/src/functions.php new file mode 100644 index 000000000..590789ba3 --- /dev/null +++ b/include/smarty/src/functions.php @@ -0,0 +1,253 @@ + + * + * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime() + * + * @return int + */ +function smarty_make_timestamp($string) +{ + if (empty($string)) { + // use "now": + return time(); + } elseif ($string instanceof DateTime + || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface) + ) { + return (int)$string->format('U'); // PHP 5.2 BC + } elseif (strlen($string) === 14 && ctype_digit((string)$string)) { + // it is mysql timestamp format of YYYYMMDDHHMMSS? + return mktime( + substr($string, 8, 2), + substr($string, 10, 2), + substr($string, 12, 2), + substr($string, 4, 2), + substr($string, 6, 2), + substr($string, 0, 4) + ); + } elseif (is_numeric($string)) { + // it is a numeric string, we handle it as timestamp + return (int)$string; + } else { + // strtotime should handle it + $time = strtotime($string); + if ($time === -1 || $time === false) { + // strtotime() was not able to parse $string, use "now": + return time(); + } + return $time; + } +} + +/** + * Multibyte string replace + * + * @param string|string[] $search the string to be searched + * @param string|string[] $replace the replacement string + * @param string $subject the source string + * @param int &$count number of matches found + * + * @return string replaced string + * @author Rodney Rehm + */ +function smarty_mb_str_replace($search, $replace, $subject, &$count = 0) +{ + if (!is_array($search) && is_array($replace)) { + return false; + } + if (is_array($subject)) { + // call mb_replace for each single string in $subject + foreach ($subject as &$string) { + $string = smarty_mb_str_replace($search, $replace, $string, $c); + $count += $c; + } + } elseif (is_array($search)) { + if (!is_array($replace)) { + foreach ($search as &$string) { + $subject = smarty_mb_str_replace($string, $replace, $subject, $c); + $count += $c; + } + } else { + $n = max(count($search), count($replace)); + while ($n--) { + $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c); + $count += $c; + next($search); + next($replace); + } + } + } else { + $mb_reg_charset = mb_regex_encoding(); + // Check if mbstring regex is using UTF-8 + $reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8"); + if(!$reg_is_unicode) { + // ...and set to UTF-8 if not + mb_regex_encoding("UTF-8"); + } + + // See if charset used by Smarty is matching one used by regex... + $current_charset = mb_regex_encoding(); + $convert_result = (bool)strcasecmp(\Smarty\Smarty::$_CHARSET, $current_charset); + if($convert_result) { + // ...convert to it if not. + $subject = mb_convert_encoding($subject, $current_charset, \Smarty\Smarty::$_CHARSET); + $search = mb_convert_encoding($search, $current_charset, \Smarty\Smarty::$_CHARSET); + $replace = mb_convert_encoding($replace, $current_charset, \Smarty\Smarty::$_CHARSET); + } + + $parts = mb_split(preg_quote($search), $subject ?? "") ?: array(); + // If original regex encoding was not unicode... + if(!$reg_is_unicode) { + // ...restore original regex encoding to avoid breaking the system. + mb_regex_encoding($mb_reg_charset); + } + if($parts === false) { + // This exception is thrown if call to mb_split failed. + // Usually it happens, when $search or $replace are not valid for given mb_regex_encoding(). + // There may be other cases for it to fail, please file an issue if you find a reproducible one. + throw new Exception("Source string is not a valid $current_charset sequence (probably)"); + } + + $count = count($parts) - 1; + $subject = implode($replace, $parts); + // Convert results back to charset used by Smarty, if needed. + if($convert_result) { + $subject = mb_convert_encoding($subject, \Smarty\Smarty::$_CHARSET, $current_charset); + } + } + return $subject; +} +/** + * escape_special_chars common function + * Function: smarty_function_escape_special_chars + * Purpose: used by other smarty functions to escape + * special chars except for already escaped ones + * + * @author Monte Ohrt + * + * @param string $string text that should by escaped + * + * @return string + */ +function smarty_function_escape_special_chars($string) +{ + if (!is_array($string)) { + $string = htmlspecialchars((string) $string, ENT_COMPAT, \Smarty\Smarty::$_CHARSET, false); + } + return $string; +} + +/** + * Smarty wordwrap supporting multibyte + * Name: smarty_mb_wordwrap + * Purpose: Wrap a string to a given number of characters + * + * @link https://php.net/manual/en/function.wordwrap.php for similarity + * + * @param string $str the string to wrap + * @param int $width the width of the output + * @param string $break the character used to break the line + * @param boolean $cut ignored parameter, just for the sake of + * + * @return string wrapped string + * @author Rodney Rehm + */ +function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false) +{ + // break words into tokens using white space as a delimiter + $tokens = preg_split('!(\s)!S' . \Smarty\Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); + $length = 0; + $t = ''; + $_previous = false; + $_space = false; + foreach ($tokens as $_token) { + $token_length = mb_strlen($_token, \Smarty\Smarty::$_CHARSET); + $_tokens = array($_token); + if ($token_length > $width) { + if ($cut) { + $_tokens = preg_split( + '!(.{' . $width . '})!S' . \Smarty\Smarty::$_UTF8_MODIFIER, + $_token, + -1, + PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE + ); + } + } + foreach ($_tokens as $token) { + $_space = !!preg_match('!^\s$!S' . \Smarty\Smarty::$_UTF8_MODIFIER, $token); + $token_length = mb_strlen($token, \Smarty\Smarty::$_CHARSET); + $length += $token_length; + if ($length > $width) { + // remove space before inserted break + if ($_previous) { + $t = mb_substr($t, 0, -1, \Smarty\Smarty::$_CHARSET); + } + if (!$_space) { + // add the break before the token + if (!empty($t)) { + $t .= $break; + } + $length = $token_length; + } + } elseif ($token === "\n") { + // hard break must reset counters + $length = 0; + } + $_previous = $_space; + // add the token + $t .= $token; + } + } + return $t; +} diff --git a/include/srand.php b/include/srand.php deleted file mode 100644 index b0d34ba6f..000000000 --- a/include/srand.php +++ /dev/null @@ -1,149 +0,0 @@ - - * - * Copyright (c) 2012, George Argyros - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL GEORGE ARGYROS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * - * - * The function is providing, at least at the systems tested :), - * $len bytes of entropy under any PHP installation or operating system. - * The execution time should be at most 10-20 ms in any system. - */ -function secure_random_bytes($len = 10) -{ - - /* - * Our primary choice for a cryptographic strong randomness function is - * openssl_random_pseudo_bytes. - */ - $SSLstr = '4'; // http://xkcd.com/221/ - if (function_exists('openssl_random_pseudo_bytes') && - (version_compare(PHP_VERSION, '5.3.4') >= 0 || - substr(PHP_OS, 0, 3) !== 'WIN')) - { - $SSLstr = openssl_random_pseudo_bytes($len, $strong); - if ($strong) { - return $SSLstr; - } - } - - /* - * If mcrypt extension is available then we use it to gather entropy from - * the operating system's PRNG. This is better than reading /dev/urandom - * directly since it avoids reading larger blocks of data than needed. - * Older versions of mcrypt_create_iv may be broken or take too much time - * to finish so we only use this function with PHP 5.3.7 and above. - * @see https://bugs.php.net/bug.php?id=55169 - */ - if (function_exists('mcrypt_create_iv') && - (version_compare(PHP_VERSION, '5.3.7') >= 0 || - substr(PHP_OS, 0, 3) !== 'WIN')) { - $str = mcrypt_create_iv($len, MCRYPT_DEV_URANDOM); - if ($str !== false) { - return $str; - } - } - - - /* - * No build-in crypto randomness function found. We collect any entropy - * available in the PHP core PRNGs along with some filesystem info and memory - * stats. To make this data cryptographically strong we add data either from - * /dev/urandom or if its unavailable, we gather entropy by measuring the - * time needed to compute a number of SHA-1 hashes. - */ - $str = ''; - $bits_per_round = 2; // bits of entropy collected in each clock drift round - $msec_per_round = 400; // expected running time of each round in microseconds - $hash_len = 20; // SHA-1 Hash length - $total = $len; // total bytes of entropy to collect - - $handle = @fopen('/dev/urandom', 'rb'); - if ($handle && function_exists('stream_set_read_buffer')) { - @stream_set_read_buffer($handle, 0); - } - - do - { - $bytes = ($total > $hash_len)? $hash_len : $total; - $total -= $bytes; - - //collect any entropy available from the PHP system and filesystem - $entropy = rand() . uniqid(mt_rand(), true) . $SSLstr; - $entropy .= implode('', @fstat(@fopen( __FILE__, 'r'))); - $entropy .= memory_get_usage() . getmypid(); - $entropy .= serialize($_ENV) . serialize($_SERVER); - if (function_exists('posix_times')) { - $entropy .= serialize(posix_times()); - } - if (function_exists('zend_thread_id')) { - $entropy .= zend_thread_id(); - } - if ($handle) { - $entropy .= @fread($handle, $bytes); - } else { - // Measure the time that the operations will take on average - for ($i = 0; $i < 3; $i++) - { - $c1 = microtime(true); - $var = sha1(mt_rand()); - for ($j = 0; $j < 50; $j++) { - $var = sha1($var); - } - $c2 = microtime(true); - $entropy .= $c1 . $c2; - } - - // Based on the above measurement determine the total rounds - // in order to bound the total running time. - $rounds = (int) ($msec_per_round * 50 / (int) (($c2 - $c1) * 1000000)); - - // Take the additional measurements. On average we can expect - // at least $bits_per_round bits of entropy from each measurement. - $iter = $bytes * (int) (ceil(8 / $bits_per_round)); - for ($i = 0; $i < $iter; $i++) { - $c1 = microtime(); - $var = sha1(mt_rand()); - for ($j = 0; $j < $rounds; $j++) { - $var = sha1($var); - } - $c2 = microtime(); - $entropy .= $c1 . $c2; - } - - } - // We assume sha1 is a deterministic extractor for the $entropy variable. - $str .= sha1($entropy, true); - } while ($len > strlen($str)); - - if ($handle) { - @fclose($handle); - } - return substr($str, 0, $len); -} diff --git a/include/template.class.php b/include/template.class.php index ba1f382bc..187d07bee 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -11,7 +11,7 @@ */ require_once( PHPWG_ROOT_PATH .'include/smarty/libs/Smarty.class.php'); - +use Smarty\Smarty; /** default rank for buttons */ define('BUTTONS_RANK_NEUTRAL', 50); @@ -63,11 +63,12 @@ class Template { global $conf, $lang_info; - SmartyException::$escape = false; + // \Smarty\Exception::$escape = false; $this->scriptLoader = new ScriptLoader; $this->cssLoader = new CssLoader; $this->smarty = new Smarty; + $this->smarty->escape_html = false; $this->smarty->debugging = $conf['debug_template']; if (!$this->smarty->debugging) { @@ -111,6 +112,7 @@ class Template $this->smarty->registerPlugin('modifier', 'file_exists', 'file_exists'); $this->smarty->registerPlugin('modifier', 'constant', 'constant'); $this->smarty->registerPlugin('modifier', 'json_encode', 'json_encode'); + $this->smarty->registerPlugin('modifier', 'json_decode', 'json_decode'); $this->smarty->registerPlugin('modifier', 'htmlspecialchars', 'htmlspecialchars'); $this->smarty->registerPlugin('modifier', 'implode', 'implode'); $this->smarty->registerPlugin('modifier', 'stripslashes', 'stripslashes'); @@ -134,6 +136,20 @@ class Template $this->smarty->registerPlugin('compiler', 'get_combined_css', array($this, 'func_get_combined_css') ); $this->smarty->registerPlugin('block', 'footer_script', array($this, 'block_footer_script') ); $this->smarty->registerFilter('pre', array('Template', 'prefilter_white_space') ); + $this->smarty->registerPlugin('modifier', 'url_is_remote', 'url_is_remote'); + $this->smarty->registerPlugin('modifier', 'is_null', 'is_null'); + $this->smarty->registerPlugin('modifier', 'l10n', 'l10n'); + $this->smarty->registerPlugin('modifier', 'str_replace', 'str_replace'); + $this->smarty->registerPlugin('modifier', 'is_admin', 'is_admin'); + $this->smarty->registerPlugin('modifier', 'is_classic_user', 'is_classic_user'); + $this->smarty->registerPlugin('modifier', 'get_device', 'get_device'); + $this->smarty->registerPlugin('modifier', 'is_file', 'is_file'); + $this->smarty->registerPlugin('modifier', 'strpos', 'strpos'); + $this->smarty->registerPlugin('modifier', 'preg_match', 'preg_match'); + $this->smarty->registerPlugin('modifier', 'get_gallery_home_url', 'get_gallery_home_url'); + $this->smarty->registerPlugin('modifier', 'sizeOf', 'sizeOf'); + $this->smarty->registerPlugin('modifier', 'array_key_exists', 'array_key_exists'); + if ( $conf['compiled_template_cache_language'] ) { $this->smarty->registerFilter('post', array('Template', 'postfilter_language') ); @@ -181,6 +197,7 @@ class Template */ function set_theme($root, $theme, $path, $load_css=true, $load_local_head=true, $colorscheme='dark') { + //we need themeconf before std_pgs to see what themes use_standard_pages $themeconf = $this->load_themeconf($root.'/'.$theme); // We loop over the theme and the parent theme, so if we exclude default, @@ -192,6 +209,7 @@ class Template ) { $theme = 'standard_pages'; + $themeconf = $this->load_themeconf($root.'/'.$theme); } $this->set_template_dir($root.'/'.$theme.'/'.$path); @@ -221,7 +239,7 @@ class Template { $themeconf['colorscheme'] = $colorscheme; } - + $this->smarty->append('themes', $tpl_var); $this->smarty->append('themeconf', $themeconf, true); } @@ -1082,8 +1100,10 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa */ static function prefilter_white_space($source, $smarty) { - $ld = $smarty->left_delimiter; - $rd = $smarty->right_delimiter; + $ld = $smarty->getLeftDelimiter(); + $rd = $smarty->getRightDelimiter(); + // $ld = $smarty->left_delimiter; + // $rd = $smarty->right_delimiter; $ldq = preg_quote($ld, '#'); $rdq = preg_quote($rd, '#'); @@ -2038,10 +2058,15 @@ final class FileCombiner private static function process_css($css, $file, &$header) { $css = self::process_css_rec($css, dirname($file), $header); - if (strpos($file, '.min')===false and version_compare(PHP_VERSION, '5.2.4', '>=')) + if (strpos($file, '.min')===false) { - require_once(PHPWG_ROOT_PATH.'include/cssmin.class.php'); - $css = CssMin::minify($css, array('Variables'=>false)); + require_once(PHPWG_ROOT_PATH.'include/minify/src/Minify.php'); + require_once(PHPWG_ROOT_PATH.'include/minify/src/CSS.php'); + require_once(PHPWG_ROOT_PATH.'include/minify/path-converter/src/ConverterInterface.php'); + require_once(PHPWG_ROOT_PATH.'include/minify/path-converter/src/Converter.php'); + require_once(PHPWG_ROOT_PATH.'include/minify/path-converter/src/NoConverter.php'); + $minifier = new \MatthiasMullie\Minify\CSS($css); + $css = $minifier->minify(); } $css = trigger_change('combined_css_postfilter', $css); return $css; diff --git a/include/totp.class.php b/include/totp.class.php new file mode 100644 index 000000000..cab17128e --- /dev/null +++ b/include/totp.class.php @@ -0,0 +1,115 @@ + 30-second intervals since 1970 at the moment T + return self::generateCodeFromTimestamp($secret, $timestamp); + } + + /** + * Verify TOTP Code + * + * @param string $code Digits 6 TOTP Code + * @param string $secret Encoded base32 secret + * @param int $timestamp timestamp used in second (default: 30) + * @param int $check_interval Number of 30s steps to check before/after current (default: 1) + * @return bool + */ + public static function verifyCode($code, $secret, $timestamp = 30, $check_interval = 1) + { + $timestamp = floor(time() / $timestamp); + + // generate a totp code for 30s intervals + // following or preceding the current one and check it + for ($i=-$check_interval; $i <= $check_interval; $i++) + { + $interval_timestamp = $timestamp + $i; + $generated_code = self::generateCodeFromTimestamp($secret, $interval_timestamp); + if (hash_equals($generated_code, $code)) + { + return true; + } + } + + return false; + } +} diff --git a/include/user.inc.php b/include/user.inc.php index 8bb62e76c..daf835976 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -59,12 +59,12 @@ if (isset($_GET['auth'])) // HTTP_AUTHORIZATION api_key if ( defined('IN_WS') - and isset($_SERVER['HTTP_AUTHORIZATION']) - and !empty($_SERVER['HTTP_AUTHORIZATION']) + and isset($_SERVER['HTTP_X_PIWIGO_API']) + and !empty($_SERVER['HTTP_X_PIWIGO_API']) and isset($_REQUEST['method']) ) { - $auth_header = pwg_db_real_escape_string($_SERVER['HTTP_AUTHORIZATION']) ?? null; + $auth_header = pwg_db_real_escape_string($_SERVER['HTTP_X_PIWIGO_API']) ?? null; if ($auth_header) { @@ -102,10 +102,19 @@ if ( and isset($_POST['password']) ) { - if (!try_log_user($_POST['username'], $_POST['password'], false)) + include_once(PHPWG_ROOT_PATH.'include/ws_init.inc.php'); + include_once(PHPWG_ROOT_PATH.'include/ws_functions/pwg.php'); + + $credentials = array( + 'username' => $_POST['username'], + 'password' => $_POST['password'] + ); + + $login = ws_session_login($credentials, $service); + + if (true !== $login) { - include_once(PHPWG_ROOT_PATH.'include/ws_init.inc.php'); - $service->sendResponse(new PwgError(999, 'Invalid username/password')); + $service->sendResponse($login); exit(); } $_SESSION['connected_with'] = 'pwg.images.uploadAsync'; diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 38513cc6d..816c3cbb3 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -34,6 +34,16 @@ function ws_isInvokeAllowed($res, $methodName, $params) */ function ws_std_image_sql_filter( $params, $tbl_name='' ) { + foreach (array('f_min_date_available', 'f_max_date_available', 'f_min_date_created', 'f_max_date_created') as $datefield) + { + if (isset($params[$datefield]) and !is_valid_mysql_datetime($params[$datefield])) + { + global $service; + $service->sendResponse(new PwgError(WS_ERR_INVALID_PARAM, 'Invalid '.$datefield)); + exit; + } + } + $clauses = array(); if ( is_numeric($params['f_min_rate']) ) { @@ -168,7 +178,7 @@ function ws_std_get_urls($image_row) { $size = $derivative->get_size(); $size != null or $size=array(null,null); - $derivatives_arr[$type] = array('url' => $derivative->get_url(), 'width'=>$size[0], 'height'=>$size[1] ); + $derivatives_arr[$type] = array('url' => $derivative->get_url(), 'width'=>(int)$size[0], 'height'=>(int)$size[1] ); } $ret['derivatives'] = $derivatives_arr;; return $ret; diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php index d1f6e9368..83dae6689 100644 --- a/include/ws_functions/pwg.categories.php +++ b/include/ws_functions/pwg.categories.php @@ -131,6 +131,10 @@ SELECT SQL_CALC_FOUND_ROWS i.* { $image[$k] = $row[$k]; } + + $image['name'] = strip_tags(trigger_change('render_element_name', $image['name'], __FUNCTION__) ?? ''); + $image['comment'] = trigger_change('render_element_description', $image['comment'], __FUNCTION__); + $image = array_merge($image, ws_std_get_urls($row)); $images[] = $image; @@ -369,6 +373,8 @@ SELECT SQL_CALC_FOUND_ROWS } else { + $row['name_raw'] = $row['name']; + $row['name'] = strip_tags( trigger_change( 'render_category_name', @@ -378,13 +384,13 @@ SELECT SQL_CALC_FOUND_ROWS ); } - $row['comment'] = strip_tags( - (string) trigger_change( - 'render_category_description', - $row['comment'], - 'ws_categories_getList' - ) - ); + $row['comment_raw'] = $row['comment']; + + $row['comment'] = (string) trigger_change( + 'render_category_description', + $row['comment'], + 'ws_categories_getList' + ); // management of the album thumbnail -- starts here // @@ -660,6 +666,8 @@ SELECT SQL_CALC_FOUND_ROWS id, name, comment, uppercats, global_rank, dir, statu 'admin.php?page=album-' ); + $row['name_raw'] = $row['name']; + $row['name'] = strip_tags( trigger_change( 'render_category_name', @@ -668,14 +676,13 @@ SELECT SQL_CALC_FOUND_ROWS id, name, comment, uppercats, global_rank, dir, statu ) ); $row['fullname'] = strip_tags($cat_display_name); - isset($row['comment']) ? false : $row['comment'] = ""; - $row['comment'] = strip_tags( - trigger_change( - 'render_category_description', - $row['comment'], - 'ws_categories_getAdminList' - ) - ); + + $row['comment_raw'] = $row['comment']; + $row['comment'] = trigger_change( + 'render_category_description', + $row['comment'] ?? '', + 'ws_categories_getAdminList' + ); if (empty($row['image_order'])) { diff --git a/include/ws_functions/pwg.comments.php b/include/ws_functions/pwg.comments.php new file mode 100644 index 000000000..da880c957 --- /dev/null +++ b/include/ws_functions/pwg.comments.php @@ -0,0 +1,243 @@ += \''. $min .'\''; + } + + if (!empty($params['f_max_date'])) + { + $max = date_format(date_create($params['f_max_date']), "Y-m-d 23:59:59"); + $where_clauses[] = 'date <= \''. $max .'\''; + } + + // reset all filters during search + if (!empty($params['search'])) + { + $where_clauses = array('1=1'); + $where_clauses[] = 'content LIKE "%'. pwg_db_real_escape_string($params['search']) .'%"'; + } + + // summary + $query = ' +SELECT + count(*) as all_comments, + sum(validated = \'true\') as validated, + sum(validated = \'false\') as pending +FROM '.COMMENTS_TABLE.' +WHERE '.implode(' AND ', $where_clauses).' +;'; + + $summary = pwg_db_fetch_assoc(pwg_query($query)); + $total_comments = $summary['all_comments']; + + switch($params['status']) + { + case 'pending': + $where_clauses[] = 'validated = \'false\''; + $total_comments = $summary['pending']; + break; + + case 'validated': + $where_clauses[] = 'validated = \'true\''; + $total_comments = $summary['validated']; + break; + } + + // comments + $query = ' +SELECT + c.id, + c.image_id, + c.date, + c.author, + c.author_id, + '.$conf['user_fields']['username'].' AS username, + ui.status, + c.content, + i.path, + i.representative_ext, + i.file, + i.date_available, + validated, + c.anonymous_id + FROM '.COMMENTS_TABLE.' AS c + INNER JOIN '.IMAGES_TABLE.' AS i + ON i.id = c.image_id + LEFT JOIN '.USERS_TABLE.' AS u + ON u.'.$conf['user_fields']['id'].' = c.author_id + LEFT JOIN '.USER_INFOS_TABLE.' AS ui + ON ui.user_id = c.author_id + WHERE '.implode(' AND ', $where_clauses).' + ORDER BY c.date DESC + LIMIT '.$params['per_page'] * $params['page'].', '.$params['per_page'].' +;'; + $result = pwg_query($query); + + $list = array(); + while ($row = pwg_db_fetch_assoc($result)) + { + + $medium = DerivativeImage::get_one( + IMG_MEDIUM, + array( + 'id' => $row['image_id'], + 'path' => $row['path'], + 'representative_ext' => $row['representative_ext'], + ) + )->get_url(); + + if (empty($row['author_id']) or $row['author_id'] == $conf['guest_id']) + { + $author_name = $row['author']; + } + else + { + $author_name = stripslashes($row['username'] ?? $row['author'] ?? l10n('guest')); + } + + $list[] = array( + 'id' => $row['id'], + 'admin_link' => get_root_url().'admin.php?page=photo-'.$row['image_id'], + 'medium_url' => $medium, + 'file' => $row['file'], + 'image_date_available' => format_date($row['date_available'], array('day_name','day','month','year','time')), + 'author' => trigger_change('render_comment_author', $author_name), + 'author_status' => $conf['webmaster_id'] == $row['author_id'] ? 'main_user' : $row['status'], + 'date' => format_date($row['date'], array('day_name','day','month','year','time')), + 'content' => trigger_change('render_comment_content', $row['content']), + 'raw_content' => $row['content'], + 'is_pending' => ('false' == $row['validated']), + ); + } + + // filters + $query = ' +SELECT + MIN(date) AS started_at, + MAX(date) AS ended_at +FROM '.COMMENTS_TABLE.' +WHERE '.implode(' AND ', $where_clauses).' +;'; + + $dates = pwg_db_fetch_assoc(pwg_query($query)); + + unset($where_clauses['author_id']); + $query = ' +SELECT + author, + author_id, + count(*) as nb_authors +FROM '.COMMENTS_TABLE.' +WHERE '.implode(' AND ', $where_clauses).' +GROUP BY author_id +;'; + + $nb_authors_in = query2array($query); + + return array( + 'summary' => $summary, + 'comments' => $list, + 'filters' => array( + 'nb_authors' => $nb_authors_in, + 'started_at' => $dates['started_at'], + 'ended_at' => $dates['ended_at'] + ), + 'paging' => array( + 'page' => $params['page'], + 'per_page' => $params['per_page'], + 'total_pages' => max(0, ceil($total_comments / $params['per_page']) - 1), + ), + ); +} + +/** + * API method + * Delete comments + * @since 16 + * @param mixed[] $params + * + */ +function ws_userComments_delete($params, &$service) +{ + include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); + + if (get_pwg_token() != $params['pwg_token']) + { + return new PwgError(403, l10n('Invalid security token')); + } + + $params['comment_id'] = array_unique($params['comment_id']); + delete_user_comment($params['comment_id']); + return 'Comment successfully deleted'; +} + +/** + * API method + * Validate comments + * @since 16 + * @param mixed[] $params + * + */ +function ws_userComments_validate($params, &$service) +{ + include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); + + if (get_pwg_token() != $params['pwg_token']) + { + return new PwgError(403, l10n('Invalid security token')); + } + + $params['comment_id'] = array_unique($params['comment_id']); + validate_user_comment($params['comment_id']); + return 'Comment successfully validated'; +} \ No newline at end of file diff --git a/include/ws_functions/pwg.images.php b/include/ws_functions/pwg.images.php index a36584f5a..54a58d4dc 100644 --- a/include/ws_functions/pwg.images.php +++ b/include/ws_functions/pwg.images.php @@ -390,6 +390,22 @@ LIMIT 1 $image_row = pwg_db_fetch_assoc($result); $image_row = array_merge($image_row, ws_std_get_urls($image_row)); + $image_row['name_raw'] = $image_row['name']; + $image_row['name'] = strip_tags( + trigger_change( + 'render_element_name', + $image_row['name'], + __FUNCTION__ + ) ?? '' + ); + + $image_row['comment_raw'] = $image_row['comment']; + $image_row['comment'] = trigger_change( + 'render_element_description', + $image_row['comment'], + __FUNCTION__ + ); + //-------------------------------------------------------- related categories $query = ' SELECT id, name, permalink, uppercats, global_rank, commentable @@ -428,6 +444,15 @@ SELECT id, name, permalink, uppercats, global_rank, commentable ); $row['id']=(int)$row['id']; + + $row['name'] = strip_tags( + trigger_change( + 'render_category_name', + $row['name'], + __FUNCTION__ + ) + ); + $related_categories[] = $row; } usort($related_categories, 'global_rank_compare'); @@ -692,6 +717,9 @@ SELECT * $image[$k] = $row[$k]; } + $image['name'] = strip_tags(trigger_change('render_element_name', $image['name'], __FUNCTION__) ?? ''); + $image['comment'] = trigger_change('render_element_description', $image['comment'], __FUNCTION__); + $image = array_merge($image, ws_std_get_urls($row)); $images[ $image_ids[ $image['id'] ] ] = $image; } @@ -1004,6 +1032,11 @@ function ws_images_filteredSearch_create($params, $service) $search['fields']['ratios'] = $params['ratios']; } + if (isset($params['expert'])) + { + $search['fields']['expert'] = array('string' => $params['expert']); + } + if ($conf['rate'] and isset($params['ratings'])) { $search['fields']['ratings'] = $params['ratings']; @@ -1780,6 +1813,7 @@ function ws_images_upload($params, $service) @fclose($out); @fclose($in); + $add_status = "add"; // Check if file has been uploaded if (!$chunks || $chunk == $chunks - 1) { @@ -1803,22 +1837,44 @@ SELECT * $image = $images[0]; - add_format($filePath, $format_ext, $image['id']); + $add_status = add_format($filePath, $format_ext, $image['id']); return array( 'image_id' => $image['id'], 'src' => DerivativeImage::thumb_url($image), 'square_src' => DerivativeImage::url(ImageStdParams::get_by_type(IMG_SQUARE), $image), 'name' => $image['name'], - ); + 'add_status' => $add_status, + ); + } + + $name = pwg_db_real_escape_string(stripslashes($params['name'])); + $id_image = null; //null by default + + if ($params['update_mode']) + { + $query = ' +SELECT + id + FROM '.IMAGES_TABLE.' AS i + INNER JOIN '.IMAGE_CATEGORY_TABLE.' as ic ON ic.image_id = i.id + WHERE i.file = \''.$name.'\' + AND ic.category_id = '.$params['category'][0].' +;'; + $images = query2array($query); + if ($images != null) + { + $id_image = $images[0]['id']; //take the id of the already existing image to replace it + $add_status = "update"; + } } $image_id = add_uploaded_file( $filePath, - stripslashes($params['name']), // function add_uploaded_file will secure before insert + $name, // function add_uploaded_file will secure before insert $params['category'], $params['level'], - null // image_id = not provided, this is a new photo + $id_image ); $query = ' @@ -1845,6 +1901,7 @@ SELECT COUNT(*) FROM '.LOUNGE_TABLE.' WHERE category_id = '.$params['category'][0].' + AND image_id NOT IN (Select image_id from '.IMAGE_CATEGORY_TABLE.') ;'; list($nb_photos_lounge) = pwg_db_fetch_row(pwg_query($query)); @@ -1859,7 +1916,8 @@ SELECT 'id' => $params['category'][0], 'nb_photos' => $category_infos['nb_photos'] + $nb_photos_lounge, 'label' => $category_name, - ) + ), + 'add_status' => $add_status ); } } @@ -2220,7 +2278,6 @@ SELECT id, file * * @since 13 * @param mixed[] $params - * @option string category_id (optional) * @option string filename_list */ function ws_images_formats_searchImage($params, $service) @@ -2251,6 +2308,19 @@ SELECT return strlen($b) - strlen($a); }); + $query = ' +SELECT + image_id, + ext + FROM '.IMAGE_FORMAT_TABLE.' +;'; + $result = pwg_query($query); + while ($row = pwg_db_fetch_assoc($result)) + { + $format_image_id = $row['image_id']; + @$format_db[ $format_image_id ][] = $row['ext']; + } + $result = array(); foreach ($candidates as $format_external_id => $format_filename) @@ -2275,8 +2345,17 @@ SELECT $result[$format_external_id] = array('status' => 'multiple'); continue; } - - $result[$format_external_id] = array('status' => 'found', 'image_id' => $unique_filenames_db[$candidate_filename_wo_ext][0]); + $img_id = $unique_filenames_db[$candidate_filename_wo_ext][0]; + $mult_form = false; + if (isset($format_db[$img_id])) + { + $format_ext = pathinfo($format_filename, PATHINFO_EXTENSION); + if (array_search($format_ext, $format_db[$img_id])!==false) + { + $mult_form = true; + } + } + $result[$format_external_id] = array('status' => 'found', 'image_id' => $img_id, 'format_exist' => $mult_form); continue; } diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index c1886b189..69e58c117 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -459,12 +459,79 @@ function ws_getActivityList($param, &$service) $output_lines = array(); $current_key = ''; - $page_size = 100000; //We will fetch X lines in database =/= lines displayed due to line concatenation - $page_offset = $param['page']*$page_size; + $page_size = 100; //We will fetch X lines in database =/= lines displayed due to line concatenation + //$page_offset = $param['page']*$page_size; + $page_offset = $param['offset']; + $nb_rows_to_fetch = 10000; $user_ids = array(); - $query = ' + $line_id = 0; + + if (!empty($param['date_min'])) { + $min = date_format(date_create($param['date_min']), "Y-m-d H:i:s"); + $max = date_format(date_create($param['date_max']), "Y-m-d 23:59:59"); + } + + if (!empty($param['date_max'])) { + $max = date_format(date_create($param['date_max']), "Y-m-d 23:59:59"); + } + + $where = 'WHERE object != \'system\''; + + if (isset($param['uid'])) + { + $where .= ' + AND performed_by = '.$param['uid']; + } + + if (isset($param['action'])) + { + $where .= ' + AND action = "'.$param['action'].'"'; + } + + if (isset($param['object'])) + { + $where .= ' + AND object = "'.$param['object'].'"'; + } + + if (!empty($param['date_min'])) + { + $where .= ' + AND occured_on >= "'.$min.'"'; + } + + if (!empty($param['date_max'])) + { + $where .= ' + AND occured_on <= "'.$max.'"'; + } + + if (!empty($param['id'])) + { + $where .= ' + AND object_id = '.$param['id']; + } + + if ('none' == $conf['activity_display_connections']) + { + $where .= ' + AND action NOT IN (\'login\', \'logout\')'; + } + elseif ('admins_only' == $conf['activity_display_connections']) + { + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); + $where .= ' + AND NOT (action IN (\'login\', \'logout\') AND object_id NOT IN ('.implode(',', get_admins()).'))'; + } + + $more_rows_available = true; + + while (count($output_lines) < $page_size and $more_rows_available) + { + $query = ' SELECT activity_id, performed_by, @@ -477,86 +544,83 @@ SELECT details, user_agent FROM '.ACTIVITY_TABLE.' - WHERE object != \'system\''; - - if (isset($param['uid'])) - { - $query.= ' - AND performed_by = '.$param['uid']; - } - elseif ('none' == $conf['activity_display_connections']) - { - $query.= ' - AND action NOT IN (\'login\', \'logout\')'; - } - elseif ('admins_only' == $conf['activity_display_connections']) - { - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - $query.= ' - AND NOT (action IN (\'login\', \'logout\') AND object_id NOT IN ('.implode(',', get_admins()).'))'; - } - - $query.= ' + '.$where.' ORDER BY activity_id DESC - LIMIT '.$page_size.' OFFSET '.$page_offset.' + LIMIT '.$nb_rows_to_fetch.' OFFSET '.$page_offset.' ;'; + $rows = query2array($query); - $line_id = 0; - $result = pwg_query($query); - while ($row = pwg_db_fetch_assoc($result)) - { - $row['details'] = str_replace('`groups`', 'groups', $row['details']); - $row['details'] = str_replace('`rank`', 'rank', $row['details']); - $details = @unserialize($row['details']); - - if (isset($row['user_agent'])) + if (count($rows) < $nb_rows_to_fetch) { - $details['agent'] = $row['user_agent']; + $more_rows_available = false; } - if (isset($details['method'])) + foreach ($rows as $row) { - $detailsType = 'method'; - } - if (isset($details['script'])) - { - $detailsType = 'script'; - } - - $line_key = $row['session_idx'].'~'.$row['object'].'~'.$row['action'].'~'; // idx~photo~add - - if ($line_key === $current_key) - { - // I increment the counter of the previous line - $output_lines[count($output_lines)-1]['counter']++; - $output_lines[count($output_lines)-1]['object_id'][] = $row['object_id']; - } - else - { - list($date, $hour) = explode(' ', $row['occured_on']); - // New line - $output_lines[] = array( - 'id' => $line_id, - 'object' => $row['object'], - 'object_id' => array($row['object_id']), - 'action' => $row['action'], - 'ip_address' => $row['ip_address'], - 'date' => format_date($date), - 'hour' => $hour, - 'user_id' => $row['performed_by'], - 'detailsType' => $detailsType, - 'details' => $details, - 'counter' => 1, - ); - - $user_ids[ $row['performed_by'] ] = 1; - if ('user' == $row['object']) + if (count($output_lines) < $page_size) { - $user_ids[ $row['object_id'] ] = 1; - } + $page_offset++; - $current_key = $line_key; - $line_id++; + $line_key = $row['session_idx'].'~'.$row['object'].'~'.$row['action'].'~'; // idx~photo~add + + if ($line_key === $current_key) + { + // I increment the counter of the previous line + $output_lines[count($output_lines)-1]['counter']++; + $output_lines[count($output_lines)-1]['object_id'][] = $row['object_id']; + } + else + { + $row['details'] = str_replace('`groups`', 'groups', $row['details']); + $row['details'] = str_replace('`rank`', 'rank', $row['details']); + $details = @unserialize($row['details']); + + if (isset($row['user_agent'])) + { + $details['agent'] = $row['user_agent']; + } + + if (isset($details['method'])) + { + $detailsType = 'method'; + } + + if (isset($details['script'])) + { + $detailsType = 'script'; + } + + list($date, $hour) = explode(' ', $row['occured_on']); + // New line + $output_lines[] = array( + 'id' => $line_id, + 'object' => $row['object'], + 'object_id' => array($row['object_id']), + 'action' => $row['action'], + 'ip_address' => $row['ip_address'], + 'date' => format_date($date), + 'hour' => $hour, + 'user_id' => $row['performed_by'], + 'detailsType' => $detailsType, + 'details' => $details, + 'counter' => 1, + ); + + $user_ids[ $row['performed_by'] ] = 1; + if ('user' == $row['object']) + { + $user_ids[ $row['object_id'] ] = 1; + } + + $current_key = $line_key; + $line_id++; + } + } + else + { + $more_rows_available = true; + break; + } } } @@ -596,27 +660,11 @@ SELECT } } - if (isset($param['uid'])) { - $query = ' - SELECT - count(*) - FROM '.ACTIVITY_TABLE.' - WHERE performed_by = '.$param['uid'].' - ;'; - } else { - $query = ' - SELECT - count(*) - FROM '.ACTIVITY_TABLE.' - ;'; - } - - $result = (pwg_db_fetch_row(pwg_query($query))[0])/$page_size; - return array( 'result_lines' => $output_lines, - 'max_page' => floor($result), - 'params' => $param, + 'page_offset' => $page_offset, + 'end_page' => !$more_rows_available, + 'params' => $param ); } diff --git a/include/ws_functions/pwg.tags.php b/include/ws_functions/pwg.tags.php index 294103f9e..877c4ba30 100644 --- a/include/ws_functions/pwg.tags.php +++ b/include/ws_functions/pwg.tags.php @@ -160,6 +160,10 @@ SELECT * { $image[$k] = $row[$k]; } + + $image['name'] = strip_tags(trigger_change('render_element_name', $image['name'], __FUNCTION__)); + $image['comment'] = trigger_change('render_element_description', $image['comment'], __FUNCTION__); + $image = array_merge( $image, ws_std_get_urls($row) ); $image_tag_ids = ($params['tag_mode_and']) ? $tag_ids : $image_tag_map[$image['id']]; @@ -341,7 +345,11 @@ SELECT WHERE id = '.$tag_id.' ;'; - return query2array($query)[0]; + $tag = query2array($query)[0]; + $tag['raw_name'] = $tag['name']; + $tag['name'] = trigger_change('render_tag_name', $tag['raw_name'], $tag); + $tag['alt_names'] = trigger_change('get_tag_alt_names', array(), $tag['raw_name']); + return $tag; } @@ -500,6 +508,7 @@ SELECT image_id include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); + trigger_notify('merge_tags', $params['destination_tag_id'], $merge_tag); delete_tags($merge_tag); $image_in_merged = array_merge($image_in_dest, $image_to_add); diff --git a/index.php b/index.php index 94ef67140..a2ab1f9ac 100644 --- a/index.php +++ b/index.php @@ -92,6 +92,10 @@ else } $template->assign('U_CANONICAL', $canonical_url); +// Standard Pages +// Some themes will want to use standard pages so this will let them know +$template->assign('use_standard_pages', conf_get_param('use_standard_pages', false)); + //-------------------------------------------------------------- page title $title = $page['title']; $template_title = $page['section_title']; @@ -189,11 +193,50 @@ if ( empty($page['is_external']) ) if (isset($page['body_data']['tag_ids'])) { + //get tags for related tags "button", with the possibility to combine them + $tags = get_common_tags( + $page['items'], + $conf['menubar_tag_cloud_items_number'], + $page['tag_ids'] + ); + + $tags = add_level_to_tags($tags); + + $related_tags = array(); + + foreach ($tags as $tag) + { + $related_tags[] = array_merge( + $tag, + array( + 'U_ADD' => make_index_url( + array( + 'tags' => array_merge( + $page['tags'], + array($tag) + ) + ) + ), + 'URL' => make_index_url( array( 'tags' => array($tag) ) + ), + ) + ); + } + + //We sort the array here because we want them sorted by counter and not alphabetically like before. + usort($related_tags, function($a, $b) { + return $b['counter'] <=> $a['counter']; + }); + + + include_once(PHPWG_ROOT_PATH.'include/selected_tags.inc.php'); + $template->assign( array( 'SEARCH_IN_SET_BUTTON' => $conf['index_search_in_set_button'], 'SEARCH_IN_SET_ACTION' => $conf['index_search_in_set_action'], 'SEARCH_IN_SET_URL' => get_root_url().'search.php?tag_id='.implode(',', $page['body_data']['tag_ids']), + 'COMBINABLE_TAGS' => $related_tags, ) ); } @@ -360,6 +403,31 @@ if ( empty($page['is_external']) ) $template->assign('U_SLIDESHOW', $page['cat_slideshow_url']); } } + + //We want all pages that display thumbnails, except on the tags page + //Fill related tags action + if(!empty($page['items']) and 'tags' != $page['body_data']['section']) + { + $selection = array_slice( $page['items'], $page['start'], $page['nb_image_page'] ); + $tags = add_level_to_tags( get_common_tags($selection, $conf['content_tag_cloud_items_number']) ); + $related_tags = array(); + foreach ($tags as $tag) + { + $related_tags[] = + array_merge( $tag, + array( + 'URL' => make_index_url( array( 'tags' => array($tag) ) ), + ) + ); + } + + $template->assign( + array( + 'RELATED_TAGS_ACTION' => !empty($related_tags) ? true : false, + 'RELATED_TAGS' => $related_tags, + ) + ); + } } //------------------------------------------------------------ end diff --git a/install.php b/install.php index 738cd03c0..e4b029040 100644 --- a/install.php +++ b/install.php @@ -483,6 +483,7 @@ else // cache requires $logger which is not instanciated $user = build_user(1, false); log_user($user['id'], false); + $_SESSION['connected_with'] = 'pwg_ui'; $user['preferences']['show_whats_new_'.get_branch_from_version(PHPWG_VERSION)] = false; diff --git a/install/db/177-database.php b/install/db/177-database.php index 259c901f2..921d59108 100644 --- a/install/db/177-database.php +++ b/install/db/177-database.php @@ -11,54 +11,25 @@ if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); } -global $conf; +$upgrade_description = 'Add 3XL and 4XL sizes (disabled by default)'; + load_conf_from_db(); -$upgrade_description = 'Add 3XL and 4XL sizes'; - -//Get predefined image sizes -$derivatives = unserialize($conf['derivatives']); - //get default sizes from derivative_std_params $default_sizes = ImageStdParams::get_default_sizes(); -//Get 3XL and 4XL from default values -$default_derivative_3XL = $default_sizes['3xlarge']; -$default_derivative_4XL = $default_sizes['4xlarge']; +// set new derivatives to add +$new_derivatives = array(IMG_3XLARGE, IMG_4XLARGE); -//We need to make sure that a user hasn't redefined the XXL size bigger than the default 3XL -//Get xxl size -$xxl = $derivatives['d']['xxlarge']; -$xxl_height = $xxl->sizing->ideal_size[0]; -$xxl_width = $xxl->sizing->ideal_size[1]; +// get current disabled derivative_std_params +$disabled_derivatives = safe_unserialize(ImageStdParams::get_disabled_type_map()); -//get 3xl size -$triple_xl_height = $default_sizes['3xlarge']->sizing->ideal_size[0]; -$triple_xl_width = $default_sizes['3xlarge']->sizing->ideal_size[1]; +// get the new derivative_std_params and merge with current disabled derivative_std_params +$new_disabled_derivatives = array_intersect_key($default_sizes, array_flip($new_derivatives)); +$disabled = array_merge($disabled_derivatives, $new_disabled_derivatives); -//Get 4xl size -$quad_xl_height = $default_sizes['3xlarge']->sizing->ideal_size[0]; -$quad_xl_width = $default_sizes['3xlarge']->sizing->ideal_size[1]; - -//Set 3XL and 4xl size to be bigger than XXL if needed -if ($triple_xl_height < $xxl_height or $triple_xl_width < $xxl_width) -{ - $new_3xl_height = ceil($xxl_height*1.5); - $new_3xl_width = ceil($xxl_width*1.5); - - $default_sizes['3xlarge']->sizing->ideal_size[0] = $new_3xl_height; - $default_sizes['3xlarge']->sizing->ideal_size[1] = $new_3xl_width; - - $default_sizes['4xlarge']->sizing->ideal_size[0] = ceil($new_3xl_width*1.5); - $default_sizes['4xlarge']->sizing->ideal_size[1] = ceil($new_3xl_width*1.5); -} - -//Add new 3xl and 4xl to derivatives sizes config -$derivatives['d'][IMG_3XLARGE] = $default_sizes['3xlarge']; -$derivatives['d'][IMG_4XLARGE] = $default_sizes['4xlarge']; - -// Save derivative new settings -ImageStdParams::set_and_save($derivatives['d']); +// set and set new derivative_std_params in disabled list +ImageStdParams::set_and_save_disabled($disabled); echo "\n".$upgrade_description."\n"; ?> \ No newline at end of file diff --git a/install/db/178-database.php b/install/db/178-database.php new file mode 100644 index 000000000..ef8365f7f --- /dev/null +++ b/install/db/178-database.php @@ -0,0 +1,22 @@ + diff --git a/install/db/179-database.php b/install/db/179-database.php new file mode 100644 index 000000000..bb9eb8407 --- /dev/null +++ b/install/db/179-database.php @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/install/db/180-database.php b/install/db/180-database.php new file mode 100644 index 000000000..f1c37be18 --- /dev/null +++ b/install/db/180-database.php @@ -0,0 +1,22 @@ + diff --git a/install/db/181-database.php b/install/db/181-database.php new file mode 100644 index 000000000..f0b2d9bd8 --- /dev/null +++ b/install/db/181-database.php @@ -0,0 +1,33 @@ + diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql index ca47a8420..7c824b975 100644 --- a/install/piwigo_structure-mysql.sql +++ b/install/piwigo_structure-mysql.sql @@ -410,10 +410,16 @@ DROP TABLE IF EXISTS `piwigo_user_auth_keys`; CREATE TABLE `piwigo_user_auth_keys` ( `auth_key_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `auth_key` varchar(255) NOT NULL, + `apikey_secret` VARCHAR(255) DEFAULT NULL, `user_id` mediumint(8) unsigned NOT NULL, `created_on` datetime NOT NULL, `duration` int(11) unsigned DEFAULT NULL, `expired_on` datetime NOT NULL, + `apikey_name` VARCHAR(100) DEFAULT NULL, + `key_type` VARCHAR(40) DEFAULT NULL, + `revoked_on` datetime DEFAULT NULL, + `last_used_on` datetime DEFAULT NULL, + `last_notified_on` datetime DEFAULT NULL, PRIMARY KEY (`auth_key_id`) ) ENGINE=MyISAM; diff --git a/install/upgrade_14.0.0.php b/install/upgrade_14.0.0.php index ed4539977..ad3fdb7b1 100644 --- a/install/upgrade_14.0.0.php +++ b/install/upgrade_14.0.0.php @@ -107,5 +107,5 @@ echo ''; ob_end_clean(); // TODO now we upgrade from 15.0.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_15.0.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_15.0.0.php'); ?> diff --git a/install/upgrade_15.0.0.php b/install/upgrade_15.0.0.php new file mode 100644 index 000000000..14fee01b8 --- /dev/null +++ b/install/upgrade_15.0.0.php @@ -0,0 +1,111 @@ += 175) // TODO change on each release (first task to run) + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 15.0.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release + ) + ); +} + +if (!empty($inserts)) +{ + mass_inserts( + '`'.UPGRADE_TABLE.'`', + array_keys($inserts[0]), + $inserts + ); +} + +// +-----------------------------------------------------------------------+ +// | Perform upgrades | +// +-----------------------------------------------------------------------+ + +ob_start(); +echo '
    ';
+
+for ($upgrade_id = 175; $upgrade_id <= 181; $upgrade_id++) // TODO change on each release
+{
+  if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
+  {
+    continue;
+  }
+
+  // maybe the upgrade task has already been applied in a previous and
+  // incomplete upgrade
+  if (in_array($upgrade_id, $applied))
+  {
+    continue;
+  }
+  
+  unset($upgrade_description);
+
+  echo "\n\n";
+  echo '=== upgrade '.$upgrade_id."\n";
+
+  // include & execute upgrade script. Each upgrade script must contain
+  // $upgrade_description variable which describe briefly what the upgrade
+  // script does.
+  $up_start = get_moment();
+  include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
+
+  // notify upgrade (TODO change on each release)
+  $query = '
+INSERT INTO `'.PREFIX_TABLE.'upgrade`
+  (id, applied, description)
+  VALUES
+  (\''.$upgrade_id.'\', NOW(), \'[migration from 15.0.0 to '.PHPWG_VERSION.', '.get_elapsed_time($up_start, get_moment()).'] '.$upgrade_description.'\')
+;';
+  pwg_query($query);
+}
+
+echo '
    '; +ob_end_clean(); + +// TODO now we upgrade from 16.0.0 +// include_once(PHPWG_ROOT_PATH.'install/upgrade_16.0.0.php'); +?> diff --git a/language/af_ZA/admin.lang.php b/language/af_ZA/admin.lang.php index 41e4ca9aa..a090282fa 100644 --- a/language/af_ZA/admin.lang.php +++ b/language/af_ZA/admin.lang.php @@ -348,7 +348,7 @@ $lang['user "%s" added'] = 'gebruiker "%s" bygevoeg'; $lang['user_status_admin'] = 'Administrateur'; $lang['user_status_generic'] = 'Generies'; $lang['user_status_guest'] = 'Gas'; -$lang['user_status_normal'] = 'Gebruiker'; + $lang['user_status_webmaster'] = 'Webmeester'; $lang['width must be a number superior to'] = 'wydte moet \'n getal groter wees as'; $lang['wrong filename'] = 'verkeerde lêernaam'; diff --git a/language/af_ZA/common.lang.php b/language/af_ZA/common.lang.php index b749bd1c6..a39a93e2a 100644 --- a/language/af_ZA/common.lang.php +++ b/language/af_ZA/common.lang.php @@ -187,7 +187,7 @@ $lang['created after %s (%s)'] = "geskep na %s (%s)"; $lang['created before %s (%s)'] = "geskep voor %s (%s)"; $lang['created between %s (%s) and %s (%s)'] = "geskep tussen %s (%s) en %s (%s)"; $lang['created on %s'] = "geskep op %s"; -$lang['Customize'] = "Verander na smaak"; + $lang['Your Gallery Customization'] = "Verander U gallery na smaak"; $lang['day'][0] = "Sondag"; $lang['day'][1] = "Maandag"; @@ -216,7 +216,7 @@ $lang['Hello'] = "Hallo"; $lang['available for administrators only'] = "slegs vir administrateur beskikbaar"; $lang['display this album'] = "vertoon hierdie album"; $lang['display last user comments'] = "vertoon die laaste gebruiker se kommentaar"; -$lang['customize the appareance of the gallery'] = "Verander die voorkoms van die gallery"; + $lang['search'] = "soek"; $lang['Home'] = "Tuis"; $lang['in this album'] = "in hierdie album"; diff --git a/language/ar_EG/common.lang.php b/language/ar_EG/common.lang.php index ca58ee9f6..ecc0653be 100644 --- a/language/ar_EG/common.lang.php +++ b/language/ar_EG/common.lang.php @@ -252,7 +252,7 @@ $lang['Date posted, new → old'] = 'قديم → تاريخ النشر، $lang['Date created, old → new'] = 'حديث → تاريخ الأنشاء، قديم'; $lang['Date created, new → old'] = 'قديم → تاريخ الأنشاء، جديد'; $lang['Date'] = 'تاريخ'; -$lang['Customize'] = 'تعديل'; + $lang['Current password is wrong'] = 'كلمة المرور الحالية خاطئة'; $lang['Creation date'] = 'تاريخ الإنشاء'; $lang['Created on'] = 'تم إنشاؤها فى'; @@ -373,7 +373,7 @@ $lang['included'] = 'مضمونة'; $lang['large'] = 'L - كبير'; $lang['last %d days'] = 'ايام %d آخر'; $lang['created on %s'] = '%s تم إنشاؤها فى'; -$lang['customize the appareance of the gallery'] = 'تعديل مظهر المعرض'; + $lang['day']['0'] = 'الأحد'; $lang['day']['1'] = 'الاثنين'; $lang['day']['2'] = 'الثلاثاء'; diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php index 7624bee1e..3923df1c1 100644 --- a/language/ar_SA/admin.lang.php +++ b/language/ar_SA/admin.lang.php @@ -360,7 +360,7 @@ $lang['User status'] = 'حالة المستخدم'; $lang['user_status_admin'] = 'مدير عام'; $lang['user_status_generic'] = 'عام'; $lang['user_status_guest'] = 'ضيف محترم'; -$lang['user_status_normal'] = 'مستخدم'; + $lang['user_status_webmaster'] = 'مسؤول الموقع'; $lang['Virtual album'] = 'ألبوم افتراضي'; $lang['Waiting'] = 'تحت الانتظار'; diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php index 7e7840892..528e92cd8 100644 --- a/language/ar_SA/common.lang.php +++ b/language/ar_SA/common.lang.php @@ -142,7 +142,7 @@ $lang['created after %s (%s)'] = 'انشأ قبل %s (%s)'; $lang['created before %s (%s)'] = 'اُنشأ بعد %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'اُنشأ بين %s (%s) و %s (%s)'; $lang['created on %s'] = 'تاريخ الإنشاء %s'; -$lang['Customize'] = 'تخصيص'; + $lang['Your Gallery Customization'] = 'تخصيص المعرض '; $lang['day'][0] = 'الاحد'; $lang['day'][1] = 'الاثنين'; @@ -170,7 +170,7 @@ $lang['Hello'] = 'مرحبا'; $lang['available for administrators only'] = 'متاح للأدارين فقط'; $lang['display this album'] = 'عرض جميع صور هذا الألبوم'; $lang['display last user comments'] = 'شاهد آخر التعليقات'; -$lang['customize the appareance of the gallery'] = 'تخصيص معلوماتك الشخصية'; + $lang['search'] = 'بحث'; $lang['Home'] = 'الرئيسية'; $lang['Identification'] = 'إدارة المستخدمين'; diff --git a/language/bg_BG/admin.lang.php b/language/bg_BG/admin.lang.php index bcc1151a9..e215bcc40 100644 --- a/language/bg_BG/admin.lang.php +++ b/language/bg_BG/admin.lang.php @@ -224,7 +224,7 @@ $lang['bottom right corner'] = 'долен десен ъгъл'; $lang['top left corner'] = 'горен ляв ъгъл'; $lang['top right corner'] = 'горен десен ъгъл'; $lang['user_status_guest'] = 'Гост'; -$lang['user_status_normal'] = 'Потребител'; + $lang['user_status_webmaster'] = 'Уебмастър'; $lang['%s must be to set to false in your local/config/config.inc.php file'] = '%s трябва да се зададе като "false" във файл local/config/config.inc.php'; $lang['%s photos can not be regenerated'] = '%s снимки не могат да бъдат регенерирани'; @@ -596,7 +596,6 @@ $lang['between %.2f and %.2f'] = 'между %.2f и %.2f'; $lang['between %d and %d pixels'] = 'между %d и %d пиксела'; $lang['delete this site and all its attached elements'] = 'изтрийте този сайт с цялата информация свързана с него'; $lang['dissociate from group'] = 'разасоциирай от групата'; -$lang['first photo added on %s'] = 'първа снимка добавена на %s'; $lang['group "%s" added'] = 'група "%s" е добавена'; $lang['group "%s" deleted'] = 'група "%s" е изтрита'; $lang['group "%s" updated'] = 'група "%s" е обновена'; @@ -631,7 +630,6 @@ $lang['Forbid this theme to users'] = 'Забрани тази тема за п $lang['Get Support on Piwigo Forum'] = 'Получете помощ от форума на Piwigo '; $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Дайте права (chmod 777) на директория "%s" в основата на инсталацията'; $lang['Go to %s or %s for more informations'] = 'Отидете на %s или %s за повече информация'; -$lang['Dump Database'] = 'Дъмп на базата данни'; $lang['Extensions Update'] = 'Актуализация на разширения'; $lang['Failed to write file to disk'] = 'Записът на файла е неуспешен'; $lang['I decide to update anyway'] = 'Решавам да направя ъпгрейд все пак'; @@ -688,7 +686,6 @@ $lang['Manage authorizations for selected albums'] = 'Управление на $lang['Manage'] = 'Управление'; $lang['Make this theme available to users'] = 'Направи тази тема достъпна за потребителите'; $lang['Make this language available to users'] = 'Направи този език достъпен за потребителите'; -$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Включва данни от историята (Внимание: паметта на сървъра може да бъде надвишена)'; $lang['Last send'] = 'Последно изпратено'; $lang['Mail sent to %s [%s].'] = 'Имейлът е изпратен до %s [%s].'; $lang['Maintenance'] = 'Поддръжка'; @@ -839,7 +836,6 @@ $lang['Select recipients'] = 'Избор на получатели'; $lang['Send an information email to group members'] = 'Изпратете имейл с информация до членовете на групата'; $lang['Select the destination tag'] = 'Изберете етикета приемник'; $lang['Predefined filter'] = 'Предварително зададен филтър'; -$lang['Unable to dump database.'] = 'Не може да се направи дъмп на базата данни'; $lang['Type here the name of the new group'] = 'Въведете името на новата група тук'; $lang['This theme was not designed to be directly activated'] = 'Тази тема не е създадена за директно активиране'; $lang['This group will be set to default'] = 'Тази група ще се използва по подразбиране'; @@ -991,9 +987,436 @@ $lang['delete album and the %d orphan photos'] = 'изтриване на алб $lang['delete only album, not photos'] = 'изтриване на албум, без снимките'; $lang['orphans to delete'] = 'без албум за изтриване'; $lang['Storage used'] = 'Използвано място'; -$lang['First photo added'] = 'Първа снимка добавена'; $lang['Delete album "%s".'] = 'Изтриване на албум "%s".'; $lang['Confirm deletion'] = 'Потвърдете изтриването'; $lang['Dashboard'] = 'Табло'; $lang['Select tags'] = 'Избор на етикети'; $lang['checksum'] = 'контролно число'; +$lang[' (copy)'] = 'копирай'; +$lang['Piwigo core'] = 'Piwigo ядро (основна система)'; +$lang['Tile View'] = 'Плочков изглед'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'В момента има %d снимки в лаунджа (буфер за качване)'; +$lang['This albums is already in related categories list'] = 'Този албум вече е в списъка на свързани албуми'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Този потребител трябва първо да бъде определен като уебмастър, преди да може да бъде повишен до основен потребител'; +$lang['Upload Formats'] = 'Формати за качване'; +$lang['Use standard Piwigo template for common pages.'] = 'Използвай стандартния шаблон на Piwigo за общите страници.'; +$lang['User "%s" dissociated from this group'] = 'Потребител „%s“ бе отделен от тази група'; +$lang['User associated'] = 'Потребителят е свързан'; +$lang['Users not logged in will have these settings applied, these settings are used by default for new users'] = 'На потребителите, които не са влезли, ще се прилагат тези настройки; те се използват по подразбиране и за нови потребители'; +$lang['Visit'] = 'Посещение'; +$lang['Visit history'] = 'История на посещенията'; +$lang['Visited'] = 'Посетено'; +$lang['We have found %d duplicate paths. Details provided by plugin Check Uploads'] = 'Намерихме %d дублиращи се пътища. Подробности са предоставени от приставката Check Uploads'; +$lang['Webmaster status required'] = 'Изисква се статус уебмастър'; +$lang['What\'s new in version %s'] = 'Какво ново има във версия %s?'; +$lang['When enabled, a common template is used for the login, registration and forgotten password pages, regardless of the theme. Some themes might use these templates even if you uncheck this option'] = 'При активиране се използва общ шаблон за страниците за вход, регистрация и забравена парола, независимо от темата. Някои теми може да използват тези шаблони, дори ако махнете отметката от тази опция'; +$lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'При възстановяване на тази приставка тя ще бъде върната към първоначалните ѝ настройки и свързаните данни ще бъдат нулирани'; +$lang['With no checksum'] = 'Без контролна сума'; +$lang['Picture to associate formats with'] = 'Изображение, с което да се асоциират форматите'; +$lang['On %d rating(s)'] = 'На %d оценка(и)'; +$lang['This plugin has no recent update'] = 'Този плъгин няма скорошна актуализация'; +$lang['This plugin have been updated recently'] = 'Този плъгин е обновен наскоро'; +$lang['This plugin have no update since 3 years ! It may be outdated'] = 'Този плъгин няма актуализации от 3 години! Възможно е да е остарял.'; +$lang['This plugin is incompatible with your version'] = 'Този плъгин е несъвместим с версията ви'; +$lang['This plugin was updated less than 6 months ago'] = 'Този плъгин е обновен преди по-малко от 6 месеца'; +$lang['Username successfully modified'] = 'Името на потребителя е променено успешно'; +$lang['Welcome to %s'] = 'Добре дошли в %s'; +$lang['Welcome!'] = 'Добре дошли!'; +$lang['Who can see ?'] = 'Кой може да вижда?'; +$lang['You have %s1 orphan : %s2'] = 'Имате %s1 празни: %s2'; +$lang['checksums to add'] = 'сума за добавяне'; +$lang['never calculated'] = 'никога не е калкулирано'; +$lang['right now'] = 'точно сега'; +$lang['since the beginning'] = 'от началото'; +$lang['to'] = 'до'; +$lang['was succesfully deleted'] = 'беше услешно изтрит/а'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'На път сте да направите %s главен потребител, вместо %s, искате ли да продължите?'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Нямате права да сменяте главния потребител, попитайте администратора.'; +$lang['You can now change the main user from %s to %s.'] = 'Вече можете са смените главния потребител от %s на %s.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Не може да копирате паролата, ако връзката ви към този сайт не е сигурна.'; +$lang['You don\'t have access to this photo'] = 'Нямате достъп до това изображение'; +$lang['You have %d orphan tags %s'] = 'Имате %d празни етикети %s'; +$lang['You have %s inactive plugins'] = 'Имате %s неактивни плъгини'; +$lang['image(s) contains unsaved changes'] = 'има незапомнени промени в изображението/ията'; +$lang['in administration'] = 'в администрация'; +$lang['in gallery'] = 'в галерия'; +$lang['level of confidentiality'] = 'ниво на поверителност'; +$lang['months ago'] = 'месеца назад'; +$lang['move'] = 'премести'; +$lang['no photo'] = 'няма изображение'; +$lang['or'] = 'или'; +$lang['Yes, I am sure'] = 'Да, сигурен съм'; +$lang['Yes, delete'] = 'Да, изтрий'; +$lang['Yes, let\'s proceed'] = 'Да, нека продължим'; +$lang['Yes, rename'] = 'Да, пренаименовай'; +$lang['You have unsaved changes'] = 'Имате незапаметени промени'; +$lang['Your selection'] = 'Вашата селекция'; +$lang['action successfully performed.'] = 'действието е завършено успешно'; +$lang['add'] = 'добави'; +$lang['and %d more'] = 'и още %d'; +$lang['and %s others'] = 'и %s други'; +$lang['between %d and %d'] = 'между %d и %d'; +$lang['between %s and %s'] = 'между %s и %s'; +$lang['calculated'] = 'изчислено'; +$lang['deletion'] = 'изтриване'; +$lang['edit'] = 'редактирай'; +$lang['login'] = 'Вход'; +$lang['logout'] = 'Изход'; +$lang['Are you sure you want to delete the plugin "%s"?'] = 'Сигурни и сте, че искате да изтриете този плъгин "%s"?'; +$lang['To be sure, please rewrite the word “%s” below'] = 'За да сте сигурни, моля препишете думата “%s” по-долу'; +$lang['To set your password, visit the following address:'] = 'За да зададете парола, последвайте този линк:'; +$lang['Try now !'] = 'Опитай сега!'; +$lang['Understood, do not show again'] = 'Разбрах, не показвай повече'; +$lang['Unlock it'] = 'Отключи'; +$lang['Unlocked album'] = 'Отключи албума'; +$lang['Unset as group for new users'] = 'Премахни като група за нови потребители'; +$lang['Update'] = 'Обнови'; +$lang['User updated'] = 'Потребителя е обновен'; +$lang['Version %s'] = 'Версия "%s"?'; +$lang['Videos'] = 'Видеа'; +$lang['Showing %s users out of %s'] = 'Показва %s потребители от %s'; +$lang['Storage'] = 'Памет'; +$lang['This photo no longer exists'] = 'Тази снимка не съществува вече'; +$lang['This picture is physically linked to this album, you can\'t dissociate them'] = ' +'; +$lang['Synchronization in progress'] = 'Синхронизацията е в ход'; +$lang['System Activities'] = 'Системни дейности'; +$lang['Tag "%s" created'] = 'Етикетът „%s“ е създаден'; +$lang['Tag "%s" succesfully deleted'] = 'Етикетът „%s“ е успешно изтрит'; +$lang['Tag "%s1" renamed in "%s2"'] = 'Етикетът „%s1“ е преименуван на „%s2“'; +$lang['Tag Manager'] = 'Управление на етикети'; +$lang['Tag name'] = 'Име на етикет'; +$lang['Tag(s) \{%s1\} succesfully merged into "%s2"'] = 'Етикет(и) {%s1} са успешно обединени в „%s2“'; +$lang['Tags \{%s\} succesfully deleted'] = 'Етикет(и) {%s} са успешно изтрити'; +$lang['The %d tags on this page are selected'] = '%d етикета на тази страница са избрани'; +$lang['The best is to have them made automatically on a regular basis.'] = 'Най-добре е да се извършват автоматично и редовно.'; +$lang['The comment has been validated.'] = 'Коментарът е одобрен.'; +$lang['The comments have been validated.'] = 'Коментарите са одобрени.'; +$lang['The original picture will be detected with the filename (without extension).'] = 'Оригиналната снимка ще бъде открита по името на файла (без разширение).'; +$lang['The other tags will be removed'] = 'Останалите етикети ще бъдат премахнати'; +$lang['The passwords do not match'] = 'Паролите не съвпадат'; +$lang['Theme'] = 'Тема'; +$lang['There is multiple image in the database with the following names : %s.'] = 'Има няколко снимки в база данните със следните имена: %s.'; +$lang['This album is currently locked, visible only to administrators.'] = 'Този албум в момента в заключен и видим само за администратори.'; +$lang['This is already the default theme'] = 'Това вече е темата по подразбиране'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'Линкът е валиден за %s. След този период, ще трябва да поискате нов линк. +'; +$lang['This photo is an orphan'] = 'Тазни снимка не е включена в албум'; +$lang['Save'] = 'Запази'; +$lang['Save all photos'] = 'Запази всички снимки'; +$lang['Search albums'] = 'Търси албуми'; +$lang['Search tips'] = 'Съвети за търсене'; +$lang['Select'] = 'Избери'; +$lang['Select all %d tags'] = 'Избери всички %d етикета'; +$lang['Select an album... or type it!'] = 'Избери албум... или го въведи!'; +$lang['Select groups or type them'] = 'Избери групи или ги въведи'; +$lang['Select or create an album'] = 'Избери или създай албум'; +$lang['Selected user'] = 'Избран потребител'; +$lang['Selection mode'] = 'Режим на избор'; +$lang['Sep'] = 'Септ.'; +$lang['Set as default'] = 'Задай по подразбиране'; +$lang['Set as group for new users'] = 'Задай като група за нови потребители'; +$lang['Set as main user'] = 'Задай като главен потребител'; +$lang['Show'] = 'Покажи'; +$lang['Show beta test plugins'] = 'Покажи плъгини в бета тест'; +$lang['Show inactive plugins'] = 'Покажи неактивни плъгини'; +$lang['Show plugins compatible with previous version of Piwigo'] = 'Покажи плъгини, съвместими с предишна версия на Piwigo'; +$lang['Show sub-albums'] = 'Покажи подалбумите'; +$lang['Shrink'] = 'Намали'; +$lang['Some checksums are missing.'] = 'Липсват някои контролни суми.'; +$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'Някои снимки липсват във файловата система. Подробности са налични чрез плъгина Check Uploads.'; +$lang['Synchronization'] = 'Синхронизация'; +$lang['Piwigo is also on mobile.'] = 'Piwigo е достъпен и за мобилни устройства.'; +$lang['Piwigo requires an album to add photos.'] = 'За добавяне на снимки в Piwigo е необходим албум.'; +$lang['Place first'] = 'Постави първи'; +$lang['Place last'] = 'Постави последен'; +$lang['Please complete all fields'] = 'Моля, попълнете всички полета.'; +$lang['Please upgrade your PHP version before any update.'] = 'Моля, обновете версията на PHP преди да извършите актуализация.'; +$lang['Plugin "%s" deleted!'] = 'Плъгинът „%s“ е изтрит!'; +$lang['Plugin "%s" has been activated!'] = 'Плъгинът „%s“ беше активиран!'; +$lang['Portraits'] = 'Портрети'; +$lang['Posted %s'] = 'Публикувано %s'; +$lang['Promote mobile app on mobile devices'] = 'Популяризирай мобилното приложение на мобилни устройства'; +$lang['Properties of abums'] = 'Свойства на албуми'; +$lang['Purge Actions'] = 'Изчисти действията'; +$lang['Purge Cache'] = 'Изчисти кеша'; +$lang['Put at the root'] = 'Постави в основната директория'; +$lang['Rating greater than'] = 'Рейтинг по-голям от'; +$lang['Read the release note'] = 'Прочетете бележките към версията'; +$lang['Refresh thumbnail'] = 'Опресни миниатюрата'; +$lang['Registered'] = 'Регистриран'; +$lang['Remove thumbnail'] = 'Премахни миниатюрата'; +$lang['Rename "%s"'] = 'Преименувай „%s“'; +$lang['Requires PHP %s'] = 'Изисква PHP %s'; +$lang['Resend password link'] = 'Изпрати повторно линка за парола'; +$lang['Restored'] = 'Възстановено'; +$lang['Review'] = 'Преглед'; +$lang['Root'] = 'Основна директория'; +$lang['Name field must not be empty'] = 'Полето за име не може да бъде празно'; +$lang['Name is already taken'] = 'Името вече е заето'; +$lang['New user added'] = 'Добавен е нов потребител'; +$lang['No access to administration, can see private content with appropriate permissions.'] = 'Няма достъп до администраторския панел, но може да вижда частно съдържание при съответните права.'; +$lang['No albums found'] = 'Не са открити албуми'; +$lang['No comments selected, no actions possible.'] = 'Не са избрани коментари, не могат да се извършват действия.'; +$lang['No format for this picture'] = 'Няма формат за тази снимка'; +$lang['No picture found with the following name : %s.'] = 'Не е намерена снимка с това име: %s. +'; +$lang['No plugin activated'] = 'Няма активни плъгини.'; +$lang['No plugins found'] = 'Не са намерени плъгини.'; +$lang['No research in progress'] = 'Не се извършва проучване в момента'; +$lang['No search in progress'] = 'Не се извършва търсене в момента'; +$lang['No tag found'] = 'Не е намерен етикет.'; +$lang['No, I have changed my mind'] = 'Не, промених желанието си'; +$lang['Nov'] = 'Нов'; +$lang['Object'] = 'Обект'; +$lang['Oct'] = 'Окт'; +$lang['Ok, got it!'] = 'Разбрах!'; +$lang['Only admins in a specific group'] = 'Само администратори в определена група'; +$lang['Open in gallery'] = 'Отвори в галерията'; +$lang['Other'] = 'Други'; +$lang['Page Visited'] = 'Посетена страница'; +$lang['Page Visited in %s'] = 'Посетена страница в %s'; +$lang['Pagination has changed and needs to be reloaded !'] = 'Начинът на страниране е променен и трябва да се презареди!'; +$lang['Password copied'] = 'Паролата е копирана'; +$lang['Photos per page'] = 'Снимки на страница'; +$lang['Hide sub-albums'] = 'Скрий подалбумите'; +$lang['If a photo in this album has the same filename, update the file without changing the photo\'s properties'] = 'Ако снимка в този албум има същото име, актуализирай файла без да променяш свойствата на снимката.'; +$lang['If anything bad happens during the update, you would be able to restore a backup.'] = 'Ако нещо се обърка по време на обновяването, ще можете да възстановите резервно копие.'; +$lang['Image'] = 'Изображение'; +$lang['Install Piwigo on mobile'] = 'Инсталирай Piwigo на мобилно устройство'; +$lang['Installed on %s, %s'] = 'Инсталирано на %s, %s'; +$lang['Jan'] = 'Ян'; +$lang['Jul'] = 'Юли'; +$lang['Jun'] = 'Юни'; +$lang['Keep them'] = 'Запази ги'; +$lang['Language'] = 'Език'; +$lang['Last revision date is newer than'] = 'Датата на последната ревизия е по-нова от'; +$lang['Last visit'] = 'Последно посещение'; +$lang['Latest Piwigo news'] = 'Последни новини за Piwigo'; +$lang['Line View'] = 'Изглед по редове'; +$lang['Locked album'] = 'Заключен албум'; +$lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Заключените албуми са изключени за поддръжка. Само администратори могат да ги виждат в галерията.'; +$lang['Main user'] = 'Главен потребител'; +$lang['Manage album photos'] = 'Управлявай снимките в албума'; +$lang['Manage sub-albums'] = 'Управлявай подалбумите'; +$lang['Manage users'] = 'Управлявай потребители'; +$lang['Manage users with user manager'] = 'Управлявай потребителите чрез мениджъра на потребители'; +$lang['Mar'] = 'Март'; +$lang['May'] = 'Май'; +$lang['Memories'] = 'Спомени'; +$lang['Merge'] = 'Обедини'; +$lang['Metadata sync complete'] = 'Синхронизирането на метаданни е завършено'; +$lang['Modified'] = 'Променено'; +$lang['More information'] = 'Повече информация'; +$lang['Download all activities'] = 'Изтегли всички дейности '; +$lang['Downloaded'] = 'Изтеглено '; +$lang['Drag and drop to reorder albums'] = 'Изтеглете и пуснете, за да пренаредите албумите '; +$lang['During upload, if Piwigo detects the photo already exists, associate the existing photo to the destination album, without duplicating file'] = 'Ако при качване, Piwigo открие, че снимката вече съществува, ще я свърже с целевия албум без да създава дубликат на файла. '; +$lang['Edit'] = 'Редактирай '; +$lang['Edit guest user'] = 'Редактирай гост потребител '; +$lang['Edit photo #%s'] = 'Редактирай снимка №%s '; +$lang['Edited on %s'] = 'Редактирано на %s '; +$lang['Email'] = 'Имейл '; +$lang['Email Adress'] = 'Имейл адрес '; +$lang['Empty lounge'] = 'Изпразни зоната за качване '; +$lang['Equivalent to deactivation. The user is still in the list, but can no longer log in.'] = 'Еквивалентно на деактивация. Потребителят остава в списъка, но вече не може да влиза. '; +$lang['Error when trying to detect formats'] = 'Грешка при опит за засичане на формати '; +$lang['Expand'] = 'Разгъни '; +$lang['Extensions'] = 'Разширения '; +$lang['Feb'] = 'Фебр.'; +$lang['File type: %s'] = 'Тип файл: %s '; +$lang['Filters'] = 'Филтри '; +$lang['First choose an album, then add your files'] = 'Първо изберете албум, после добавете вашите файлове '; +$lang['Formats'] = 'Формати '; +$lang['Generate random password'] = 'Генерирай произволна парола'; +$lang['Global Gallery Actions'] = 'Глобални действия за галерията'; +$lang['Group "%s" succesfully deleted'] = 'Групата „%s“ беше успешно изтрита'; +$lang['Group added'] = 'Групата е добавена'; +$lang['Group renamed'] = 'Името на групата е променено'; +$lang['Group(s) \{%s1\} succesfully merged into "%s2"'] = 'Групите {%s1} бяха успешно обединени в „%s2“'; +$lang['Groups \{%s\} succesfully deleted'] = 'Групите {%s} бяха успешно изтрити'; +$lang['Has access to administration. Can only manage content: photos/albums/users/tags/groups.'] = 'Има достъп до администраторския панел. Може да управлява само съдържанието: снимки, албуми, потребители, етикети и групи.'; +$lang['Has access to all administration functionnalities. Can manage both configuration and content.'] = 'Има достъп до всички административни функции. Може да управлява както настройките, така и съдържанието.'; +$lang['Create a root album'] = 'Създай основен албум '; +$lang['Create a sub-album of "%s"'] = 'Създай подалбум на „%s“ '; +$lang['Create and select'] = 'Създай и избери '; +$lang['Create your first album'] = 'Създай първия си албум '; +$lang['Created'] = 'Създаден '; +$lang['Created on %s'] = 'Създаден на %s '; +$lang['Creation mode'] = 'Режим на създаване '; +$lang['Current Version'] = 'Текуща версия '; +$lang['Currently running version %s'] = 'Изпълнявана версия %s '; +$lang['Deactivated'] = 'Деактивирано '; +$lang['Dec'] = 'Дек '; +$lang['Delete %s format ?'] = 'Да се изтрие ли форматът %s? '; +$lang['Delete album'] = 'Изтрий албум '; +$lang['Delete orphan tags ?'] = 'Да се изтрият ли празните етикети? '; +$lang['Delete tag "%s"?'] = 'Да се изтрие ли етикетът „%s“? '; +$lang['Delete tags \{%s\}?'] = 'Да се изтрият ли етикетите \{%s}? '; +$lang['Delete them'] = 'Изтрий ги '; +$lang['Delete these sizes'] = 'Изтрий тези размери '; +$lang['Delete user'] = 'Изтрий потребител '; +$lang['Deletion in progress'] = 'Изтриването е в ход '; +$lang['Details'] = 'Подробности '; +$lang['Detect and avoid duplicates during upload'] = 'Засичай и избягвай дубликати при качване '; +$lang['Disallow comments for sub-albums'] = 'Забрани коментари за подалбуми '; +$lang['Discover'] = 'Открий '; +$lang['Display'] = 'Покажи'; +$lang['Display album date period'] = 'Показвай периода, свързан с всеки албум, напр. „от 12 до 15 юли 2018 г.“ '; +$lang['Display category date'] = 'Показвай датата на категорията '; +$lang['Displays a banner to install or open the official Piwigo app'] = 'Показва банер за инсталиране или отваряне на официалното приложение Piwigo '; +$lang['Dissociate user from this group'] = 'Премахни потребителя от тази група '; +$lang['Associate User'] = 'Свържи потребител'; +$lang['At least 2 selected tags are needed to merge'] = 'Необходими са поне 2 избрани етикета, за да бъдат обединени. '; +$lang['Aug'] = 'Авг'; +$lang['Authorize comments'] = 'Разреши коментари'; +$lang['Auto-update'] = 'Автоматично обновяване'; +$lang['Average last 12 months'] = 'Средно за последните 12 месеца'; +$lang['Cache'] = 'Кеш'; +$lang['Cache size'] = 'Размер на кеша'; +$lang['Can be shared by several individuals without conflict (they cannot change the password).'] = 'Може да бъде споделян от няколко потребители без конфликт (те не могат да променят паролата).'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Не може да бъде изпратен имейл на този потребител, защото няма зададен имейл адрес. '; +$lang['Certification higher or equal to'] = 'Сертификация по-висока или равна на '; +$lang['Change Password'] = 'Смени парола '; +$lang['Changes saved'] = 'Промените са запазени '; +$lang['Changing the main user'] = 'Промяна на главния потребител '; +$lang['Choose which tag to merge these tags into'] = 'Избери в кой етикет да се обединят тези етикети '; +$lang['Clear Selection'] = 'Изчисти избора '; +$lang['Close'] = 'Затвори '; +$lang['Comments allowed for sub-albums'] = 'Разрешени са коментари за подалбуми '; +$lang['Comments disallowed for sub-albums'] = 'Забранени са коментари за подалбуми '; +$lang['Compact View'] = 'Компактен изглед '; +$lang['Compare mode'] = 'Режим на сравнение '; +$lang['Compute %d missing checksums'] = 'Изчисли липсващите %d контролни суми '; +$lang['Copied link'] = 'Копиран линк '; +$lang['Copy password'] = 'Копирай парола '; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Копирайте връзката по'; +$lang['Copy the password link'] = 'Копирай връзката за парола '; +$lang['Core'] = 'Ядро '; +$lang['Create a first album'] = 'Създай първи албум '; +$lang['Create a new album at root'] = 'Създай нов албум като основен'; +$lang['Allow comments for sub-albums'] = 'Разреши коментари за подалбуми '; +$lang['Always have a backup of your database and files.'] = 'Винаги правете резервно копие на базата данни и файловете си.'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'Изпратена е връзка за активиране, валидна за %s, на „%s“. Ако не бъде получена, може да се генерира нова, като редактирате потребителя и управлявате паролата му.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'Създадена е връзка за активиране, валидна за %s, но не можа да бъде изпратена. Можете да копирате връзката по'; +$lang['An error has occured'] = 'Възникна грешка'; +$lang['Apply an automatic order to root albums'] = 'Приложи автоматично подреждане към основните'; +$lang['Apply to direct sub-albums'] = 'Приложи към непосредствените подалбуми '; +$lang['Apply to root albums'] = 'Приложи към основните албуми '; +$lang['Apply to the whole hierarchy'] = 'Приложи към цялата йерархия '; +$lang['Apr'] = 'Апр'; +$lang['Are you sure you want to delete "%d" comments?'] = 'Сигурни ли сте, че искате да изтриете „%d“ коментара?'; +$lang['Are you sure you want to delete all sizes?'] = 'Сигурни ли сте, че искате да изтриете всички размери?'; +$lang['Are you sure you want to delete comment #%s?'] = 'Сигурни ли сте, че искате да изтриете коментар №%s?'; +$lang['Are you sure you want to delete group "%s"?'] = 'Сигурни ли сте, че искате да изтриете групата „%s“?'; +$lang['Are you sure you want to delete the language "%s"?'] = 'Сигурни ли сте, че искате да изтриете езика „%s“?'; +$lang['Are you sure you want to delete the ratings of the user "%s"?'] = 'Сигурни ли сте, че искате да изтриете оценките на потребителя „%s“?'; +$lang['Are you sure you want to delete the theme "%s"?'] = 'Сигурни ли сте, че искате да изтриете темата „%s“?'; +$lang['Are you sure you want to delete the user "%s"?'] = 'Сигурни ли сте, че искате да изтриете потребителя „%s“?'; +$lang['Are you sure you want to delete this site?'] = 'Сигурни ли сте, че искате да изтриете този сайт?'; +$lang['Are you sure you want to delete this theme?'] = 'Сигурни ли сте, че искате да изтриете тази тема?'; +$lang['Are you sure you want to delete this?'] = 'Сигурни ли сте, че искате да изтриете това?'; +$lang['Are you sure you want to install the plugin "%s"?'] = 'Сигурни ли сте, че искате да инсталирате плъгина „%s“?'; +$lang['Are you sure you want to lock the gallery?'] = 'Сигурни ли сте, че искате да заключите галерията?'; +$lang['Are you sure you want to restore the plugin "%s"?'] = 'Сигурни ли сте, че искате да възстановите плъгина „%s“?'; +$lang['Are you sure you want to restore this plugin?'] = 'Сигурни ли сте, че искате да възстановите този плъгин?'; +$lang['Are you sure you want to restore to default settings?'] = 'Сигурни ли сте, че искате да върнете настройките по подразбиране?'; +$lang['Are you sure you want to uninstall the plugin "%s"?'] = 'Сигурни ли сте, че искате да деинсталирате плъгина „%s“?'; +$lang['Are you sure you want to unlock the gallery?'] = 'Сигурни ли сте, че искате да отключите галерията?'; +$lang['Are you sure you want to update all extensions?'] = 'Сигурни ли сте, че искате да обновите всички разширения?'; +$lang['%d+ albums found, try to refine the search'] = 'намерени са %d+ албума, опитайте да прецизирате търсенето'; +$lang['%d albums found'] = 'намерени са %d албума'; +$lang['%d filtered user'] = 'филтриран е %d потребител'; +$lang['%d filtered users'] = 'филтрирани са %d потребители'; +$lang['%d tag found'] = 'намерен е %d етикет'; +$lang['%d tag selected'] = 'избран е %d етикет'; +$lang['%d tags found'] = 'намерени са %d етикета'; +$lang['1 album found'] = 'намерен е 1 албум'; +$lang['A photo library administrator has created the following account for you:'] = 'Администратор на фотогалерията е създал следния акаунт за вас:: +'; +$lang['Activate button "%s"'] = 'Активирайте бутон "%s"'; +$lang['Activate create mode to create and select an album'] = 'Активирай режим за създаване и избор на албум '; +$lang['Activated'] = 'Активирано '; +$lang['Activated plugin list'] = 'Активни плъгини'; +$lang['Activity'] = 'Активност '; +$lang['Activity peak in the last weeks'] = 'Пик на активността през последните седмици '; +$lang['Activity time from'] = 'Време на активност от '; +$lang['Add Album'] = 'Добави албум '; +$lang['Add New Plugin'] = 'Добави нов плъгин '; +$lang['Add User'] = 'Добави потребител '; +$lang['Add a new user'] = 'Добави нов потребител '; +$lang['Add a sub-album to “%s”'] = 'Добави подалбум към „%s“ '; +$lang['Add another set of formats'] = 'Добави друг набор от формати '; +$lang['Add as filter'] = 'Добави като филтър '; +$lang['Add formats'] = 'Добави формати '; +$lang['Added on %s'] = 'Добавено на %s '; +$lang['Additional filters'] = 'Допълнителни филтри '; +$lang['Advanced filters'] = 'Разширени филтри '; +$lang['Album name must not be empty'] = 'Името на албума не може да бъде празно '; +$lang['Album search tool'] = 'Инструмент за търсене на албум '; +$lang['All admins'] = 'Всички администратори '; +$lang['%s plugins found'] = 'намерени плъг ини %s'; +$lang['%s status is required to edit parameters.'] = ' необходим е статус %s за редактиране на параметрите'; +$lang['%sGB'] = '%s GB'; +$lang['%sMB'] = '%s MB'; +$lang['... or hide this link'] = '... или скрий този линк'; +$lang['%d photos moved'] = 'качени са %d снимки'; +$lang['%d photos were moved from the upload lounge to their albums'] = '%d снимки бяха преместени от зоната за качване в техните албуми'; +$lang['%d pictures in sub-albums'] = '%d снимки в под-албуми'; +$lang['%d sub-albums'] = '%d под-албуми'; +$lang['%d tag added'] = 'добавен е %d етикет'; +$lang['%d tag deleted'] = 'изтрит е %d етикет'; +$lang['%d tag edited'] = 'редактиран е %d етикет'; +$lang['%d tag moved'] = 'преместен е %d етикет'; +$lang['%d tags added'] = 'добавени са %d етикета'; +$lang['%d tags deleted'] = 'изтрити са %d етикета'; +$lang['%d tags edited'] = 'редактирани са %d етикета'; +$lang['%d tags moved'] = 'преместени са %d етикета'; +$lang['%d user added'] = 'добавен е %d потребител'; +$lang['%d user edited'] = 'редактиран е %d потребител'; +$lang['%d user logged in'] = '%d потребител влезе'; +$lang['%d user logged out'] = '%d потребител излезе'; +$lang['%d users added'] = 'добавени са %d потребители'; +$lang['%d users edited'] = 'редактирани са %d потребители'; +$lang['%d users logged in'] = '%d потребители влязоха'; +$lang['%d users logged out'] = '%d потребители излязоха'; +$lang['%s GB used'] = 'използвани са %s GB'; +$lang['%s MB'] = '%s MB'; +$lang['%s MB used'] = 'използвани са %s MB'; +$lang['%s file type'] = '%s тип файл'; +$lang['%s is the new main user'] = '%s е нов основен потребител'; +$lang['%s line'] = '%s ред'; +$lang['%s lines'] = '%s редове'; +$lang['%s other tags available..'] = '%s други налични тагове'; +$lang['%s pixels, %.2f MB'] = '%s поксела, %.2f MB'; +$lang['%s plugin found'] = 'намерен плъг ин %s'; +$lang[' (copy %s)'] = '(копирай %s)'; +$lang['%d Activities'] = '%d дейности'; +$lang['%d Activity'] = '%d дейност'; +$lang['%d album added'] = 'добавен е %d албум'; +$lang['%d album deleted'] = 'изтрит е %d албум'; +$lang['%d album edited'] = 'редактиран е %d албум'; +$lang['%d albums added'] = 'добавени са %d албума'; +$lang['%d albums deleted'] = 'изтрити са %d албума'; +$lang['%d albums edited'] = 'редактирани са %d албума'; +$lang['%d checksums were added'] = 'добавени са %d контролни суми'; +$lang['%d files'] = '%d файла'; +$lang['%d formats uploaded for %d photos'] = 'качени са %d формата за %d снимки'; +$lang['%d group added'] = 'добавена е %d група'; +$lang['%d group deleted'] = 'изтрита е %d група'; +$lang['%d group edited'] = 'редактирана е %d група'; +$lang['%d group moved'] = 'преместена е %d група'; +$lang['%d groups added'] = 'добавени са %d групи'; +$lang['%d groups deleted'] = 'изтрити са %d групи'; +$lang['%d groups edited'] = 'редактирани са %d групи'; +$lang['%d groups moved'] = 'преместени са %d групи'; +$lang['%d in whole branch'] = '%d в цялата структура'; +$lang['%d including sub-albums'] = '%d вкл. под-албуми'; +$lang['%d photo added'] = 'добавена е %d снимка'; +$lang['%d photo deleted'] = 'изтрита е %d снимка'; +$lang['%d photo edited'] = 'редактирана е %d снимка'; +$lang['%d photo moved'] = 'преместена е %d снимка'; +$lang['%d photos'] = 'добавени са %d снимки'; +$lang['%d photos added'] = 'изтрити са %d снимки'; +$lang['%d photos deleted'] = 'редактирани са %d снимки'; +$lang['%d photos edited'] = 'преместени са %d снимки'; \ No newline at end of file diff --git a/language/bg_BG/common.lang.php b/language/bg_BG/common.lang.php index b4c0e9cea..c3082259b 100644 --- a/language/bg_BG/common.lang.php +++ b/language/bg_BG/common.lang.php @@ -36,7 +36,6 @@ $lang['%d new users'] = '%d нови потребители'; $lang['About'] = 'За нас'; $lang['All tags'] = 'Всички етикети'; $lang['Any tag'] = 'Всеки етикет'; -$lang['At least one listed rule must be satisfied.'] = 'Най-малко един критерии трябва да бъде изпълнен.'; $lang['Author'] = 'Автор'; $lang['Albums'] = 'Албуми'; $lang['Album'] = 'Албум'; @@ -52,7 +51,6 @@ $lang['Creation date'] = 'Дата на създаване'; $lang['Current password is wrong'] = 'Въведената парола е грешна'; $lang['Dimensions'] = 'Размери'; $lang['Display'] = 'Изглед'; -$lang['Each listed rule must be satisfied.'] = 'Всички критерии от списъка трябва да са изпълнени.'; $lang['Email address'] = 'Имейл адрес'; $lang['Enter your personnal informations'] = 'Въведете вашата лична информация'; $lang['Error sending email'] = 'Грешка при изпращането на имейл'; @@ -163,7 +161,6 @@ $lang['Registration'] = 'Регистрация'; $lang['Related tags'] = 'Свързани етикети'; $lang['Reset'] = 'Изчистване'; $lang['Retrieve password'] = 'Възстанови парола'; -$lang['Search rules'] = 'Критерий за търсене'; $lang['Search tags'] = 'Търси етикети'; $lang['Search'] = 'Търси'; $lang['display available tags'] = 'показване налични етикети'; @@ -185,7 +182,6 @@ $lang['add this photo to your favorites'] = 'добави снимката в л $lang['Administration'] = 'Администрация'; $lang['all'] = 'всички'; $lang['ascending'] = 'възходящ ред'; -$lang['author(s) : %s'] = 'автор(и): %s'; $lang['Expand all albums'] = 'Покажи всички албуми'; $lang['posted after %s (%s)'] = 'добавени след %s (%s)'; $lang['posted before %s (%s)'] = 'добавени преди %s (%s)'; @@ -214,7 +210,7 @@ $lang['created after %s (%s)'] = 'добавени след %s (%s)'; $lang['created before %s (%s)'] = 'добавени преди %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'добавени между %s (%s) и %s (%s)'; $lang['created on %s'] = 'добавени на %s'; -$lang['Customize'] = 'Персонализирай'; + $lang['Your Gallery Customization'] = 'Персонализиране на галерията'; $lang['Default'] = 'По подразбиране'; $lang['delete this photo from your favorites'] = 'изтрий тази снимка от любими'; @@ -236,7 +232,7 @@ $lang['Hello'] = 'Здравей'; $lang['available for administrators only'] = 'само за администратори'; $lang['display this album'] = 'показване на този албум'; $lang['display last user comments'] = 'показване на последните коментари'; -$lang['customize the appareance of the gallery'] = 'персонализиране на външния вид на галерията'; + $lang['search'] = 'търси'; $lang['Home'] = 'Начало'; $lang['in this album'] = 'в този албум'; @@ -298,7 +294,6 @@ $lang['Powered by'] = 'Осъществено от'; $lang['Empty query. No criteria has been entered.'] = 'Празна заявка. Не е въведен критерии.'; $lang['Search results'] = 'Резултати от търсенето'; $lang['Search in sub-albums'] = 'Търсене в под-албуми'; -$lang['searched words : %s'] = 'търсени думи : %s'; $lang['Contact'] = 'Контакт'; $lang['set as album representative'] = 'задай като миниатюра за албума'; $lang['Show number of comments'] = 'Показване броя на коментарите'; @@ -432,4 +427,118 @@ $lang['month']['8'] = 'август'; $lang['month']['9'] = 'септември'; $lang['Your authentication key is no longer valid.'] = 'Вашият ключ да верификация вече не е активен.'; $lang['generate random password'] = 'генериране на произволна парола'; -$lang['Invalid username or password!'] = 'Невалидно име или парола!'; \ No newline at end of file +$lang['Invalid username or password!'] = 'Невалидно име или парола!'; +$lang['You can manage your API keys in your account settings.'] = 'Можете да управлявате вашите API ключове в настройките на вашия акаунта.'; +$lang['%d visits'] = '%d посещения'; +$lang['This will not be displayed again. You must copy it to continue.'] = 'Това няма да се показва отново. Трябва да го копирате, за да продължите.'; +$lang['To continue using the API, please renew your key before it expires.'] = 'За да продължите да използвате API, подновете ключа си преди изтичането му.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'За да управлявате вашите API ключове, влезте с вашето потребителско име/парола.'; +$lang['Unknown time period'] = 'Неизвестен период от време'; +$lang['Validate'] = 'Валидирай'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Когато е активирано, общ шаблон се използва за страниците за вход и регистрация, независимо от темата.'; +$lang['You can try to edit your filters and perform a new search.'] = 'Можете да опитате да редактирате филтрите си и да извършите ново търсене.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Нямате имейл адрес, така че няма да бъдете уведомени, когато вашият API ключ изтича.'; +$lang['Your API key will expire in %d day.'] = 'Вашият API ключ ще изтече след %d ден.'; +$lang['Your API key will expire in %d days.'] = 'Вашият API ключ ще изтече след %d дни.'; +$lang['Your API key will expire soon'] = 'Вашият API ключ ще изтече скоро'; +$lang['Your changes have been applied.'] = 'Промените ви са приложени.'; +$lang['Your password was successfully reset'] = 'Паролата ви беше успешно нулирана'; +$lang['Your password was successfully set'] = 'Паролата ви беше успешно зададена'; +$lang['last 12 months'] = 'Последните 12 месеца'; +$lang['last 24 hours'] = 'последните 24 часа'; +$lang['last 3 months'] = 'Последните 3 месеца'; +$lang['last 30 days'] = 'Последните 30 дни'; +$lang['last 6 months'] = 'Последните 30 дни'; +$lang['last 7 days'] = 'Последните 7 дни'; +$lang['last year'] = 'Миналата година'; +$lang['must not be empty'] = 'не трябва да е празно'; +$lang['rating score %s'] = 'оценка %s'; +$lang['year %d'] = 'година %d'; +$lang['you must choose a date'] = 'трябва да изберете дата'; +$lang['Only the first %d albums are displayed, out of %d.'] = 'Показват се само първите %d албума от общо %d.'; +$lang['Options'] = 'Опции'; +$lang['Pages'] = 'Страници'; +$lang['Password: ********** (no copy by email)'] = 'Парола: ********** (не се копира по имейл)'; +$lang['Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'] = 'Предварително зададени филтри са предложени, но можете да ги добавяте или премахвате чрез бутона "Избери филтри".'; +$lang['Public key copied.'] = 'Публичният ключ е копиран.'; +$lang['Related albums'] = 'Свързани албуми'; +$lang['Return to Sign in'] = 'Върни се на Вход'; +$lang['Return to the gallery'] = 'Върни се в галерията'; +$lang['Revoke'] = 'Отмени'; +$lang['Revoked'] = 'Отменено'; +$lang['Save your secret Key and ID'] = 'Запазете своя таен ключ и ID'; +$lang['Search in :'] = 'Търсене в:'; +$lang['Search in this set'] = 'Търсене в този сет'; +$lang['Secret key copied. Keep it in a safe place.'] = 'Таен ключ е копиран. Запазете го на сигурно място.'; +$lang['Set my password'] = 'Задай моята парола'; +$lang['Set your password below.'] = 'Задайте вашата парола по-долу.'; +$lang['Show expired keys'] = 'Покажи изтекли ключове'; +$lang['Start-Date'] = 'Начална дата'; +$lang['Tags found'] = 'Намерени тагове'; +$lang['Tags listed here match your search by word. Click on one to browse by tag.'] = 'Таговете тук съответстват на вашето търсене по дума. Кликнете на някой, за да разгледате по таг.'; +$lang['The PDF you requested is too large to display on this page.'] = 'PDF файлът, който заявихте, е твърде голям за показване на тази страница.'; +$lang['The api key has been successfully created.'] = 'API ключът е успешно създаден.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'Имейлът %s ще бъде използван за уведомяване, когато вашият API ключ изтича.'; +$lang['The secret key can no longer be displayed.'] = 'Тайният ключ вече не може да се показва.'; +$lang['There are no authors available for the photos currently filtered'] = 'Няма налични автори за филтрираните снимки'; +$lang['There are no creation dates available for the photos currently filtered'] = 'Няма налични дати на създаване за филтрираните снимки'; +$lang['There are no tags available for the photos currently filtered'] = 'Няма налични тагове за филтрираните снимки'; +$lang['This API key was manually revoked on %s'] = 'Този API ключ беше ръчно отменен на %s'; +$lang['Create a new API key to secure your account.'] = 'Създайте нов API ключ за защита на акаунта си.'; +$lang['Create an account'] = 'Създайте нов акаунт'; +$lang['Created at'] = 'Създаден в'; +$lang['Custom date'] = 'Персонализирана дата'; +$lang['Custom dates'] = 'Персонализирани дати'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Наистина ли искате да оттеглите API ключ "%s"?'; +$lang['Don\'t have an account yet ?'] = 'Все още нямате акаунт?'; +$lang['Done'] = 'Готово'; +$lang['Duration'] = 'Продължителност'; +$lang['Edit API Key'] = 'Редактирай API ключ'; +$lang['Empty filters'] = 'Изчисти филтрите'; +$lang['Expert mode'] = 'Експертен режим'; +$lang['Expired'] = 'Изтекъл'; +$lang['Expired on'] = 'Изтекъл на'; +$lang['Expires in'] = 'Изтича след'; +$lang['File type'] = 'Тип файл'; +$lang['Fill in the filters to start a search'] = 'Попълнете филтрите, за да започнете търсене'; +$lang['Filters'] = 'Филтри'; +$lang['Generate API Key'] = 'Генерирай API ключ'; +$lang['Generate key'] = 'Генерирай ключ'; +$lang['Hello %s, enter your new password below.'] = 'Здравей %s, въведете новата си парола по-долу.'; +$lang['Hide expired keys'] = 'Скрий изтеклите ключове'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Невъзможно за автоматично копиране. Моля копирайте ръчно.'; +$lang['Last use'] = 'Последно ползвано'; +$lang['Manage your account'] = 'Управление на акаунта'; +$lang['Never'] = 'Никога'; +$lang['New API Key'] = 'Нов API ключ'; +$lang['No expiration'] = 'Без изтичане'; +$lang['No results are available.'] = 'Няма налични резултати.'; +$lang['Choose filters'] = 'Изберете филтри'; +$lang['Choose how you want to see your gallery'] = 'Изберете как искате да видите галерията'; +$lang['Clear'] = 'Изчисти'; +$lang['Click here to display it'] = 'Кликнете тук за показване'; +$lang['Confirm my new password'] = 'Потвърдете новата си парола'; +$lang['Confirm new password'] = 'Потвърдете новата парола'; +$lang['Create API Keys to secure your acount'] = 'Създайте API ключове за защита на акаунта'; +$lang['3xlarge'] = '3XL – изключително голям'; +$lang['4xlarge'] = '4XL – гигантски'; +$lang['API Key has been successfully edited.'] = 'API ключът е успешно редактиран.'; +$lang['API Key has been successfully revoked.'] = 'API ключът е успешно оттеглен.'; +$lang['API Key name'] = 'Име на API ключ'; +$lang['API Key not found'] = 'API ключът не е намерен'; +$lang['API Keys'] = 'API ключове'; +$lang['Account'] = 'Акаунт'; +$lang['Added by'] = 'Добавено от'; +$lang['Album already selected'] = 'Албумът вече е избран'; +$lang['Album description'] = 'Описание на албума'; +$lang['Album name, 1 → 5 → 10 → 100'] = 'Име на албума, 1 → 5 → 10 → 100'; +$lang['Album name, 100 → 10 → 5 → 1'] = 'Име на албума, 100 → 10 → 5 → '; +$lang['Album title'] = 'Заглавие на албум'; +$lang['Albums found'] = 'Намерени албуми'; +$lang['Albums listed here match your search by word. Click on one to browse by album.'] = 'Албумите, показани тук, съответстват на търсенето ви по дума. Кликнете върху някой, за да разгледате албума.'; +$lang['Already have an account ?'] = 'Вече имате акаунт?'; +$lang['An email has been sent with a link to reset your password'] = 'Изпратен е емейл с линк за нулиране на паролата'; +$lang['An error has occured please got back to Sign in or Register'] = 'Възникна грешка, моля върнете се на Вход или Регистрация'; +$lang['Cancel'] = 'Отказ'; +$lang['Change your password'] = 'Сменете паролата си'; +$lang['Check your inbox'] = 'Проверете си имейла '; \ No newline at end of file diff --git a/language/bg_BG/install.lang.php b/language/bg_BG/install.lang.php index 9ec068104..08f996a06 100644 --- a/language/bg_BG/install.lang.php +++ b/language/bg_BG/install.lang.php @@ -49,4 +49,5 @@ $lang['Creation of config file local/config/database.inc.php failed.'] = 'Съз $lang['It appears your webhost is currently running PHP %s.'] = 'Изглежда вашият уеб хост се изпълнява с PHP %s'; $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo може да се опита да превключите вашата конфигурация към PHP 5.2 като създаде или промени .htaccess файла.'; $lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Обърнете се към вашия хостинг доставчик и вижте как можете да преминете към PHP 5.2.'; -$lang['localhost or other, supplied by your host provider'] = 'localhost или друг, предоставен от вашият хост доставчик'; \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost или друг, предоставен от вашият хост доставчик'; +$lang['PHP version %s required (you are running on PHP %s)'] = 'Необходима е PHP версия %s (в момента сте на PHP %s)'; \ No newline at end of file diff --git a/language/br_FR/admin.lang.php b/language/br_FR/admin.lang.php index c8832ff5f..2cba0c813 100644 --- a/language/br_FR/admin.lang.php +++ b/language/br_FR/admin.lang.php @@ -279,7 +279,7 @@ $lang['Plugins which need upgrade'] = 'Lugantoù da hizivaat'; $lang['Themes which need upgrade'] = 'Temoù o deus ezhomm un hizivadur'; $lang['Unable to check for upgrade.'] = 'Ne oa ket posubl degas an hizivadur'; $lang['user_status_guest'] = 'Ostiziad '; -$lang['user_status_normal'] = 'Implijer'; + $lang['user_status_webmaster'] = 'Mestr-gwiad'; $lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'Diarunusted uc\'hek arnes: %dM piksel (%dx%d piksel).'; $lang['Can\'t download archive.'] = 'Ne oa ket posubl pellgargañ an diell.'; diff --git a/language/br_FR/common.lang.php b/language/br_FR/common.lang.php index 455057914..362669341 100644 --- a/language/br_FR/common.lang.php +++ b/language/br_FR/common.lang.php @@ -112,7 +112,7 @@ $lang['Date posted, new → old'] = 'Deiziad ouzhpennañ, nevez → kozh'; $lang['Date posted, old → new'] = 'Deiziad ouzhpennañ, kozh → nevez'; $lang['Date created, new → old'] = 'Deiziad krouiñ, nevez → kozh'; $lang['Date created, old → new'] = 'Deiziad krouiñ, kozh → nevez'; -$lang['Customize'] = 'Personelaat'; + $lang['Creation date'] = 'Deiziad krouiñ'; $lang['Current password is wrong'] = 'Fazi gant ar ger-tremen a vremañ'; $lang['Created on'] = 'Krouet d\'an'; @@ -151,7 +151,7 @@ $lang['delete all photos from your favorites'] = 'Dilemel an holl luc\'hskeudenn $lang['delete this photo from your favorites'] = 'Dilemel al luc\'hskeudenn-mañ eus ho pennrolloù'; $lang['The gallery is locked for maintenance. Please, come back later.'] = 'Prennet eo ar palier evit trezalc\'h. Deuit en-dro diwezhatoc\'h.'; $lang['Go through the gallery as a visitor'] = 'Dedreuziñ ar palier evel un implijer'; -$lang['customize the appareance of the gallery'] = 'Personelaat neuz ar palier'; + $lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Demat %s, ho palier luc\'hskeudennoù Piwigo a zo goullo !'; $lang['Welcome to your Piwigo photo gallery!'] = 'Degemer mat war ho palier-luc\'hskeudennoù Piwigo !'; $lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'Gwazh RSS a kemenn an darvoudoù ar palier : luc\'hskeudennoù nevez, rummadoù hizivaet, evezhiadennoù nevez an implijerien. Da vezañ implijet gant ul lenner-gwazhioù RSS.'; @@ -453,4 +453,5 @@ $lang['%d visits'] = '%d gweladenn'; $lang['Added by'] = 'Ouzhpennet gant'; $lang['No results are available.'] = 'N\'eus disoc\'h ebet da gaout.'; $lang['Validate'] = 'Kadarnaat'; -$lang['Search in :'] = 'Klask e-barzh:'; \ No newline at end of file +$lang['Search in :'] = 'Klask e-barzh:'; +$lang['Pages'] = 'Pajennoù'; \ No newline at end of file diff --git a/language/ca_ES/admin.lang.php b/language/ca_ES/admin.lang.php index 6e0bb700d..6cf8c8452 100644 --- a/language/ca_ES/admin.lang.php +++ b/language/ca_ES/admin.lang.php @@ -344,7 +344,7 @@ $lang['User status'] = 'Estat de l\'usuari'; $lang['user_status_admin'] = 'Administrador'; $lang['user_status_generic'] = 'Genèric'; $lang['user_status_guest'] = 'Visitant'; -$lang['user_status_normal'] = 'Usuari'; + $lang['user_status_webmaster'] = 'Webmaster'; $lang['Users'] = 'Usuaris'; $lang['Virtual album'] = 'Àlbum virtual'; @@ -878,7 +878,7 @@ $lang['Last send'] = 'Últim enviament'; $lang['group "%s" added'] = 'S\'ha afegit el grup "%s"'; $lang['group "%s" deleted'] = 'S\'ha eliminat el grup "%s"'; $lang['%d day'] = '%d dia'; -$lang['%d days'] = '$d dies'; +$lang['%d days'] = '%d dies'; $lang['%d hour'] = '%d hora'; $lang['%d hours'] = '%d hores'; $lang['%d minute'] = '%d minut'; @@ -1381,4 +1381,47 @@ $lang['You have unsaved changes'] = 'Teniu canvis sense desar'; $lang['between %d and %d'] = 'entre %d i %d'; $lang['image(s) contains unsaved changes'] = 'Una o més imatges contenen canvis sense desar'; $lang['level of confidentiality'] = 'nivell de confidencialitat'; -$lang['was succesfully deleted'] = 's\'ha suprimit amb èxit'; \ No newline at end of file +$lang['was succesfully deleted'] = 's\'ha suprimit amb èxit'; +$lang['%s is the new main user'] = '%s és el nou usuari principal'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'No es pot enviar un correu electrònic a aquest usuari perquè no té cap adreça electrònica'; +$lang['Changing the main user'] = 'Canvi d\'usuari principal'; +$lang['Copied link'] = 'Enllaç copiat'; +$lang['Copy password'] = 'Copia la contrasenya'; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Copieu l\'enllaç següent i envieu-lo a l\'usuari perquè pugui establir-se la contrasenya.'; +$lang['Copy the password link'] = 'Copia l\'enllaç de la contrasenya'; +$lang['Main user'] = 'Usuari principal'; +$lang['Password copied'] = 'Contrasenya copiada'; +$lang['Please complete all fields'] = 'Si us plau, ompliu tots els camps'; +$lang['Resend password link'] = 'Torna a enviar l\'enllaç de la contrasenya'; +$lang['Set as main user'] = 'Estableix com a usuari principal'; +$lang['The passwords do not match'] = 'Les contrasenyes no coincideixen'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Aquest usuari s\'ha de definir com a administrador web abans que es pugui actualitzar a l\'usuari principal'; +$lang['To be sure, please rewrite the word “%s” below'] = 'Per confirmar, torneu a escriure la paraula "%s" a continuació'; +$lang['Username successfully modified'] = 'El nom d\'usuari s\'ha modificat correctament'; +$lang['Yes, let\'s proceed'] = 'Sí, endavant'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Esteu a punt d\'establir %s com a usuari principal en lloc de %s. Voleu continuar?'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'No teniu autorització per canviar l\'usuari principal, demaneu-ho al vostre administrador web'; +$lang['You can now change the main user from %s to %s.'] = 'Ja podeu canviar l\'usuari principal de %s a %s.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'No podeu copiar la contrasenya si la connexió a aquest lloc no és segura.'; +$lang['Ok, got it!'] = 'D\'acord, entesos!'; +$lang['Read the release note'] = 'Llegiu les notes de la versió'; +$lang['What\'s new in version %s'] = 'Quines novetats hi ha a la versió %s?'; +$lang['A photo library administrator has created the following account for you:'] = 'Un administrador de la biblioteca fotogràfica us ha creat el següent compte:'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'S\'ha enviat un enllaç d\'activació vàlid per %s a "%s". Si l\'usuari no rep l\'enllaç, podeu generar i copiar-ne un de nou editant l\'usuari i gestionant la seva contrasenya.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'S\'ha creat un enllaç d\'activació vàlid per a %s però no s\'ha pogut enviar. Podeu copiar l\'enllaç següent i enviar-lo a l\'usuari.'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'L\'enllaç és vàlid per %s. Passat aquest temps, haureu de sol·licitar-ne un de nou.'; +$lang['To set your password, visit the following address:'] = 'Per definir la vostra contrasenya, visiteu l\'adreça següent:'; +$lang['Welcome to %s'] = 'Benvinguts a %s'; +$lang['We have found %d duplicate paths. Details provided by plugin Check Uploads'] = 'Hem trobat %d camins d\'accés duplicats. Els detalls els proporciona el connector Check Uploads (Comprovar Pujades)'; +$lang['%d photos were moved from the upload lounge to their albums'] = 'S\'han mogut %d fotos del vestíbul de pujada als seus àlbums.'; +$lang['Are you sure you want to delete "%d" comments?'] = 'Segur que voleu suprimir "%d" comentaris?'; +$lang['Are you sure you want to delete comment #%s?'] = 'Segur que voleu suprimir el comentari número %s?'; +$lang['Empty lounge'] = 'El vestíbul és buit'; +$lang['If a photo in this album has the same filename, update the file without changing the photo\'s properties'] = 'Si una foto d\'aquest àlbum té el mateix nom de fitxer, actualitza el fitxer sense canviar les propietats de la foto'; +$lang['No comments selected, no actions possible.'] = 'No s\'ha seleccionat cap comentari, no hi ha accions possibles'; +$lang['Save all photos'] = 'Desa totes les fotos'; +$lang['The comment has been validated.'] = 'El comentari s\'ha validat.'; +$lang['The comments have been validated.'] = 'Els comentaris s\'han validat.'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'Actualment hi ha %d fotos al vestíbul (memòria temporal de pujada)'; +$lang['Use standard Piwigo template for common pages.'] = 'Utilitza la plantilla estàndard de Piwigo per a les pàgines comunes.'; +$lang['When enabled, a common template is used for the login, registration and forgotten password pages, regardless of the theme. Some themes might use these templates even if you uncheck this option'] = 'Quan s\'habilita, s\'utilitza una plantilla comú per a les pàgines d\'inici de sessió, de registre i de contrasenya oblidada, independentment del tema. És possible que alguns temes utilitzin aquestes plantilles fins i tot si es desactiva aquesta opció.'; \ No newline at end of file diff --git a/language/ca_ES/common.lang.php b/language/ca_ES/common.lang.php index ae1ad8aa3..ff04b7f2d 100644 --- a/language/ca_ES/common.lang.php +++ b/language/ca_ES/common.lang.php @@ -133,7 +133,7 @@ $lang['created after %s (%s)'] = 'creat després %s (%s)'; $lang['created before %s (%s)'] = 'creat abans %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'creat entre %s (%s) i %s (%s)'; $lang['created on %s'] = 'creada el %s'; -$lang['Customize'] = 'Perfil'; + $lang['Your Gallery Customization'] = 'Personalització de la galeria'; $lang['day'][0] = 'Diumenge'; $lang['day'][1] = 'Dilluns'; @@ -159,7 +159,7 @@ $lang['Hello'] = 'Hola'; $lang['available for administrators only'] = 'disponible només per a administradors'; $lang['display this album'] = 'Visualitza el contingut d\'aquest àlbum'; $lang['display last user comments'] = 'visualitza els últims comentaris dels usuaris'; -$lang['customize the appareance of the gallery'] = 'personalitzar l\'aparença de la galeria'; + $lang['search'] = 'cerca'; $lang['in this album'] = 'en aquest àlbum'; $lang['in %d sub-album'] = 'en %d sub-àlbum'; @@ -449,4 +449,81 @@ $lang['Pages'] = 'Pàgines'; $lang['The PDF you requested is too large to display on this page.'] = 'El PDF que heu sol·licitat és massa gran per mostrar-lo en aquesta pàgina.'; $lang['Click here to display it'] = 'Feu clic aquí per mostrar-lo'; $lang['Custom dates'] = 'Dates personalitzades'; -$lang['last 12 months'] = 'Els darrers 12 mesos'; \ No newline at end of file +$lang['last 12 months'] = 'Els darrers 12 mesos'; +$lang['There are no authors available for the photos currently filtered'] = 'No hi ha autors disponibles per a les fotos filtrades actualment'; +$lang['There are no creation dates available for the photos currently filtered'] = 'No hi ha dates de creació disponibles per a les fotos filtrades actualment'; +$lang['There are no tags available for the photos currently filtered'] = 'No hi ha etiquetes disponibles per a les fotos filtrades actualment'; +$lang['Set your password below.'] = 'Definiu la vostra contrasenya aquí sota.'; +$lang['The api key has been successfully created.'] = 'La clau de l\'API s\'ha creat amb èxit.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'S\'utilitzarà el correu electrònic %s per avisar-vos quan la vostra clau d\'API estigui a punt de caducar.'; +$lang['The secret key can no longer be displayed.'] = 'La clau secreta no es pot tornar a mostrar.'; +$lang['This API key was manually revoked on %s'] = 'Aquesta clau d\'API es va revocar manualment el %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Per continuar utilitzant l\'API, renoveu la clau abans que caduqui.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Per gestionar les vostres claus d\'API, inicieu la sessió amb el vostre usuari i contrasenya.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Quan estigui habilitada, s\'utilitzarà una plantilla comuna per a les pàgines d\'inici de sessió i registre, independentment del tema.'; +$lang['You can manage your API keys in your account settings.'] = 'Podeu gestionar les vostres claus d\'API als paràmetres del compte.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'No teniu adreça de correu electrònic; per tant no us podrem avisar quan la vostra clau d\'API estigui a punt de caducar.'; +$lang['Your API key will expire in %d day.'] = 'La vostra clau d\'API caducarà en %d dia.'; +$lang['Your API key will expire in %d days.'] = 'La vostra clau d\'API caducarà en %d dies.'; +$lang['Your API key will expire soon'] = 'La vostra clau d\'API caducarà aviat'; +$lang['Your changes have been applied.'] = 'S\'han aplicat els canvis.'; +$lang['Your password was successfully reset'] = 'S\'ha restablert amb èxit la vostra contrasenya'; +$lang['Your password was successfully set'] = 'S\'ha establert amb èxit la vostra contrasenya'; +$lang['must not be empty'] = 'no pot estar buida'; +$lang['you must choose a date'] = 'heu de triar una data'; +$lang['3xlarge'] = '3XL - extra gegant'; +$lang['4xlarge'] = '4XL - gegantí'; +$lang['API Key has been successfully edited.'] = 'La clau d\'API s\'ha editat correctament.'; +$lang['API Key has been successfully revoked.'] = 'La clau d\'API s\'ha revocat correctament.'; +$lang['API Key name'] = 'Nom de la clau d\'API'; +$lang['API Key not found'] = 'No s\'ha trobat la clau d\'API'; +$lang['API Keys'] = 'Claus d\'API'; +$lang['Account'] = 'Compte'; +$lang['Already have an account ?'] = 'Ja teniu un compte?'; +$lang['An email has been sent with a link to reset your password'] = 'S\'ha enviat un correu electrònic amb un enllaç per restablir la contrasenya.'; +$lang['An error has occured please got back to Sign in or Register'] = 'S\'ha produït un error. Si us plau, torneu a Iniciar sessió o a Registrar-vos.'; +$lang['Change your password'] = 'Canvieu la contrasenya'; +$lang['Check your inbox'] = 'Reviseu la safata d\'entrada'; +$lang['Choose how you want to see your gallery'] = 'Trieu com voleu veure la galeria'; +$lang['Confirm my new password'] = 'Confirma la meva nova contrasenya'; +$lang['Confirm new password'] = 'Confirmeu la nova contrasenya'; +$lang['Create API Keys to secure your acount'] = 'Creeu claus d\'API per protegir el vostre compte'; +$lang['Create a new API key to secure your account.'] = 'Creeu una nova clau d\'API per protegir el vostre compte.'; +$lang['Create an account'] = 'Crea un compte'; +$lang['Created at'] = 'Creat a'; +$lang['Custom date'] = 'Data personalitzada'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Segur que voleu revocar la clau d\'API "%s"?'; +$lang['Don\'t have an account yet ?'] = 'Encara no teniu un compte?'; +$lang['Done'] = 'Fet'; +$lang['Duration'] = 'Durada'; +$lang['Edit API Key'] = 'Edita la clau d\'API'; +$lang['Expert mode'] = 'Mode expert'; +$lang['Expired'] = 'Caducada'; +$lang['Expired on'] = 'Caducada el'; +$lang['Expires in'] = 'Caduca el'; +$lang['Generate API Key'] = 'Genera la clau d\'API'; +$lang['Generate key'] = 'Genera la clau'; +$lang['Hello %s, enter your new password below.'] = 'Hola, %s, introduïu la vostra nova contrasenya a continuació.'; +$lang['Hide expired keys'] = 'Amaga les claus caducades'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Impossible copiar automàticament. Si us plau, copieu manualment.'; +$lang['Last use'] = 'Darrer ús'; +$lang['Manage your account'] = 'Gestioneu el vostre compte'; +$lang['Never'] = 'Mai'; +$lang['New API Key'] = 'Nova clau d\'API'; +$lang['No expiration'] = 'Sense caducitat'; +$lang['Options'] = 'Opcions'; +$lang['Return to Sign in'] = 'Torneu a Iniciar sessió'; +$lang['Return to the gallery'] = 'Torna a la galeria'; +$lang['Revoke'] = 'Revoca'; +$lang['Revoked'] = 'Revocada'; +$lang['Set my password'] = 'Estableix la meva contrasenya'; +$lang['Show expired keys'] = 'Mostra les claus caducades'; +$lang['An email has been sent with a verification code'] = 'S\'ha enviat un missatge de correu electrònic amb un codi de verificació.'; +$lang['ID copied.'] = 'ID copiat.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Si no rebeu el correu electrònic, poseu-vos en contacte amb el webmaster.'; +$lang['Invalid verification code'] = 'Codi de verificació no vàlid'; +$lang['Save your ID and secret'] = 'Deseu el vostre ID i secret'; +$lang['Secret copied. Keep it in a safe place.'] = 'Secret copiat. Manteniu-lo en lloc segur.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'El secret ja no es mostrarà més. Heu de copiar-lo per continuar.'; +$lang['Verification code'] = 'Codi de verificació'; +$lang['Verify'] = 'Verifica'; \ No newline at end of file diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php index bbacb1516..0e3d07cef 100644 --- a/language/cs_CZ/admin.lang.php +++ b/language/cs_CZ/admin.lang.php @@ -360,7 +360,7 @@ $lang['User status'] = 'Stav uživatele'; $lang['user_status_admin'] = 'Administrátor'; $lang['user_status_generic'] = 'Generic'; $lang['user_status_guest'] = 'Host'; -$lang['user_status_normal'] = 'Uživatel'; + $lang['user_status_webmaster'] = 'Administrátor'; $lang['Virtual album'] = 'Virtuální album'; $lang['Waiting'] = 'Ke schválení'; @@ -1373,4 +1373,48 @@ $lang['Save'] = 'Uložit'; $lang['Select or create an album'] = 'Vyberte nebo vytvořte nové album'; $lang['System Activities'] = 'Systémové aktivity'; $lang['Who can see ?'] = 'Kdo si může zobrazit?'; -$lang['You have unsaved changes'] = 'Máte neuložené změny'; \ No newline at end of file +$lang['You have unsaved changes'] = 'Máte neuložené změny'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Nemůžete kopírovat heslo pokud není přípojení k tomuto webu bezpečné.'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Nemáte oprávnění měnit hlavního uživatele, zeptejte se prosím svého webmastera'; +$lang['You can now change the main user from %s to %s.'] = 'Nyní můžete změnit hlavního uživatele z %s na %s.'; +$lang['%s is the new main user'] = '%s je nový hlavní uživatel'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Tomuto uživateli nelze odeslat e-mail, protože žádný nemá nastaven.'; +$lang['Changing the main user'] = 'Změna hlavního uživatele'; +$lang['Copied link'] = 'Kopírovaný odkaz'; +$lang['Copy password'] = 'Zkopírovat heslo'; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Zkopírujte odkaz níže a pošlete ho uživateli, aby mohlo být nastaveno heslo.'; +$lang['Copy the password link'] = 'Odkaz na zkopírování hesla'; +$lang['Main user'] = 'Hlavní uživatel'; +$lang['Password copied'] = 'Heslo zkopírováno'; +$lang['Please complete all fields'] = 'Vyplňte všechna pole, prosím'; +$lang['Resend password link'] = 'Odkaz na znovu zaslání hesla'; +$lang['Set as main user'] = 'Nastavit jako hlavní uživatel'; +$lang['The passwords do not match'] = 'Heslo se neshoduje'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Tento uživatel musí být nejprve definován jako webmaster, než může být změněn na hlavního uživatele.'; +$lang['To be sure, please rewrite the word “%s” below'] = 'Pro jistotu prosím níže přepište slovo “%s”'; +$lang['Username successfully modified'] = 'Jméno uživatele úspěšně upraveno'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Nastavujete %s jako hlavního uživatele místo %s, přejete si pokračovat?'; +$lang['Yes, let\'s proceed'] = 'Ano, pokračujme.'; +$lang['Ok, got it!'] = 'Hotovo!'; +$lang['Read the release note'] = 'Zobrazit poznámky o verzi'; +$lang['What\'s new in version %s'] = 'Novinky ve verzi %s?'; +$lang['A photo library administrator has created the following account for you:'] = 'Správce fotogalerie pro vás vytvořil následující uživ. účty:'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'Aktivační odkaz pro %s byl odeslán na "%s". Pokud nebude potvrzen lze si vygenerovat nový skrze editaci uživatele a správu jeho hesla.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'Odkaz na aktivaci účtu pro %s byl vytvořen, ale nemohl být odeslán. Zkopírujte nyní ručně tento odkaz níže a zašlete jej tomuto uživateli.'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'Odkaz je validní po dobu %s. Po uplynutí tohoto času je potřeba vygenerovat nový odkaz.'; +$lang['To set your password, visit the following address:'] = 'Pro nastavení hesla klikněte na následující odkaz:'; +$lang['Welcome to %s'] = 'Vítejte na %s'; +$lang['We have found %d duplicate paths. Details provided by plugin Check Uploads'] = 'Nalezli jsme %d duplicitních cest. Detaily posktyuje plugin Kontrola uploadů Check Uploads'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'V současné době je v salonku (vyrovnávací paměti pro nahrávání) %d fotografií.'; +$lang['%d photos were moved from the upload lounge to their albums'] = '%d fotografií bylo přesunuto z nahrávacího salonku do jejich alb.'; +$lang['Empty lounge'] = 'Prázdný salónek'; +$lang['If a photo in this album has the same filename, update the file without changing the photo\'s properties'] = 'Pokud má fotografie v tomto albu stejný název souboru, aktualizuj soubor, aniž by se změnily vlastnosti fotografie.'; +$lang['When enabled, a common template is used for the login, registration and forgotten password pages, regardless of the theme. Some themes might use these templates even if you uncheck this option'] = 'Pokud je tato možnost povolena, použije se společná šablona pro stránky přihlášení, registrace a zapomenutého hesla, bez ohledu na zvolenou šablonu vzhledu. Některé šablony mohou tyto stránky používat i v případě, že tuto volbu vypnete.'; +$lang['No comments selected, no actions possible.'] = 'Nejsou vybrané komentáře, není možné provést akce.'; +$lang['The comments have been validated.'] = 'Komentáře byly schváleny.'; +$lang['Use standard Piwigo template for common pages.'] = 'Použít standardní Piwigo šablonu pro obecné stránky.'; +$lang['The comment has been validated.'] = 'Komentář byl schválen.'; +$lang['Save all photos'] = 'Uložit všechny fotky'; +$lang['Are you sure you want to delete comment #%s?'] = 'Jste si jistí že chcete smazat komentář #%s?'; +$lang['Are you sure you want to delete "%d" comments?'] = 'Opravdu chcete smazat "%d" komentáře?'; +$lang['Admins only'] = 'Pouze administrátoři'; \ No newline at end of file diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php index d29d6b3a4..b20a4eca4 100644 --- a/language/cs_CZ/common.lang.php +++ b/language/cs_CZ/common.lang.php @@ -136,7 +136,7 @@ $lang['created after %s (%s)'] = 'vytvořeno po %s (%s)'; $lang['created before %s (%s)'] = 'vytvořeno před %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'vytvořeno mezi %s (%s) a %s (%s)'; $lang['created on %s'] = 'vytvořeno %s'; -$lang['Customize'] = 'Upravit'; + $lang['Your Gallery Customization'] = 'Přizpůsobit galerii '; $lang['day'][0] = 'Neděle'; $lang['day'][1] = 'Pondělí'; @@ -165,7 +165,7 @@ $lang['Hello'] = 'Přihlášen jako'; $lang['available for administrators only'] = 'Přístupné pouze adminitrátorům'; $lang['display this album'] = 'Zobrazí fotky z tohoto alba'; $lang['display last user comments'] = 'Zobrazit nejnovější komentáře uživatelů'; -$lang['customize the appareance of the gallery'] = 'Přizpůsobit vzhled galerie'; + $lang['search'] = 'Hledat'; $lang['Home'] = 'Úvodní stránka'; $lang['Identification'] = 'Identifikace'; @@ -453,4 +453,81 @@ $lang['Only the first %d albums are displayed, out of %d.'] = 'Zobrazuje se pouz $lang['Pages'] = 'Stránky'; $lang['The PDF you requested is too large to display on this page.'] = 'Požadované PDF je pro zobrazení na této stránce příliš velké.'; $lang['last 12 months'] = 'Posledních 12 měsíců'; -$lang['Custom dates'] = 'Vlastní data'; \ No newline at end of file +$lang['Custom dates'] = 'Vlastní data'; +$lang['There are no authors available for the photos currently filtered'] = 'Pro aktuálně filtrované fotografie nejsou k dispozici žádní autoři'; +$lang['There are no creation dates available for the photos currently filtered'] = 'Pro aktuálně filtrované fotografie nejsou k dispozici žádná data vytvoření'; +$lang['There are no tags available for the photos currently filtered'] = 'Pro aktuálně filtrované fotografie nejsou k dispozici žádné štítky'; +$lang['Set your password below.'] = 'Zadejte heslo níže.'; +$lang['Custom date'] = 'Vlastní datum'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Opravdu chcete zneplatnit "%s" API klíč?'; +$lang['Don\'t have an account yet ?'] = 'Nemáte zatím účet?'; +$lang['Done'] = 'Hotovo'; +$lang['Duration'] = 'Průběh'; +$lang['Edit API Key'] = 'Editace API klíče'; +$lang['Expert mode'] = 'Expert mód'; +$lang['Expired'] = 'Expirován'; +$lang['Expired on'] = 'Platnost expirovala dne'; +$lang['Expires in'] = 'Expiruje v'; +$lang['Generate API Key'] = 'Generuj API Klíč'; +$lang['Generate key'] = 'Generuj klíč'; +$lang['Hello %s, enter your new password below.'] = 'Ahoj %s, zadej nové heslo níže.'; +$lang['Hide expired keys'] = 'Skrýt neplatné klíče'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Nelze kopírovat automaticky. Prosím kopírujte manuálně.'; +$lang['Last use'] = 'Naposledy použito'; +$lang['Manage your account'] = 'Správa účtu'; +$lang['Never'] = 'Nikdy'; +$lang['New API Key'] = 'Nový API klíč'; +$lang['No expiration'] = 'Bez expirace'; +$lang['3xlarge'] = '3XL - extra velký'; +$lang['4xlarge'] = '4XL - gigantický'; +$lang['API Key has been successfully edited.'] = 'API Klíč byl úspěšně editován.'; +$lang['API Key has been successfully revoked.'] = 'API Klíč byl úspěšně revokován.'; +$lang['API Key name'] = 'API název klíče'; +$lang['API Key not found'] = 'API Klíč nebyl nalezen'; +$lang['API Keys'] = 'API Klíče'; +$lang['Account'] = 'Účet'; +$lang['Already have an account ?'] = 'Máte již vytvořený účet ?'; +$lang['An email has been sent with a link to reset your password'] = 'Byla vám zaslána zpráva s odkazem pro obnovu hesla'; +$lang['An error has occured please got back to Sign in or Register'] = 'Nastala chyba prosím jděte zpět na Přihlásit se nebo Registrace'; +$lang['Change your password'] = 'Změna hesla'; +$lang['Check your inbox'] = 'Kontrola doručených'; +$lang['Choose how you want to see your gallery'] = 'Vyberte si, jak chcete vidět vaši galerii'; +$lang['Confirm my new password'] = 'Potvrzení nového hesla'; +$lang['Confirm new password'] = 'Potvrzení nového hesla'; +$lang['Create API Keys to secure your acount'] = 'Vytvořte API klíče pro ochranu vašeho účtu'; +$lang['Create a new API key to secure your account.'] = 'Vytvořte nový API klíč pro ochranu vašeho účtu'; +$lang['Create an account'] = 'Vytvořit účet'; +$lang['Created at'] = 'Vytvořeno v'; +$lang['Your API key will expire in %d day.'] = 'Váš API klíč expiruje za %d dny.'; +$lang['Your API key will expire in %d days.'] = 'Váš API klíč expiruje za %d dnů.'; +$lang['Your API key will expire soon'] = 'Váš API klíč expiruje brzy.'; +$lang['Your changes have been applied.'] = 'Vaše změny byly nastaveny.'; +$lang['Your password was successfully reset'] = 'Vaše heslo bylo úspěšně resetováno'; +$lang['Your password was successfully set'] = 'Vaše heslo bylo úspěšně nastaveno'; +$lang['must not be empty'] = 'musí být zadáno'; +$lang['you must choose a date'] = 'vyberte datum'; +$lang['Options'] = 'Možnosti'; +$lang['Return to Sign in'] = 'Zpět na Přihlásit se'; +$lang['Return to the gallery'] = 'Zpět do galerie'; +$lang['Revoke'] = 'Zneplatnit'; +$lang['Revoked'] = 'Zneplatněn'; +$lang['Set my password'] = 'Nastavit heslo'; +$lang['Show expired keys'] = 'Zobrazit expirovované klíče'; +$lang['The api key has been successfully created.'] = 'Klíč pro API byl úspěšně vytvořen.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'E-mail %s bude použit k vašemu upozornění v čase expirace API klíče.'; +$lang['The secret key can no longer be displayed.'] = 'Tajný klíč nemůže být už znovu zobrazen.'; +$lang['This API key was manually revoked on %s'] = 'Tento API klíč byl manuálně zneplatněn %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Pro pokračování v používání API, prosíme obnovte váš klíč před jeho expirací.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Pro správu API klíčů se prosíme nejprve zalogujte vaším uživatelským jménem a heslem.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Po aktivaci, je použita výchozí šablona nastavení pro přihlášení a registraci, bez ohledu na zvolený vzhled aplikace.'; +$lang['You can manage your API keys in your account settings.'] = 'Můžete spravovat vaše API klíče ve vašem nastavení účtu.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Bez nastavení e-mail adresy vám nemůže být zasíláno upozornění na expirující API klíče.'; +$lang['An email has been sent with a verification code'] = 'Emaily byl odeslán s ověřovacím kódem'; +$lang['ID copied.'] = 'ID zkopírováno.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Pokud jste neobdrželi email, prosíme kontaktujte svého správce.'; +$lang['Invalid verification code'] = 'Chybný ověřovací kód'; +$lang['Save your ID and secret'] = 'Uložit vaše ID a tajný klíč'; +$lang['Secret copied. Keep it in a safe place.'] = 'Tajný klíč zkopírován. Uchovejte ho na bezpečném místě.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Tajný klíč už nebude znovu zobrazen. Abyste mohli pokračovat, musíte si ho zkopírovat.'; +$lang['Verification code'] = 'Ověřovací kód'; +$lang['Verify'] = 'Ověřit'; \ No newline at end of file diff --git a/language/cs_CZ/help_quick_search.lang.php b/language/cs_CZ/help_quick_search.lang.php new file mode 100644 index 000000000..3c990b9ef --- /dev/null +++ b/language/cs_CZ/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Sign in or Register'] = 'En fejl er opstået; gå tilbage til Log på eller Opret'; +$lang['Hello %s, enter your new password below.'] = 'Hej %s, skriv din nye adgangskode herunder.'; +$lang['Return to Sign in'] = 'Tilbage til Log på'; +$lang['Set my password'] = 'Opsæt min adgangskode'; +$lang['Show expired keys'] = 'Vis udløbne nøgler'; +$lang['The api key has been successfully created.'] = 'API-nøglen er oprettet'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'Du vil få besked på mailadresse %s, når din API-nøgle er ved at udløbe.'; +$lang['The secret key can no longer be displayed.'] = 'Den hemmelige nøgle kan ikke længere vises'; +$lang['This API key was manually revoked on %s'] = 'Denne API-nøgle blev manuelt tilbagekaldt den %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'For at fortsætte med at anvende API\'et, skal du forny din nøgle før den udløber.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'For at håndtere dine API-nøgler, skal du logge på med dit brugernavn og adgangskode.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Når aktiveret, vil en fælles skabelon blive anvendt på siderne til login og kontooprettelse, uafhængigt af temaet.'; +$lang['You can manage your API keys in your account settings.'] = 'Du man håndtere API-nøgler i dine kontoindstillinger.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Du har ingen mailadresse, så du vil ikke modtage en besked når din API-nøgle er ved at udløbe.'; +$lang['Your API key will expire in %d day.'] = 'Din API-nøgle udløber om %d dag.'; +$lang['Your API key will expire in %d days.'] = 'Din API-nøgle udløber om %d dage.'; +$lang['Your API key will expire soon'] = 'Din API-nøgæe udløber snart'; +$lang['Your changes have been applied.'] = 'Dine ændringer er gemt.'; +$lang['Your password was successfully reset'] = 'Din adgangskode blev nulstillet'; +$lang['Expires in'] = 'Udløber den'; +$lang['Generate API Key'] = 'Generer API-nøgle'; +$lang['Generate key'] = 'Generer nøgle'; +$lang['Hide expired keys'] = 'Skjul udløbne nøgler'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Ikke muligt at kopiere automatisk. Foretag manuel kopiering.'; +$lang['Last use'] = 'Senest anvendt'; +$lang['Manage your account'] = 'Håndter din konto'; +$lang['Never'] = 'Aldrig'; +$lang['New API Key'] = 'Ny API-nøgle'; +$lang['No expiration'] = 'Intet udløb'; +$lang['Options'] = 'Valgmuligheder'; +$lang['Return to the gallery'] = 'Tilbage til galleri'; +$lang['Revoke'] = 'Tilbagekald'; +$lang['Revoked'] = 'Tilbagekaldt'; +$lang['An email has been sent with a link to reset your password'] = 'En e-mail er sendt med et link til nulstilling af din adgangskode'; +$lang['Change your password'] = 'Ændr din adgangskode'; +$lang['Check your inbox'] = 'Tjek din indbakke'; +$lang['Choose how you want to see your gallery'] = 'Vælg hvordan du vil se galleriet'; +$lang['Confirm my new password'] = 'Bekræft min nye adgangskode'; +$lang['Confirm new password'] = 'Bekræft ny adgangskode'; +$lang['Create API Keys to secure your acount'] = 'Opret API-nøgler for at sikre din konto'; +$lang['Create a new API key to secure your account.'] = 'Opret en ny API-nøgle for at sikre din konto'; +$lang['Create an account'] = 'Opret en konto'; +$lang['Created at'] = 'Oprettet den'; +$lang['Custom date'] = 'Skræddersyet dato'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Vil du virkelig tilbagekalde API-nøglen "%s"?'; +$lang['Don\'t have an account yet ?'] = 'Har du ikke allerede en konto?'; +$lang['Done'] = 'Udført'; +$lang['Duration'] = 'Varighed'; +$lang['Edit API Key'] = 'Rediger API-nøgle'; +$lang['Expert mode'] = 'Eksperttilstand'; +$lang['Expired'] = 'Udløbet'; +$lang['Expired on'] = 'Udløb den'; +$lang['3xlarge'] = '3XL - ekstremt stort'; +$lang['4xlarge'] = '4XK - gigantisk'; +$lang['API Key has been successfully edited.'] = 'API-nøglen blev redigeret'; +$lang['API Key has been successfully revoked.'] = 'API-nøglen blev tilbagekaldt'; +$lang['API Key name'] = 'API-nøgles navn'; +$lang['API Key not found'] = 'API-nøgle ikke fundet'; +$lang['API Keys'] = 'API-nøgler'; +$lang['Account'] = 'Konto'; +$lang['Already have an account ?'] = 'Har du allerede en konto?'; +$lang['An email has been sent with a verification code'] = 'En mail med en verifikationskode er blevet afsendt'; +$lang['ID copied.'] = 'ID kopieret.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Hvis du ikke modtager en mail, så kontakt din webmaster.'; +$lang['Invalid verification code'] = 'Ugyldig verifikationskode'; +$lang['Save your ID and secret'] = 'Gem din ID og hemmelighed'; +$lang['Secret copied. Keep it in a safe place.'] = 'Hemnmelighed kopieret. Opbevar den et sikkert sted.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Hemmeligheden vil ikke længere blive vist. Du skal kopiere den for at fortsætte.'; +$lang['Verification code'] = 'Verifikationskode'; +$lang['Verify'] = 'Verificér'; +$lang['Here is your verification code:'] = 'Her er din verifikationskode'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Hvis det ikke var dig, så skift omgående din adgangskode eller kontakt din webmaster.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Hvis du ændrede din adgangskode, fordi du tror at den er blevet stjålet, anbefaler vi at trække dine %d API-nøgler tilbage i din profil.'; +$lang['Too many attempts, please try later..'] = 'For mange forsøg, prøv igen senere.'; +$lang['Verification successful! You can now choose a new password.'] = 'Verifikation bekræftet! Du kan nu vælge en ny adgangskode.'; +$lang['Your verification code'] = 'Din verifikationskode'; +$lang['edit user preferences'] = 'rediger brugerindstillinger'; \ No newline at end of file diff --git a/language/da_DK/help_quick_search.lang.php b/language/da_DK/help_quick_search.lang.php new file mode 100644 index 000000000..a2e480741 --- /dev/null +++ b/language/da_DK/help_quick_search.lang.php @@ -0,0 +1,57 @@ +account settings.'] = 'Sie können Ihre API-Schlüssel in Ihren Kontoeinstellungen verwalten.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Sie haben keine E-Mail-Adresse, daher werden Sie nicht benachrichtigt, wenn Ihr API-Schlüssel bald abläuft.'; +$lang['The secret key can no longer be displayed.'] = 'Der geheime Schlüssel kann nicht mehr angezeigt werden.'; +$lang['This API key was manually revoked on %s'] = 'Dieser API-Schlüssel wurde am %s manuell widerrufen.'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Um die API weiterhin nutzen zu können, erneuern Sie bitte Ihren Schlüssel, bevor er abläuft.'; +$lang['Set my password'] = 'Mein Passwort festlegen'; +$lang['Show expired keys'] = 'Abgelaufene Schlüssel anzeigen'; +$lang['The api key has been successfully created.'] = 'Der API-Schlüssel wurde erfolgreich erstellt.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'Die E-Mail-Adresse %s wird verwendet, um Sie zu benachrichtigen, wenn Ihr API-Schlüssel bald abläuft.'; +$lang['Return to the gallery'] = 'Zurück zur Galerie'; +$lang['Revoke'] = 'Widerrufen'; +$lang['Revoked'] = 'Widerrufen'; +$lang['Last use'] = 'Letzte Verwendung'; +$lang['Manage your account'] = 'Verwalten Sie Ihr Konto'; +$lang['Never'] = 'Niemals'; +$lang['New API Key'] = 'Neuer API-Schlüssel'; +$lang['No expiration'] = 'Keine Ablaufdatum'; +$lang['Options'] = 'Optionen'; +$lang['Return to Sign in'] = 'Zurück zu Anmelden'; +$lang['Generate API Key'] = 'API-Schlüssel generieren'; +$lang['Generate key'] = 'Schlüssel generieren'; +$lang['Hello %s, enter your new password below.'] = 'Hallo %s, geben Sie unten Ihr neues Passwort ein.'; +$lang['Hide expired keys'] = 'Abgelaufene Schlüssel ausblenden'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Automatisches Kopieren nicht möglich. Bitte manuell kopieren.'; +$lang['Expert mode'] = 'Expertenmodus'; +$lang['Expired'] = 'Abgelaufen'; +$lang['Expired on'] = 'Abgelaufen am'; +$lang['Expires in'] = 'Läuft ab in'; +$lang['Don\'t have an account yet ?'] = 'Sie haben noch kein Konto?'; +$lang['Done'] = 'Fertig'; +$lang['Duration'] = 'Dauer'; +$lang['Edit API Key'] = 'API-Schlüssel bearbeiten'; +$lang['Create an account'] = 'Ein Konto erstellen'; +$lang['Custom date'] = 'Benutzerdefiniertes Datum'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Möchten Sie den API-Schlüssel „%s“ wirklich widerrufen?'; +$lang['Confirm my new password'] = 'Mein neues Passwort bestätigen'; +$lang['Confirm new password'] = 'Neues Passwort bestätigen'; +$lang['Create API Keys to secure your acount'] = 'Erstellen Sie API-Schlüssel, um Ihr Konto zu sichern'; +$lang['Create a new API key to secure your account.'] = 'Erstellen Sie einen neuen API-Schlüssel, um Ihr Konto zu sichern.'; +$lang['Change your password'] = 'Ändern Sie Ihr Passwort'; +$lang['Check your inbox'] = 'Überprüfen Sie Ihren Posteingang.'; +$lang['Choose how you want to see your gallery'] = 'Wählen Sie aus, wie Sie Ihre Galerie anzeigen möchten.'; +$lang['API Key has been successfully revoked.'] = 'Der API-Schlüssel wurde erfolgreich widerrufen.'; +$lang['API Key name'] = 'API-Schlüsselname'; +$lang['API Key not found'] = 'API-Schlüssel nicht gefunden'; +$lang['API Keys'] = 'API-Schlüssel'; +$lang['Account'] = 'Konto'; +$lang['Already have an account ?'] = 'Haben Sie bereits ein Konto?'; +$lang['An email has been sent with a link to reset your password'] = 'Eine E-Mail mit einem Link zum Zurücksetzen Ihres Passworts wurde versendet.'; +$lang['An error has occured please got back to Sign in or Register'] = 'Ein Fehler ist aufgetreten. Bitte kehren Sie zu Anmelden oder Registrieren zurück.'; +$lang['3xlarge'] = '3XL – extra groß'; +$lang['4xlarge'] = '4XL – gigantisch'; +$lang['API Key has been successfully edited.'] = 'Der API-Schlüssel wurde erfolgreich bearbeitet.'; +$lang['Save your ID and secret'] = 'Speichern Sie Ihre ID und Ihr Passwort'; +$lang['Secret copied. Keep it in a safe place.'] = 'Geheimnis kopiert. Bewahren Sie es an einem sicheren Ort auf.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Das Geheimnis wird nicht mehr angezeigt. Sie müssen es kopieren, um fortzufahren.'; +$lang['Verification code'] = 'Bestätigungscode'; +$lang['Verify'] = 'Überprüfen'; +$lang['An email has been sent with a verification code'] = 'Eine E-Mail mit einem Bestätigungscode wurde versendet.'; +$lang['ID copied.'] = 'ID kopiert.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Wenn Sie die E-Mail nicht erhalten, wenden Sie sich bitte an Ihren Webmaster.'; +$lang['Invalid verification code'] = 'Ungültiger Bestätigungscode'; +$lang['Your verification code'] = 'Ihr Bestätigungscode'; +$lang['edit user preferences'] = 'Benutzereinstellungen bearbeiten'; +$lang['Too many attempts, please try later..'] = 'Zu viele Versuche, bitte versuchen Sie es später erneut.'; +$lang['Verification successful! You can now choose a new password.'] = 'Überprüfung erfolgreich! Sie können nun ein neues Passwort wählen.'; +$lang['Here is your verification code:'] = 'Hier ist Ihr Bestätigungscode:'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Wenn Sie das nicht waren, ändern Sie bitte sofort Ihr Passwort oder wenden Sie sich an Ihren Webmaster.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Wenn Sie Ihr Passwort geändert haben, weil Sie glauben, dass es gestohlen wurde, empfehlen wir Ihnen, Ihre %d API-Schlüssel in Ihrem Profil zu widerrufen.'; \ No newline at end of file diff --git a/language/de_DE/help_quick_search.lang.php b/language/de_DE/help_quick_search.lang.php new file mode 100644 index 000000000..36b758e6d --- /dev/null +++ b/language/de_DE/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Sign in'] = 'Επέστρεψε στο Σύνδεση'; +$lang['Return to the gallery'] = 'Επέστρεψε στην πινακοθήκη'; +$lang['Revoke'] = 'Απέσυρε'; +$lang['Revoked'] = 'Αποσύρθηκε'; +$lang['Set my password'] = 'Όρισε τον κωδικό μου'; +$lang['Show expired keys'] = 'Δείξε τα ληγμένα κλειδιά'; +$lang['The api key has been successfully created.'] = 'Το κλειδί ΑΡΙ δημιουργήθηκε με επιτυχία.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'Η δ/νση E-Mail %s θα χρησιμοποιηθεί για ειδοποιηθείτε όταν το κλειδί ΑΡΙ σας θα πλησιάζει στη λήξη του.'; +$lang['The secret key can no longer be displayed.'] = 'Το κρυφό κλειδί δεν μπορεί να απεικονιστεί πλέον.'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Για να συνεχίσετε να χρησιμοποιείτε το ΑΡΙ, παρακαλώ ανανεώστε το κλειδί σας πριν λήξει.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Για να επεξεργαστείτε τα κλειδιά ΑΡΙ σας, παρακαλώ συνδεθείτε με το όνομα χρήστη/κωδικό σας.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Όταν είναι ενεργοποιημένο, χρησιμοποιείται ένα κοινό σχέδιο για τις σελίδες σύνδεσης και καταχώρησης, ανεξάρτητα από το θέμα που έχει ρυθμιστεί.'; +$lang['You can manage your API keys in your account settings.'] = 'Μπορείτε να επεξεργαστείτε τα κλειδιά σας ΑΡΙ στις Ρυθμίσεις Λογαριασμού σας.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Δεν έχετε διεύθυνση E-Mail, δεν θα ειδοποιηθείτε όταν το κλειδί σας ΑΡΙ πλησιάζει στη λήξη του.'; +$lang['Custom date'] = 'Επιλεγόμενη ημερομηνία'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Θέλετε πράγματι να ανακαλέσετε το κλειδί ΑΡΙ "%s";'; +$lang['Don\'t have an account yet ?'] = 'Δεν έχετε ακόμη λογαριασμό;'; +$lang['Done'] = 'Έγινε'; +$lang['Duration'] = 'Διάρκεια'; +$lang['Edit API Key'] = 'Επεξεργαστείτε το κλειδί ΑΡΙ'; +$lang['Expert mode'] = 'Λειτουργία Ειδικού'; +$lang['Expired'] = 'Έληξε'; +$lang['Expired on'] = 'Έληξε την'; +$lang['Expires in'] = 'Λήγει σε'; +$lang['Generate API Key'] = 'Δημιούργησε το κλειδί ΑΡΙ'; +$lang['Generate key'] = 'Δημιούργησε το κλειδί'; +$lang['Hello %s, enter your new password below.'] = 'Γειά σου %s, δώσε τον κωδικό σου παρακάτω.'; +$lang['Hide expired keys'] = 'Απέκρυψε τα ληγμένα κλειδιά'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Αδύνατη η αυτόματη αντιγραφή. Παρακαλώ αντιγράψτε χειροκίνητα.'; +$lang['Last use'] = 'Τελευταία χρήση'; +$lang['Manage your account'] = 'Επεξεργαστείτε τον λογαριασμό σας'; +$lang['Never'] = 'Ποτέ'; +$lang['New API Key'] = 'Νέο κλειδί ΑΡΙ'; +$lang['No expiration'] = 'Χωρίς λήξη'; +$lang['3xlarge'] = '3XL - Πολύ μεγάλες'; +$lang['4xlarge'] = '4ΧΛ - Γιγαντιαίες'; +$lang['API Key has been successfully edited.'] = 'Το κλειδί ΑΡΙ επεξεργάστηκε με επιτυχία.'; +$lang['API Key has been successfully revoked.'] = 'Το κλειδί ΑΡΙ αποσύρθηκε με επιτυχία.'; +$lang['API Key name'] = 'Όνομα κλειδιού ΑΡΙ'; +$lang['API Key not found'] = 'Το κλειδί ΑΡΙ δεν βρέθηκε'; +$lang['API Keys'] = 'Κλειδιά ΑΡΙ'; +$lang['Account'] = 'Λογαριασμός'; +$lang['Already have an account ?'] = 'Έχετε ήδη λογαριασμό;'; +$lang['An email has been sent with a link to reset your password'] = 'Έχει αποσταλεί ένα E-Mail με ένα σύνδεσμο για να επαναφέρετε τον κωδικό σας'; +$lang['An error has occured please got back to Sign in or Register'] = 'Συνέβη κάποιο σφάλμα, παρακαλώ επιστρέψτε στο Σύνδεση ή Καταχώρηση'; +$lang['Change your password'] = 'Αλλάξτε τον κωδικό σας'; +$lang['Check your inbox'] = 'Ελέγξτε το φάκελο εισερχομένων'; +$lang['Choose how you want to see your gallery'] = 'Επιλέξτε πώς θέλετε να δείτε την πινακοθήκη σας'; +$lang['Confirm my new password'] = 'Επιβεβαιωση του νέου μου κωδικού'; +$lang['Confirm new password'] = 'Επιβεβαίωσε τον νέο κωδικό'; +$lang['Create API Keys to secure your acount'] = 'Δημιουργήστε κλειδιά ΑΡΙ για να ασφαλίσετε τον λογαριασμό σας'; +$lang['Create a new API key to secure your account.'] = 'Δημιουργήστε ένα νέο κλειδί ΑΡΙ για να ασφαλίσετε τον λογαριασμό σας.'; +$lang['Create an account'] = 'Δημιουργήστε ένα λογαριασμό'; +$lang['Created at'] = 'Δημιουργήθηκε '; +$lang['An email has been sent with a verification code'] = 'Έχει αποσταλεί ένα e-mail με ένα κωδικό επαλήθευσης'; +$lang['ID copied.'] = 'Το ID αντιγράφτηκε.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Αν δεν λάβετε το e-mail, παρακαλώ επικοινωνήστε με τον διαχειριστή της σελίδας.'; +$lang['Invalid verification code'] = 'Άκυρος κωδικός επαλήθευσης'; +$lang['Save your ID and secret'] = 'Σώστε το ID και την μυστική σας λέξη'; +$lang['Secret copied. Keep it in a safe place.'] = 'Η μυστική σας λέξη αντιγράφτηκε. Φυλάξτε την σε ένα σίγουρο μέρος.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Η μυστική σας λέξη δεν θα είναι πλέον ορατή. Πρέπει να την αντιγράψετε για να συνεχίσετε.'; +$lang['Verification code'] = 'Κωδικός επαλήθευσης'; +$lang['Verify'] = 'Επαλήθευσε'; +$lang['Here is your verification code:'] = 'Ορίστε ο κωδικός σας επαλήθευσης:'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Αν δεν είσασταν εσείς, παρακαλώ αλλάξτε αμέσως τον κωδικό σας ή επικοινωνήστε με τον Διαχειριστή της Σελίδας.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Εαν αλλάξατε τον κωδικό σας επειδή πιστεύετε ότι κλάπηκε, σας συνιστούμε να αναιρέσετε τα %d κλειδιά ΑΡΙ στο προφίλ σας.'; +$lang['Too many attempts, please try later..'] = 'Υπερβολικά πολλές προσπάθειες, παρακαλώ προσπαθείστε αργότερα...'; +$lang['Verification successful! You can now choose a new password.'] = 'Η επαλήθευση ήταν επιτυχής! Μπορείτε τώρα να επιλέξετε ένα καινούριο κωδικό.'; +$lang['Your verification code'] = 'Ο κωδικός σας επαλήθευσης'; +$lang['edit user preferences'] = 'επεξεργασία προτιμήσεων χρήστη'; \ No newline at end of file diff --git a/language/el_GR/help_quick_search.lang.php b/language/el_GR/help_quick_search.lang.php new file mode 100644 index 000000000..2cce4ecad --- /dev/null +++ b/language/el_GR/help_quick_search.lang.php @@ -0,0 +1,57 @@ +account settings.'] = 'You can manage your API keys in your account settings.'; +$lang['Expert mode'] = 'Expert mode'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'If you do not receive the email, please contact your webmaster.'; +$lang['Verification code'] = 'Verification code'; +$lang['Verify'] = 'Verify'; +$lang['Invalid verification code'] = 'Invalid verification code'; +$lang['Save your ID and secret'] = 'Save your ID and secret'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'The secret will no longer be displayed. You must copy it to continue.'; +$lang['ID copied.'] = 'ID copied.'; +$lang['Secret copied. Keep it in a safe place.'] = 'Secret copied. Keep it in a safe place.'; +$lang['edit user preferences'] = 'edit user preferences'; +$lang['Here is your verification code:'] = 'Here is your verification code:'; +$lang['Your verification code'] = 'Your verification code'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'If this wasn\'t you, please change your password immediately or contact your webmaster.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'; +$lang['Too many attempts, please try later..'] = 'Too many attempts, please try later..'; +$lang['Verification successful! You can now choose a new password.'] = 'Verification successful! You can now choose a new password.'; +$lang['If your account exists, a verification code has been sent to your email address.'] = 'If your account exists, a verification code has been sent to your email address.'; diff --git a/language/en_UK/help_quick_search.lang.php b/language/en_UK/help_quick_search.lang.php new file mode 100644 index 000000000..f776baad1 --- /dev/null +++ b/language/en_UK/help_quick_search.lang.php @@ -0,0 +1,58 @@ +account settings.'] = 'Puede gestionar sus claves de API en los parámetros de la cuenta.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'No tiene dirección de correo electrónico, así que no se le podrá avisar cuando su clave de API esté a punto de caducar.'; +$lang['Your API key will expire in %d day.'] = 'Su clave de API caducará en %d día.'; +$lang['Your API key will expire in %d days.'] = 'Su clave de API caducará en %d días.'; +$lang['Your API key will expire soon'] = 'Su clave de API caducará pronto'; +$lang['Your changes have been applied.'] = 'Se han aplicado los cambios.'; +$lang['Your password was successfully reset'] = 'Se ha restablecido con éxito su contraseña'; +$lang['Your password was successfully set'] = 'Se ha establecido con éxito su contraseña'; +$lang['must not be empty'] = 'no puede estar vacía'; +$lang['you must choose a date'] = 'debe elegir una fecha'; +$lang['3xlarge'] = '3XL - extra grande'; +$lang['4xlarge'] = '4XL - gigantesco'; +$lang['API Key has been successfully edited.'] = 'La clave de API se ha editado con éxito.'; +$lang['API Key has been successfully revoked.'] = 'La clave de API se ha revocado con éxito.'; +$lang['API Key name'] = 'Nombre de la clave de API'; +$lang['API Key not found'] = 'Clave de API no encontrada'; +$lang['API Keys'] = 'Claves de API'; +$lang['Account'] = 'Cuenta'; +$lang['Already have an account ?'] = '¿Ya tiene una cuenta?'; +$lang['An email has been sent with a link to reset your password'] = 'Se ha enviado un correo electrónico con un enlace para restaurar su contraseña'; +$lang['An error has occured please got back to Sign in or Register'] = 'Se ha producido un error; vuelva a Iniciar sesión o Registrarse'; +$lang['Change your password'] = 'Cambie la contraseña'; +$lang['Check your inbox'] = 'Compruebe su bandeja de entrada'; +$lang['Choose how you want to see your gallery'] = 'Elija cómo quiere ver su galería'; +$lang['Confirm my new password'] = 'Confirmar mi nueva contraseña'; +$lang['Confirm new password'] = 'Confirmar nueva contraseña'; +$lang['Create API Keys to secure your acount'] = 'Cree claves de API para asegurar su cuenta'; +$lang['Create a new API key to secure your account.'] = 'Cree una nueva clave de API para asegurar su cuenta.'; +$lang['Create an account'] = 'Crear una cuenta'; +$lang['Created at'] = 'Creada en'; +$lang['Custom date'] = 'Fecha personalizada'; +$lang['Do you really want to revoke the "%s" API key?'] = '¿Seguro que desea revocar la clave de API "%s"?'; +$lang['Don\'t have an account yet ?'] = '¿No tiene cuenta todavía?'; +$lang['Done'] = 'Hecho'; +$lang['Duration'] = 'Duración'; +$lang['Edit API Key'] = 'Editar clave de API'; +$lang['Expert mode'] = 'Modo experto'; +$lang['Expired'] = 'Caducada'; +$lang['Expired on'] = 'Caducada el'; +$lang['Expires in'] = 'Caduca en'; +$lang['Generate API Key'] = 'Generar clave de API'; +$lang['Generate key'] = 'Generar clave'; +$lang['Hello %s, enter your new password below.'] = 'Hola, %s; escriba su nueva contraseña a continuación.'; +$lang['Hide expired keys'] = 'Ocultar las claves caducadas'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Imposible copiar automáticamente. Haga la copia manualmente.'; +$lang['Last use'] = 'Último uso'; +$lang['Manage your account'] = 'Gestionar su cuenta'; +$lang['Never'] = 'Nunca'; +$lang['New API Key'] = 'Nueva clave de API'; +$lang['No expiration'] = 'Sin caducidad'; +$lang['Options'] = 'Opciones'; +$lang['Return to Sign in'] = 'Volver a Iniciar sesión'; +$lang['Return to the gallery'] = 'Volver a la galería'; +$lang['Revoke'] = 'Revocar'; +$lang['Revoked'] = 'Revocada'; +$lang['Set my password'] = 'Establecer mi contraseña'; +$lang['Show expired keys'] = 'Mostrar las claves caducadas'; +$lang['An email has been sent with a verification code'] = 'Se ha enviado un correo electrónico con un código de verificación'; +$lang['ID copied.'] = 'ID copiado.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Si no recibe el correo electrónico, póngase en contacto con el webmaster.'; +$lang['Invalid verification code'] = 'Codigo de verificación no válido'; +$lang['Save your ID and secret'] = 'Guarde su ID y secreto'; +$lang['Secret copied. Keep it in a safe place.'] = 'Secreto copiado. Manténgalo en lugar seguro.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'El secreto ya no se mostrará más. Debe copiarlo para continuar.'; +$lang['Verification code'] = 'Código de verificación'; +$lang['Verify'] = 'Verificar'; \ No newline at end of file diff --git a/language/es_MX/common.lang.php b/language/es_MX/common.lang.php index 0c46cc5af..eb2a4c52e 100644 --- a/language/es_MX/common.lang.php +++ b/language/es_MX/common.lang.php @@ -122,7 +122,7 @@ $lang['created after %s (%s)'] = 'creado después de %s (%s)'; $lang['created before %s (%s)'] = 'creado antes de %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'creado entre %s (%s) y %s (%s)'; $lang['created on %s'] = 'creado el %s'; -$lang['customize the appareance of the gallery'] = 'personalizar el aspecto de la galería'; + $lang['delete all photos from your favorites'] = 'eliminar todas las fotos de tus favoritas'; $lang['delete this photo from your favorites'] = 'eliminar esta foto de tus favoritas'; $lang['descending'] = 'descendente'; @@ -337,7 +337,7 @@ $lang['Create a new account'] = 'Crear una nueva cuenta'; $lang['Created on'] = 'Creada el'; $lang['Creation date'] = 'Fecha de creación'; $lang['Current password is wrong'] = 'La contraseña usada es incorrecta'; -$lang['Customize'] = 'Personalizar'; + $lang['Date created, new → old'] = 'Fecha de creación, nueva → antigua'; $lang['Date created, old → new'] = 'Fecha de creación, antigua → nueva'; $lang['Date posted, new → old'] = 'Fecha de publicación, nueva → antigua'; diff --git a/language/et_EE/admin.lang.php b/language/et_EE/admin.lang.php index e01cf5557..cb2346b6f 100644 --- a/language/et_EE/admin.lang.php +++ b/language/et_EE/admin.lang.php @@ -881,7 +881,7 @@ $lang['unset'] = 'tühista'; $lang['update the database from files'] = 'uuenda andmebaas failidega'; $lang['user "%s" added'] = 'kasutaja "%s" lisati'; $lang['user_status_generic'] = 'Üldine'; -$lang['user_status_normal'] = 'Kasutaja'; + $lang['width must be a number superior to'] = 'laius peab olema suurem kui'; $lang['wrong filename'] = 'vigane failinimi'; $lang['Albums authorized thanks to group associations'] = 'Autoriseeritud ligipääs kaustadele kuna oled grupiliige'; @@ -1290,4 +1290,116 @@ $lang['Posted %s'] = 'Postitatud %s'; $lang['Plugin "%s" has been activated!'] = 'Plugin "%s" on aktiveeritud!'; $lang['Plugin "%s" deleted!'] = 'Plugin "%s" on kustutatud!'; $lang['Place last'] = 'Viimane koht'; -$lang['Place first'] = 'Esimene koht'; \ No newline at end of file +$lang['Place first'] = 'Esimene koht'; +$lang['Added on %s'] = 'Lisatud %s'; +$lang['Activate create mode to create and select an album'] = 'Albumi loomiseks ja valimiseks aktiveerige loomisrežiim'; +$lang['Select or create an album'] = 'Valige või looge album'; +$lang['Select groups or type them'] = 'Valige rühmad või tippige need'; +$lang['Select an album... or type it!'] = 'Valige album... või tippige see!'; +$lang['Select all %d tags'] = 'Valige kõik %d silti'; +$lang['Search tips'] = 'Otsimise näpunäited'; +$lang['Save'] = 'Salvesta'; +$lang['Root'] = 'Juur'; +$lang['Review'] = 'Ülevaade'; +$lang['Resend password link'] = 'Saada parooli link uuesti'; +$lang['Read the release note'] = 'Lugege väljalaskemärkust'; +$lang['Please complete all fields'] = 'Palun täitke kõik väljad'; +$lang['Group(s) \{%s1\} succesfully merged into "%s2"'] = 'Grupp(id) \{%s1\} ühendati edukalt rühmaga "%s2"'; +$lang['Has access to administration. Can only manage content: photos/albums/users/tags/groups.'] = 'Juurdepääs administratsioonile. Saab hallata ainult sisu: fotod/albumid/kasutajad/sildid/rühmad.'; +$lang['Installed on %s, %s'] = 'Installitud: %s, %s'; +$lang['Last revision date is newer than'] = 'Viimase läbivaatamise kuupäev on uuem kui'; +$lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Lukustatud albumid on hoolduseks keelatud. Ainult administraatorid saavad neid galeriis vaadata. Selle albumi lukustamisel lukustatakse ka selle alamalbumid.'; +$lang['No research in progress'] = 'Uuringuid pole pooleli'; +$lang['No access to administration, can see private content with appropriate permissions.'] = 'Juurdepääs administratsioonile puudub, näeb privaatset sisu sobivate lubadega.'; +$lang['Metadata sync complete'] = 'Metaandmete sünkroonimine on lõpetatud'; +$lang['Memories'] = 'Suveniirid'; +$lang['Main user'] = 'Peamine kasutaja'; +$lang['No search in progress'] = 'Otsingut pole pooleli'; +$lang['Ok, got it!'] = 'Ok, sain aru!'; +$lang['Object'] = 'Objekt'; +$lang['Line View'] = 'Joonvaade'; +$lang['Image'] = 'Pilt'; +$lang['First choose an album, then add your files'] = 'Esmalt valige album ja seejärel lisage failid'; +$lang['During upload, if Piwigo detects the photo already exists, associate the existing photo to the destination album, without duplicating file'] = 'Kui Piwigo tuvastab üleslaadimise ajal, et foto on juba olemas, seostage olemasolev foto sihtalbumiga ilma faili dubleerimata'; +$lang['Drag and drop to reorder albums'] = 'Albumite ümberjärjestamiseks pukseerige'; +$lang['Display'] = 'Ekraan'; +$lang['Discover'] = 'Avastage'; +$lang['Delete them'] = 'Kustutage need'; +$lang['Delete tag "%s"?'] = 'Kas kustutada silt "%s"?'; +$lang['Delete %s format ?'] = 'Kas kustutada %s vorming?'; +$lang['Currently running version %s'] = 'Praegu töötab versioon %s'; +$lang['Creation mode'] = 'Loomisrežiim'; +$lang['Created on %s'] = 'Loodi %s'; +$lang['Create your first album'] = 'Looge oma esimene album'; +$lang['Create and select'] = 'Looge ja valige'; +$lang['Create a root album'] = 'Loo juuralbum'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Sellele kasutajale ei saa meili saata, kuna tal pole meiliaadressi'; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Kopeerige allolev link ja saatke see kasutajale, et saaks parooli määrata.'; +$lang['Copy the password link'] = 'Kopeerige parooli link'; +$lang['Core'] = 'Tuum'; +$lang['Copy password'] = 'Kopeeri parool'; +$lang['Copied link'] = 'Kopeeritud link'; +$lang['Changing the main user'] = 'Peakasutaja muutmine'; +$lang['Changes saved'] = 'Muudatused salvestatud'; +$lang['%s is the new main user'] = '%s on uus põhikasutaja'; +$lang['Add a sub-album to “%s”'] = 'Lisa alamalbum albumisse “%s”'; +$lang['An error has occured'] = 'Ilmnes viga'; +$lang['Auto-update'] = 'Automaatne värskendus'; +$lang['The other tags will be removed'] = 'Ülejäänud sildid eemaldatakse'; +$lang['The passwords do not match'] = 'Paroolid ei ühti'; +$lang['This albums is already in related categories list'] = 'See album on juba seotud albumite loendis'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'See link kehtib %s. Pärast seda aega peate taotlema uut linki.'; +$lang['This photo is an orphan'] = 'See foto on üksik'; +$lang['The best is to have them made automatically on a regular basis.'] = 'Parim on lasta neid regulaarselt teha automaatselt.'; +$lang['The original picture will be detected with the filename (without extension).'] = 'Algne pilt tuvastatakse failinimega (ilma laiendita).'; +$lang['Tag name'] = 'Sildi nimi'; +$lang['System Activities'] = 'Süsteemi tegevused'; +$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'Mõned fotod puuduvad teie failisüsteemist. Üksikasjad, mida pakub pistikprogramm, Kontrolli üleslaadimisi'; +$lang['Synchronization'] = 'Sünkroonimine'; +$lang['Shrink'] = 'Kahanema'; +$lang['Showing %s users out of %s'] = 'Kuvatakse %s kasutajat %s-st'; +$lang['Show sub-albums'] = 'Kuva alamalbumid'; +$lang['Show beta test plugins'] = 'Kuva beetatesti pistikprogrammid'; +$lang['Set as main user'] = 'Määra põhikasutajaks'; +$lang['Set as group for new users'] = 'Määra uute kasutajate rühmaks'; +$lang['Piwigo core'] = 'Piwigo tuum'; +$lang['Picture to associate formats with'] = 'Pilt, millega vorminguid seostada'; +$lang['Photos per page'] = 'Fotosid lehel'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'See kasutaja tuleb esmalt määratleda veebihaldurina, enne kui seda saab põhikasutajaks täiendada'; +$lang['Tile View'] = 'Plaadivaade'; +$lang['To be sure, please rewrite the word “%s” below'] = 'Et olla kindel, kirjutage sõna "%s" allpool ümber'; +$lang['To set your password, visit the following address:'] = 'Parooli määramiseks külastage järgmist aadressi:'; +$lang['Understood, do not show again'] = 'Sai aru, enam ei näita'; +$lang['Unlock it'] = 'Avage see'; +$lang['Unset as group for new users'] = 'Tühista uute kasutajate grupiks määramine'; +$lang['Upload Formats'] = 'Laadi vormingud üles'; +$lang['Username successfully modified'] = 'Kasutajanime muutmine õnnestus'; +$lang['Users not logged in will have these settings applied, these settings are used by default for new users'] = 'Kasutajatele, kes pole sisse logitud, rakendatakse neid sätteid. Neid seadeid kasutatakse vaikimisi uute kasutajate puhul'; +$lang['This plugin is incompatible with your version'] = 'See pistikprogramm ei ühildu teie versiooniga'; +$lang['This plugin have no update since 3 years ! It may be outdated'] = 'Sellel pistikprogrammil pole värskendusi 3 aastat! See võib olla aegunud'; +$lang['This plugin have been updated recently'] = 'Seda pistikprogrammi on hiljuti värskendatud'; +$lang['This plugin has no recent update'] = 'Sellel pistikprogrammil pole uusi värskendusi'; +$lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'See pilt on selle albumiga füüsiliselt lingitud, te ei saa neid lahutada.'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Teil ei ole õigust põhikasutajat vahetada, küsige oma veebihaldurilt'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Seadistate peakasutajaks %s, mitte %s, kas soovite jätkata?'; +$lang['Yes, let\'s proceed'] = 'Jah, jätkame'; +$lang['Who can see ?'] = 'Kes näeb?'; +$lang['What\'s new in version %s'] = 'Mis on uut versioonis %s?'; +$lang['You can now change the main user from %s to %s.'] = 'Nüüd saate muuta põhikasutaja %s kasutajaks %s.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Te ei saa parooli kopeerida, kui ühendus selle saidiga pole turvaline.'; +$lang['You have unsaved changes'] = 'Teil on salvestamata muudatusi'; +$lang['between %d and %d'] = 'vahemikus %d kuni %d'; +$lang['level of confidentiality'] = 'konfidentsiaalsuse tase'; +$lang['image(s) contains unsaved changes'] = 'pilt sisaldab salvestamata muudatusi'; +$lang['to'] = 'to'; +$lang['was succesfully deleted'] = 'kustutati edukalt'; +$lang['Password copied'] = 'Parool kopeeritud'; +$lang['Pagination has changed and needs to be reloaded !'] = 'Leheküljed on muutunud ja tuleb uuesti laadida!'; +$lang['Page Visited'] = 'Lehekülge külastatud'; +$lang['Page Visited in %s'] = 'Lehekülge külastatud %s'; +$lang['Only admins in a specific group'] = 'Ainult teatud grupi administraatorid'; +$lang['On %d rating(s)'] = '%d hinnangul'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'Loodi %s kehtiv aktiveerimislink, kuid seda ei saanud saata. Nüüd saate kopeerida alloleva lingi ja saata selle kasutajale.'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'Kehtiv aktiveerimislink %s jaoks on saadetud aadressile "%s". Kui linki ei saa, saab kasutajat muutes ja parooli haldades uue genereerida ja kopeerida.'; +$lang['A photo library administrator has created the following account for you:'] = 'Fototeegi administraator on loonud teile järgmise konto:'; +$lang['Welcome to %s'] = 'Tere tulemast %s'; \ No newline at end of file diff --git a/language/et_EE/common.lang.php b/language/et_EE/common.lang.php index 39b85e247..16d2d970f 100644 --- a/language/et_EE/common.lang.php +++ b/language/et_EE/common.lang.php @@ -170,7 +170,7 @@ $lang['created after %s (%s)'] = 'loodud peale %s (%s)'; $lang['created before %s (%s)'] = 'loodud enne %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'loodud %s (%s) ja %s (%s) vahel'; $lang['created on %s'] = 'loodud %s'; -$lang['Customize'] = 'Kohanda'; + $lang['Your Gallery Customization'] = 'Sinu galerii kohandamine'; $lang['Default'] = 'Vaikimisi'; $lang['delete this photo from your favorites'] = 'eemalda see foto oma lemmikutest'; @@ -192,7 +192,7 @@ $lang['Hello'] = 'Tere'; $lang['available for administrators only'] = 'saadaval vaid administraatoritele'; $lang['display this album'] = 'kuva see album'; $lang['display last user comments'] = 'kuva viimased kasutajate kommentaarid'; -$lang['customize the appareance of the gallery'] = 'kohanda galerii välimust'; + $lang['search'] = 'otsi'; $lang['Home'] = 'Avaleht'; $lang['in this album'] = 'selles albumis'; @@ -464,4 +464,15 @@ $lang['Albums found'] = 'Leitud albumeid'; $lang['Album title'] = 'Albumi pealkiri'; $lang['Album description'] = 'Albumi kirjeldus'; $lang['%d visits'] = '%d külastust'; -$lang['Added by'] = 'Lisas'; \ No newline at end of file +$lang['Added by'] = 'Lisas'; +$lang['There are no authors available for the photos currently filtered'] = 'Filtreeritud fotode jaoks pole autoreid saadaval'; +$lang['last 12 months'] = 'Viimased 12 kuud'; +$lang['There are no tags available for the photos currently filtered'] = 'Filtreeritud fotode jaoks pole silte saadaval'; +$lang['There are no creation dates available for the photos currently filtered'] = 'Filtreeritud fotode jaoks pole loomiskuupäevi saadaval'; +$lang['The PDF you requested is too large to display on this page.'] = 'Taotletud PDF on sellel lehel kuvamiseks liiga suur.'; +$lang['Pages'] = 'Leheküljed'; +$lang['Only the first %d albums are displayed, out of %d.'] = 'Kuvatakse ainult esimene %d albumit %d-st.'; +$lang['Custom dates'] = 'Kohandatud kuupäevad'; +$lang['Click here to display it'] = 'Selle kuvamiseks klõpsake siin'; +$lang['Album already selected'] = 'Album on juba valitud'; +$lang['Set your password below.'] = 'Määrake allpool oma parool.'; \ No newline at end of file diff --git a/language/et_EE/whats_new_15.lang.php b/language/et_EE/whats_new_15.lang.php new file mode 100644 index 000000000..0a3adbac9 --- /dev/null +++ b/language/et_EE/whats_new_15.lang.php @@ -0,0 +1,11 @@ +%s merged into tag %s'] = 'Tagit %s yhdistetty tagiksi %s'; -$lang['Tags \{%s\} succesfully deleted'] = 'Tagit \{%s\} poistettiin onnistuneesti'; \ No newline at end of file +$lang['Tags \{%s\} succesfully deleted'] = 'Tagit \{%s\} poistettiin onnistuneesti'; +$lang['was succesfully deleted'] = 'poistettiin onnistuneesti'; +$lang['This group will be unset to default'] = 'Tätä ryhmää ei enää käytetä oletuksena'; +$lang['This group will be set to default'] = 'Tätä ryhmää käytetään oletuksena'; +$lang['This album contains %d photos, added between %s and %s.'] = 'Tässä albumissa on %d kuvaa, jotka on lisätty %s ja %s välillä.'; +$lang['This album contains %d photos, added on %s.'] = 'Tässä albumissa on %d kuvaa, jotka on lisätty %s.'; +$lang['This album contains no photo.'] = 'Tässä albumissa ei ole yhtään kuvaa.'; +$lang['There is no other language available.'] = 'Muuta kieltä ei ole saatavilla.'; +$lang['There is no other plugin available.'] = 'Muuta liitännäistä ei ole saatavilla.'; +$lang['There is no other theme available.'] = 'Muuta teemaa ei ole saatavilla.'; +$lang['The name of a group must not contain " or \' or be empty.'] = 'Ryhmän nimessä ei saa olla " tai \' eikä se saa olla tyhjä.'; +$lang['There is no available subscribers to mail.'] = 'Sähköposti-ilmoituksen tilaajia ei ole.'; +$lang['There is no group in this gallery.'] = 'Tässä galleriassa ei ole ryhmää.'; +$lang['The whole page'] = 'Koko sivu'; +$lang['The whole set'] = 'Koko setti'; +$lang['Theme'] = 'Teema'; +$lang['The original maximum height must be a number between %d and %d'] = 'Alkuperäisen kuvan korkeuden on oltava numero väliltä %d-%d'; +$lang['The original maximum width must be a number between %d and %d'] = 'Alkuperäisen kuvan leveyden on oltava numero väliltä %d-%d'; +$lang['The original image quality must be a number between %d and %d'] = 'Alkuperäisen kuvanlaadun on oltava numero väliltä %d-%d'; +$lang['The name of an album must not be empty'] = 'Albumin nimi ei saa olla tyhjä'; +$lang['The number of comments a page must be between 5 and 50 included.'] = 'Sivulla olevien kommenttien määrän täytyy olla 5 ja 50 välillä.'; +$lang['There is multiple image in the database with the following names : %s.'] = 'Nimillä %s on tietokannassa useampia kuvia.'; +$lang['This album is currently locked, visible only to administrators.'] = 'Tämä albumi on lukittu ja näkyy vain ylläpitäjille.'; +$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'Lähetetty tiedosto ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-asetuksen'; +$lang['The passwords do not match'] = 'Salasanat eivät ole samat'; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Kopioi lnikki alta ja lähetä se käyttäjälle salasanan asettamiseksi.'; +$lang['Copy the password link'] = 'Kopioi salasanalinkki'; +$lang['Main user'] = 'Pääkäyttäjä'; +$lang['Password copied'] = 'Salasana kopioitu'; +$lang['Please complete all fields'] = 'Täytäthän kaikki kentät'; +$lang['Resend password link'] = 'Lähetä salasanalinkki uudelleen'; +$lang['Set as main user'] = 'Aseta pääkäyttäjäksi'; +$lang['%s is the new main user'] = '%s on uusi pääkäyttäjä'; +$lang['Changing the main user'] = 'Vaihdetaan pääkäyttäjä'; +$lang['Copied link'] = 'Kopioitu linkki'; +$lang['Copy password'] = 'Kopioi salasana'; +$lang['This photo no longer exists'] = 'Tätä kuvaa ei ole enää olemassa'; +$lang['This plugin has no recent update'] = 'Tähän laajennukseen ei ole viimeaikaista päivitystä'; +$lang['This plugin is incompatible with your version'] = 'Tämä laajennus ei ole yhteensopiva sinun version kanssa'; +$lang['Thumbnail'] = 'Pikkukuva'; +$lang['Time'] = 'Aika'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Sähköpostin lähettäminen tälle käyttäjälle ei onnistu, koska hänellä ei ole sähköpostiosoitetta.'; +$lang['Ok, got it!'] = 'Ok, sain sen!'; +$lang['Read the release note'] = 'Lue julkaisutiedote'; +$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'Piwigon julkaisulaajennuksen avulla voit viedä ja synkronoida valokuvia Lightroomista suoraan Piwigo-kuvagalleriaasi.'; +$lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Tiedostoa tai hakemistoa ei voi käyttää (joko sitä ei ole olemassa tai sinulla ei ole oikeuksia siihen)'; +$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'Hakemistojen ja tiedostojen nimet saavat sisältää vain kirjaimia, numeroita, "-", "_" tai "."'; +$lang['The original picture will be detected with the filename (without extension).'] = 'Alkuperäinen kuva tunnistetaan tiedostonimellä (ilman päätessä).'; +$lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'Ladattu kuva ylittää php.ini tiedoston upload_max_filesize asetuksen: %sB'; +$lang['The version of %s [%s] installed is not compatible with the version required ']['%s'] = 'Asennettu versio %s [%s] ei ole yhteensopiva vaaditun version [%s] kanssa'; +$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'Webmaster on tilannut sinulle sähköposti-ilmoitukset'; +$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Webmaster on poistanut sinulta tilauksen uusista sähköposti-ilmoituksista.'; +$lang['This albums is already in related categories list'] = 'Tämä albumi on jo aiheeseen liittyvien albumien luettelossa'; +$lang['This is a major update, with new exciting features.'] = 'Tämä on iso päivitys, joka sisältää uusia jännittäviä ominaisuuksia.'; +$lang['This is a minor update, with only bug corrections.'] = 'Tämä on pieni päivitys vain bugikorjauksilla.'; +$lang['This is already the default theme'] = 'Tämä on jo oletusteema'; +$lang['This name is already used by another group.'] = 'Tämä nimi on jo toisen ryhmän käytössä.'; +$lang['This photo is an orphan'] = 'Tämä kuva on orpo'; +$lang['months ago'] = 'kuukausia sitten'; +$lang['on the %d selected photos'] = '%d valittuun kuvaan'; +$lang['on the %d selected users'] = '%d valittuun käyttäjään'; +$lang['only perform a simulation (no change in database will be made)'] = 'suorita vain simulaatio (tietokantaan ei tehdä muutoksia)'; +$lang['overrides existing values with empty ones'] = 'ylikirjoittaa olemassa olevat arvot tyhjillä arvoilla'; +$lang['reduce to single existing albums'] = 'supista yksittäisiksi olemassa oleviksi albumeiksi'; +$lang['simple visitors'] = 'yksinkertaiset vierailijat'; +$lang['singly represented'] = 'kiinteä albumin pikkukuva'; +$lang['synchronize files metadata with database photos informations'] = 'synkronoi tietokannan kuvat tiedostojen metatietojen kanssa'; +$lang['test this remote site'] = 'testaa tämä etäsivusto'; +$lang['unit mode'] = 'yksittäistila'; +$lang['You have %s1 orphan : %s2'] = 'Sinulla on %s1 orpo: %s2'; +$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'Olet määrittänyt $conf[\'order_by\'] paikallisessa määritystiedostossasi. Tämä parametri on vanhentunut – poista se tai nimeä se uudelleen muotoon $conf[\'order_by_custom\']!'; +$lang['You have unsaved changes'] = 'Sinulla on tallentamattomia muutoksia'; +$lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'Jotta voisit hyödyntää sovellusta täysimääräisesti, järjestelmäsi pitäisi päivittää – muuten sovellus saattaa toimia virheellisesti tai ei lainkaan.'; +$lang['[%s] Visit album %s'] = '[%s] Vieraile albumissa %s'; +$lang['[NBM] Problems or questions'] = '[NBM] Ongelmia tai kysyttävää'; +$lang['and %d more'] = 'ja %d lisää'; +$lang['between %d and %d'] = 'välillä %d ja %d'; +$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'näytä enimmäismäärä tietoa (lisätyt albumit ja kuvat, poistetut albumit ja kuvat)'; +$lang['dissociate from group'] = 'poista ryhmäliitos'; +$lang['errors during synchronization'] = 'virheitä sykronoinnin aikana'; +$lang['even already synchronized photos'] = 'jopa jo synkronoidut kuvat'; +$lang['for the file format'] = 'tiedostomuodolle'; +$lang['for this file format'] = 'tälle tiedostomuodolle'; +$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto on macOS:n oletuskuvahallinta-sovellus. Piwigo-vientilisäosa mahdollistaa uusien albumien luomisen ja valokuvien viennin suoraan iPhotosta Piwigo-valokuvagalleriaan.'; +$lang['image(s) contains unsaved changes'] = 'kuva(t) sisältää tallentamattomia muutoksia'; +$lang['in administration'] = 'hallinnassa'; +$lang['include child albums'] = 'sisällytä ala-albumit'; +$lang['include photos with lower privacy level'] = 'sisällytä alhaisemman yksityisyystason kuvat'; +$lang['level of confidentiality'] = 'luottamuksellisuuden taso'; +$lang['X Position'] = 'X-Sijainti'; +$lang['X Repeat'] = 'X-Toisto'; +$lang['Y Position'] = 'Y-Sijainti'; +$lang['Y Repeat'] = 'Y-Toisto'; +$lang['Yes, let\'s proceed'] = 'Kyllä, jatketaan.'; +$lang['Yes, rename'] = 'Kyllä, muuta nimi'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Olet asettamassa käyttäjän %s pääkäyttäjäksi käyttäjän %s sijaan. Haluatko jatkaa?'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Sinulla ei ole oikeuksia vaihtaa pääkäyttäjää, ota yhteyttä webmasteriin.'; +$lang['You are running on development sources, no check possible.'] = 'Käytössäsi on kehityslähteet, tarkistusta ei voida suorittaa.'; +$lang['You are using the Browser uploader. Try the Flash uploader instead.'] = 'Käytät selainlähetysohjelmaa. Kokeile sen sijaan Flash-lähetysohjelmaa.'; +$lang['You are using the Flash uploader. Problems? Try the Browser uploader instead.'] = 'Käytät Flash-lähetysohjelmaa. Ongelmia? Kokeile sen sijaan selainlähetysohjelmaa.'; +$lang['You can activate only one mobile theme.'] = 'Voit aktivoida vain yhden mobiili-teeman.'; +$lang['You can now change the main user from %s to %s.'] = 'Voit nyt vaihtaa pääkäyttäjän käyttäjästä %s käyttäjäksi %s.'; +$lang['You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'Voit päivittää suoraan Piwigo-versioon %s ilman, että sinun tarvitsee ensin päivittää versioon %s (suositeltavaa).'; +$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Et voi määrittää oletuskuvajärjestystä, koska paikallisessa määrityksessäsi on mukautettu asetus.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Et voi kopioida salasanaa, jos yhteys tähän sivustoon ei ole suojattu.'; +$lang['You don\'t have access to this photo'] = 'Sinulla ei ole pääsyä tähän kuvaan'; +$lang['You have %d orphan tags %s'] = 'Sinulla on %d orpoa tunnistetta %s'; +$lang['You have %d orphan tags: %s.'] = 'Sinulla on %d orpoa tunnistetta: %s'; +$lang['You have %s inactive plugins'] = 'Sinulla on %s aktivoimatonta lisäosaa'; +$lang['User associated'] = 'Käyttäjä liitetty'; +$lang['User comments validation'] = 'Käyttäjä kommenttien tarkistus'; +$lang['User status'] = 'Käyttäjän tila'; +$lang['User updated'] = 'Käyttäjä päivitetty'; +$lang['Username successfully modified'] = 'Käyttäjänimi muutettu onnistuneesti'; +$lang['Users modified'] = 'Käyttäjät muutettu'; +$lang['Users not logged in will have these settings applied, these settings are used by default for new users'] = 'Kirjautumattomiin käyttäjiin sovelletaan näitä asetuksia, ja niitä käytetään oletuksena uusille käyttäjille.'; +$lang['Version %s'] = 'Versio %s'; +$lang['Visit history'] = 'Vierailuhistoria'; +$lang['Visited'] = 'Vierailtu'; +$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'Varoitus: tilaaminen tai tilauksen peruminen lähettää sähköpostin käyttäjille'; +$lang['Web Form'] = 'Verkkolomake'; +$lang['Webmaster cannot be deleted'] = 'Webmasteria ei voida poistaa'; +$lang['Webmaster status is required.'] = 'Webmaster-tila on pakollinen.'; +$lang['Webmaster status required'] = 'Webmaster-tila vaaditaan.'; +$lang['Welcome to %s'] = 'Tervetuloa %s'; +$lang['What\'s new in version %s'] = 'Mitä uutta versiossa %s?'; +$lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'Kun tämä lisäosa palautetaan, se nollataan alkuperäisiin asetuksiinsa ja siihen liittyvät tiedot palautetaan oletustilaan.'; +$lang['Who can see ?'] = 'Kuka voi nähdä?'; +$lang['With blank value, gallery title will be used'] = 'Jos tyhjä, gallerian otsikkoa käytetään'; +$lang['To unsubscribe'] = 'Peruuta tilaus'; +$lang['Toggle \'default group\' property'] = 'Käännä "oletusryhmä" -ominaisuus'; +$lang['Try now !'] = 'Kokeile nyt!'; +$lang['Uncheck all'] = 'Poista valinta kaikista'; +$lang['Understood, do not show again'] = 'Ymmärretty, älä näytä uudelleen.'; +$lang['Unlock it'] = 'Avaa lukitus'; +$lang['Unlocked album'] = 'Lukitsematon albumi'; +$lang['Unset as group for new users'] = 'Poista ryhmä uusien käyttäjien oletusryhmänä'; +$lang['Unsubscribe from notification by mail'] = 'Peruuta sähköposti-ilmoitukset'; +$lang['Unsubscribed'] = 'Tilaus peruutettu'; +$lang['Upload Formats'] = 'Lähetettävät tiedostomuodot'; +$lang['Use the default photo sort order'] = 'Käytä valokuvien oletus järjestystä'; +$lang['Used metadata'] = 'Käytetty metatieto'; +$lang['User "%s" created with "%s" like password'] = 'Käyttäjä "%s" luotiin salasanalla "%s"'; +$lang['User "%s" dissociated from this group'] = 'Käyttäjä ”%s” on poistettu tästä ryhmästä'; +$lang['User %s [%s] added.'] = 'Käyttäjä %s [%s] lisätty.'; +$lang['User %s [%s] was added to the subscription list.'] = 'Käyttäjä %s [%s] lisätty tilauslistalle.'; +$lang['User %s [%s] was not added to the subscription list.'] = 'Käyttäjää %s [%s] ei lisätty tilauslistalle.'; +$lang['User %s [%s] was not removed from the subscription list.'] = 'Käyttäjää %s [%s] ei poistettu tilauslistasta.'; +$lang['User %s [%s] was removed from the subscription list.'] = 'Käyttäjä %s [%s] poistettu tilauslistasta.'; +$lang['A photo library administrator has created the following account for you:'] = 'Kuvakirjaston ylläpitäjä on luonut sinulle tilin:'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'Tämä aktivointi linkki on lähetetty "%s" ja on voimassa %s. Mikäli linkki ei saavu perille, voit luoda uuden ja kopioida sen muokkaamalla käyttäjätilin salasanaa.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = '%s voimassa oleva aktivointi linkki luotiin, mutta lähetys epäonnistui. Voit kopioida linkin alta ja lähettää käyttäjälle.'; +$lang['Subscribers could be listed (available) only if there is new elements to notify.'] = 'Tilaajat voidaan näyttää (saatavilla olevat) vain, jos ilmoitettavia uusia elementtejä on.'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'Tämä linkki on voimassa %s, tämän jälkeen sinun tulee pyytää uutta linkkiä.'; +$lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'Tämä kuva on fyysisesti linkitetty tähän albumiin, et voi erottaa niitä toisistaan.'; +$lang['This plugin have been updated recently'] = 'Tämä lisäosa on päivitetty äskettäin'; +$lang['This plugin have no update since 3 years ! It may be outdated'] = 'Tämä lisäosaa ei ole saanut päivitystä kolmeen (3) vuoteen, se voi olla vanhentunut.'; +$lang['This plugin was updated less than 6 months ago'] = 'Tämä lisäosa päivitettiin alle 6kk sitten '; +$lang['This site already exists'] = 'Tämä sivu on jo olemassa'; +$lang['This theme was not designed to be directly activated'] = 'Tämä teema ei ole suunniteltu suoraan aktivoitavaksi'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Tämä käyttäjä on ensin määritettävä webmasteriksi, ennen kuin hänet voidaan korottaa pääkäyttäjäksi.'; +$lang['Tile View'] = 'Ruudukkonäkymä'; +$lang['Time has come to update your Piwigo with version %s, go to %s'] = 'On tullut aika päivittää Piwigo versioon %s, mene %s'; +$lang['Time to send mail is limited. Others mails are skipped.'] = 'Sähköpostien lähetysaika on rajallinen. Muut viestit on ohitettu.'; +$lang['To be sure, please rewrite the word “%s” below'] = 'Varmistaaksesi kirjoita alla oleva sana ”%s” uudelleen.'; +$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'Viedäksesi valokuvasi digiKamista Piwigoon helposti, asenna digiKam ja Kipi-lisäosat.'; +$lang['To send ?'] = 'Lähetä?'; +$lang['To set your password, visit the following address:'] = 'Asettaaksesi salasanasi, käy seuraavassa osoitteessa:'; +$lang['To subscribe'] = 'Tilaa'; \ No newline at end of file diff --git a/language/fi_FI/common.lang.php b/language/fi_FI/common.lang.php index e0696c903..82d766bf9 100644 --- a/language/fi_FI/common.lang.php +++ b/language/fi_FI/common.lang.php @@ -132,8 +132,8 @@ $lang['Comments'] = 'Kommentit'; $lang['Contact'] = 'Ota yhteyttä'; $lang['created before %s (%s)'] = 'luotu ennen %s (%s)'; $lang['created on %s'] = 'Luotu %s'; -$lang['Customize'] = 'Muokkaa'; -$lang['customize the appareance of the gallery'] = 'muokkaa gallerian ulkoasua'; + + $lang['Delete'] = 'Poista'; $lang['delete all photos from your favorites'] = 'poista kaikki kuvat suosikeista'; $lang['descending'] = 'laskeva'; @@ -452,4 +452,8 @@ $lang['Albums found'] = 'Albumeita löydetty'; $lang['Albums listed here match your search by word. Click on one to browse by album.'] = 'Tässä listatut albumit vastaavat hakusanaasi. Klikkaa sellaisesta selataksesi albumeittain.'; $lang['Click here to display it'] = 'Klikkaa tästä näyttääksesi sen'; $lang['last 12 months'] = 'Viimeisimmät 12 kuukautta'; -$lang['Custom dates'] = 'Tietyt päivät'; \ No newline at end of file +$lang['Custom dates'] = 'Tietyt päivät'; +$lang['There are no creation dates available for the photos currently filtered'] = 'Nykyisen suodatuksen mukaisille kuville ei ole saatavissa luomispäiviä'; +$lang['There are no tags available for the photos currently filtered'] = 'Nykyisen suodatuksen mukaisille kuville ei ole saatavissa tageja'; +$lang['There are no authors available for the photos currently filtered'] = 'Nykyisen suodatuksen mukaisille kuville ei ole saatavissa tekijätietoja'; +$lang['Set your password below.'] = 'Aseta salasana alla.'; \ No newline at end of file diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php index 87e700fce..89a889e1b 100644 --- a/language/fr_CA/admin.lang.php +++ b/language/fr_CA/admin.lang.php @@ -41,7 +41,7 @@ $lang['Add a user'] = "Ajouter un utilisateur"; $lang['Add group'] = "Ajouter un groupe"; $lang['Add'] = "Ajouter"; $lang['Allow user registration'] = "Permettre l'enregistrement des utilisateurs"; -$lang['Apply to sub-albums'] = "Appliquer aux sous-catégories"; +$lang['Apply to sub-albums'] = 'Appliquer aux sous-albums'; $lang['Associated'] = "Associée à"; $lang['Caddie management'] = "Gestion du panier"; $lang['Caddie'] = "Panier"; @@ -87,7 +87,7 @@ $lang['Maintenance'] = "Maintenance"; $lang['Edit album permissions'] = 'Gérer les permissions pour un album'; $lang['Manage permissions for group "%s"'] = "Gérer les permissions pour le groupe \"%s\""; $lang['Manage permissions for user "%s"'] = "Gérer les permissions pour l'utilisateur \"%s\""; -$lang['Manage tags'] = "Gérer les mots clés"; +$lang['Manage tags'] = 'Gérer les mots-clés'; $lang['Members'] = "Membres"; $lang['Metadata synchronized from file'] = "Méta-données synchronisées à partir du fichier"; $lang['Move albums'] = 'Déplacer les albums'; @@ -161,7 +161,7 @@ $lang['You need to confirm deletion'] = "Vous devez confirmer la suppression"; $lang['Associate to album'] = 'Associer à l\'album'; $lang['associate to group'] = "Associer au groupe"; $lang['Authorized'] = "Autorisés"; -$lang['Add a virtual album'] = "Ajouter une catégorie virtuelle"; +$lang['Add a virtual album'] = 'Ajouter un album virtuel'; $lang['Authorize users to add comments on selected albums'] = 'Autoriser les utilisateurs à ajouter des commentaires dans les albums sélectionnées'; $lang['The name of an album must not be empty'] = 'Le nom de l\'album ne doit pas être vide'; $lang['Lock albums'] = 'Verrouiller les albums'; @@ -329,7 +329,7 @@ $lang['Update photos information'] = "Mettre à jour les informations des images $lang['Synchronize'] = "Synchroniser"; $lang['reduce to single existing albums'] = 'Traiter uniquement un album'; $lang['Choose an option'] = "Choisir une option"; -$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = "Afficher un maximum d'informations (catégories ajoutées, éléments ajoutés, catégories et éléments supprimés)"; +$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'Afficher un maximum d\'informations (albums ajoutés, éléments ajoutés, albums et éléments supprimés)'; $lang['Error list'] = "Liste des erreurs"; $lang['Errors caption'] = "Légende des erreurs"; $lang['Detailed informations'] = "Informations détaillées"; @@ -363,7 +363,7 @@ $lang['User status'] = "Statut de l'utilisateur"; $lang['user_status_admin'] = "Administrateur"; $lang['user_status_generic'] = "Générique"; $lang['user_status_guest'] = "Invité"; -$lang['user_status_normal'] = "Visiteur"; + $lang['user_status_webmaster'] = "Webmestre"; $lang['Users'] = "Utilisateurs"; $lang['Virtual album'] = 'Album virtuel'; @@ -385,7 +385,7 @@ $lang['Properties'] = "Propriétés"; $lang['An information email was sent to group "%s"'] = 'Un courriel d\'information a été envoyé aux membres du groupe "%s"'; $lang['Send an information email to group members'] = "Envoyer un courriel d'informations aux membres d'un groupe"; $lang['Group'] = "Groupe"; -$lang['[%s] Visit album %s'] = "[%s] Venez visiter la catégorie %s"; +$lang['[%s] Visit album %s'] = '[%s] Venez visiter l\'album %s'; $lang['Hello,'] = "Bonjour,"; $lang['See you soon.'] = "À bientôt."; $lang['Discover album:'] = 'Venez découvrir l\'album:'; @@ -456,7 +456,7 @@ $lang['Correction the anomaly will cancel the fact that it\'s ignored'] = "L'ano $lang['%d anomaly has been ignored.'] = "%d anomalie a été ignorée."; $lang['%d anomalies have been ignored.'] = "%d anomalies ont été ignorées."; $lang['Plugins which need upgrade'] = 'Greffons à mettre à jour'; -$lang['Plugin list'] = 'Liste des greffon'; +$lang['Plugin list'] = 'Liste des greffons'; $lang['Check for updates'] = "Rechercher les mises à jour"; $lang['Other plugins'] = "Autres plugins disponibles"; $lang['Last revisions'] = "Dernières révisions"; @@ -762,11 +762,11 @@ $lang['Manage Permissions'] = 'Gérer les permissions'; $lang['Photo %s of %s'] = 'Photo %s sur %s'; $lang['show details'] = 'montrer les détails'; $lang['hide details'] = 'cacher les détails'; -$lang['Merge tags'] = 'Fusionner les mots clés'; -$lang['Select the destination tag'] = 'Sélectionnez le mot clé de destination'; +$lang['Merge tags'] = 'Fusionner les mots-clés'; +$lang['Select the destination tag'] = 'Sélectionnez le mot-clé de destination'; $lang['(this tag will be deleted)'] = '(ce mot-clé sera supprimé)'; $lang['Confirm merge'] = 'Confirmez la fusion'; -$lang['Merge selected tags'] = 'Fusionner les mots clés sélectionnés'; +$lang['Merge selected tags'] = 'Fusionner les mots-clés sélectionnés'; $lang['No destination tag selected'] = 'Vous n\'avez pas sélectionné de mot clé de destination'; $lang['Tags %s merged into tag %s'] = 'Les mots-clés %s ont été fusionnés dans le mot clé %s'; $lang['Select at least two tags for merging'] = 'Sélectionnez au moins deux mots clés pour la fusion'; @@ -776,7 +776,7 @@ $lang['If no HD is available and if the current websize is bigger than resize di $lang['An error has occured during upgrade.'] = 'Une erreur est survenue pendant la mise à jour.'; $lang['An error has occured during extract. Please check files permissions of your piwigo installation.
    Click here to show log error.'] = 'Impossible d\'extraire les fichiers. Veuillez vérifier les permissions des fichiers de votre installation.
    Cliquez ici pour voir le rapport d\'erreur.'; $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo ne peut pas récupérer le fichier de mise à jour depuis le serveur'; -$lang['Send connection settings by email'] = 'Envoyer les identifiants par email'; +$lang['Send connection settings by email'] = 'Envoyer les identifiants par courriel'; $lang['Activate comments'] = 'Activer les commentaires'; $lang['Default comments order'] = 'Ordre par défaut des commentaires'; $lang['%s has been successfully updated.'] = '%s a été mis à jour avec succès.'; @@ -905,7 +905,7 @@ $lang['create a new site'] = 'créer un nouveau site'; $lang['No order field selected'] = 'Aucun critère de tri sélectionné'; $lang['Duplicate selected tags'] = 'Dupliquer les mots clés sélectionnés'; $lang['Name of the duplicate'] = 'Nom du duplicata'; -$lang['Source tag'] = 'Source du mot clé'; +$lang['Source tag'] = 'Source du mot-clé'; $lang['Tag "%s" is now a duplicate of "%s"'] = 'Le mot-clé "%s" est désormais une copie de "%s"'; $lang['Manage the members'] = 'Gérer les membres'; $lang['Type here the name of the new group'] = 'Inscrivez ici le nom du nouveau groupe'; @@ -931,7 +931,7 @@ $lang['between %.2f and %.2f'] = 'entre %.2f et %.2f'; $lang['Purge user cache'] = 'Purger le cache utilisateur'; $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'La tailles des images sera réduite à %dx%d pixels.'; $lang['Resize after upload disabled due to the use of GD as graphic library'] = 'Redimensionnement après transfert désactivé car GD est la librairie graphique utilisée actuellement'; -$lang['Select at least one tag'] = 'Sélectionnez au moins un mot clé'; +$lang['Select at least one tag'] = 'Sélectionnez au moins un mot-clé'; $lang['Basic settings'] = 'Paramètres de base'; $lang['General'] = 'Général'; $lang['Mail theme'] = 'Thème des courriels'; @@ -970,10 +970,10 @@ $lang['between %s and %s MB'] = 'entre %s et %s Mo'; $lang['date & time'] = 'date et heure'; $lang['file name'] = 'nom de fichier'; $lang['width & height'] = 'largeur et hauteur'; -$lang['Select tags'] = 'Sélectionner des mots clés'; +$lang['Select tags'] = 'Sélectionner des mots-clés'; $lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Chaque courriel envoyé contiendra sa propre clef d\'identification automatique sur les liens, valide %s.'; $lang['No tags selected, no actions possible.'] = 'Aucun mot-clé sélectionné, aucune action possible.'; -$lang['checksums to add'] = 'Checksums à ajouter'; +$lang['checksums to add'] = 'somme de contrôle à ajouter'; $lang['With no checksum'] = 'Sans checksums'; $lang['Some checksums are missing.'] = 'Des checksums sont manquants'; $lang['Compute %d missing checksums'] = 'Calcule %d des checksums manquants'; @@ -1012,4 +1012,13 @@ $lang['Some photos are missing from your file system. Details provided by plugin $lang['%d tags added'] = '%d mots-clés ajoutés'; $lang['%d tags deleted'] = '%d mots-clés supprimés'; $lang['%d tags edited'] = '%d mots-clés édités'; -$lang['%d tags moved'] = '%d mots-clés déplacés'; \ No newline at end of file +$lang['%d tags moved'] = '%d mots-clés déplacés'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Vous ne pouvez pas copier le mot de passe si la connexion à ce site n\'est pas sécurisée.'; +$lang['%d tag added'] = '%d mot-clé ajouté'; +$lang['%d tag deleted'] = '%d mot-clé supprimé'; +$lang['%d tag edited'] = '%d mot-clé édité'; +$lang['%d tag moved'] = '%d mot-clé déplacé'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Impossible d\'envoyer un courriel à cet utilisateur car il n\'a pas d\'adresse courriel'; +$lang['%d photos were moved from the upload lounge to their albums'] = '%d photos ont été déplacées de la salle d\'attente vers leurs albums respectifs'; +$lang['Empty lounge'] = 'Vide la salle d\'attente'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'Il y a actuellement %d photos dans salle d\'attente des transferts (lounge)'; \ No newline at end of file diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php index 0c4371697..34e8a9846 100644 --- a/language/fr_CA/common.lang.php +++ b/language/fr_CA/common.lang.php @@ -107,7 +107,7 @@ $lang['add this photo to your favorites'] = 'ajouter cette image à vos favoris' $lang['Administration'] = 'Administration'; $lang['all'] = 'tout'; $lang['ascending'] = 'croissant'; -$lang['Expand all albums'] = 'Développer toutes les catégories'; +$lang['Expand all albums'] = 'Développer toutes les albums'; $lang['posted after %s (%s)'] = 'mis en ligne après le %s (%s)'; $lang['posted before %s (%s)'] = 'mis en ligne avant le %s (%s)'; $lang['posted between %s (%s) and %s (%s)'] = 'mis en ligne entre le %s (%s) et le %s (%s)'; @@ -135,7 +135,7 @@ $lang['created after %s (%s)'] = 'créée après le %s (%s)'; $lang['created before %s (%s)'] = 'créée avant le %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'créée entre le %s (%s) et le %s (%s)'; $lang['created on %s'] = 'créée le %s'; -$lang['Customize'] = 'Personnaliser'; + $lang['Your Gallery Customization'] = 'Personnalisation de votre affichage '; $lang['day'][0] = 'Dimanche'; $lang['day'][1] = 'Lundi'; @@ -153,7 +153,7 @@ $lang['Download this file'] = 'Télécharger ce fichier'; $lang['edit'] = 'éditer'; $lang['wrong date'] = 'date erronée'; $lang['excluded'] = 'exclus'; -$lang['Your favorites'] = 'Mes favorites'; +$lang['Your favorites'] = 'Mes favoris'; $lang['display your favorites photos'] = 'afficher mes images favorites'; $lang['Favorites'] = 'Favoris'; $lang['First'] = 'Première'; @@ -164,7 +164,7 @@ $lang['Hello'] = 'Bonjour'; $lang['available for administrators only'] = 'disponible uniquement pour les administrateurs'; $lang['display this album'] = 'montre les images à la racine de cet album'; $lang['display last user comments'] = 'Voir les derniers commentaires utilisateurs'; -$lang['customize the appareance of the gallery'] = 'personnaliser l\'apparence de la galerie'; + $lang['search'] = 'recherche'; $lang['Home'] = 'Accueil'; $lang['in this album'] = 'dans cet album'; @@ -178,7 +178,7 @@ $lang['Last'] = 'Dernière'; $lang['Logout'] = 'Déconnexion'; $lang['obligatory'] = 'obligatoire'; $lang['display a calendar by creation date'] = 'afficher un calendrier par date de création'; -$lang['display all photos in all sub-albums'] = 'afficher à plat les éléments des catégories et des sous-catégories'; +$lang['display all photos in all sub-albums'] = 'afficher à plat les photos des albums et des sous-sous-albums'; $lang['return to normal view mode'] = 'retourner à la vue normale'; $lang['display a calendar by posted date'] = 'afficher un calendrier par date d\'ajout'; $lang['month'][10] = 'Octobre'; @@ -207,7 +207,7 @@ $lang['Photos posted within the last %d day.'] = 'N\'afficher que les éléments $lang['Photos posted within the last %d days.'] = 'N\'afficher que les éléments récents de moins de %d jours.'; $lang['password updated'] = 'mot de passe mis à jour'; $lang['Recent period must be a positive integer value'] = 'La période de nouveautés doit être un entier positif'; -$lang['photo'] = 'image'; +$lang['photo'] = 'photo'; $lang['Click on the photo to see it in high definition'] = 'Cliquer sur l\'image pour la visualiser en haute définition'; $lang['Show file metadata'] = 'Montrer les méta-données du fichier'; $lang['Powered by'] = 'Propulsé par'; @@ -251,7 +251,7 @@ $lang['stop the slideshow'] = 'arrêter le diaporama'; $lang['Specials'] = 'Spéciales'; $lang['SQL queries in'] = 'requêtes SQL en'; $lang['display only recently posted photos'] = 'n\'afficher que les éléments publiés récemment'; -$lang['return to the display of all photos'] = 'retourner à l\'affichage de tous les éléments'; +$lang['return to the display of all photos'] = 'retourner à l\'affichage de toutes les photos'; $lang['the beginning'] = 'le début'; $lang['Thumbnails'] = 'Miniatures'; $lang['Menu'] = 'Menu'; @@ -292,7 +292,7 @@ $lang['%d photos']='%d photos'; $lang['%d photo is also linked to current tags'] = '%d image est également liée aux mots-clés courants'; $lang['%d photos are also linked to current tags'] = '%d photos sont également liées aux mots-clés courants'; $lang['display photos linked to this tag'] = 'Voir les images liées uniquement à ce mot clé'; -$lang['photos posted during the last %d days'] = 'images ajoutées au cours des %d derniers jours'; +$lang['photos posted during the last %d days'] = 'photos ajoutées au cours des %d derniers jours'; $lang['Piwigo Help'] = 'Aide de Piwigo'; $lang['Rank'] = 'Rang'; $lang['group by letters'] = 'regrouper par lettres'; @@ -319,7 +319,7 @@ $lang['This author removed the comment with id %d'] = 'Cet auteur a supprimé le $lang['html tags are not allowed in login'] = 'les balises html ne sont pas autorisées à l\'identification'; $lang['%d rates'] = '%d notes'; $lang['Rating score'] = 'Bilan'; -$lang['Invalid username or email'] = 'Nom d\'utilisateur ou adresse de courriel invalide'; +$lang['Invalid username or email'] = 'Nom d\'utilisateur ou adresse courriel invalide'; $lang['Password reset is not allowed for this user'] = 'Le renouvellement du mot de passe n\'est pas permis pour cet utilisateur'; $lang['User "%s" has no email address, password reset is not possible'] = 'L\'utilisateur "%s" n\'a pas d\'adresse de courriel, le renouvellement du mot de passe est impossible'; $lang['Someone requested that the password be reset for the following user account:'] = 'Quelqu\'un a demandé le renouvellement de votre mot de passe pour l\'utilisateur suivant :'; @@ -413,7 +413,13 @@ $lang['Photo title'] = 'Titre de la photo'; $lang['generate random password'] = 'générer un mot de passe aléatoire'; $lang['Your authentication key is no longer valid.'] = 'Voter clé d\'identification n\'est plus valide'; $lang['Invalid username or password!'] = 'Nom d\'utilisateur ou mot de passe invalide !'; -$lang['Password: ********** (no copy by email)'] = 'Mot de passe : ********** (pas de copie par email)'; +$lang['Password: ********** (no copy by email)'] = 'Mot de passe : ********** (pas de copie par courriel)'; $lang['Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'] = 'Des filtres préétablis vous sont proposés, mais vous pouvez aussi en ajouter ou en retirer grâce au bouton "Choisir les filtres".'; $lang['Tags found'] = 'Mots-clés trouvés'; -$lang['Tags listed here match your search by word. Click on one to browse by tag.'] = 'Les mots-clés ci-dessous correspondent à votre recherche par mot. Cliquez sur l\'un d\'eux pour basculer en navigation par mots-clés.'; \ No newline at end of file +$lang['Tags listed here match your search by word. Click on one to browse by tag.'] = 'Les mots-clés ci-dessous correspondent à votre recherche par mot. Cliquez sur l\'un d\'eux pour basculer en navigation par mots-clés.'; +$lang['There are no tags available for the photos currently filtered'] = 'Aucun mot-clé n\'est disponible pour les photos actuellement filtrées'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Vous n\'avez pas d\'adresse courriel, vous ne serez donc pas notifié lorsque votre clé API sera sur le point d\'expirer.'; +$lang['An email has been sent with a link to reset your password'] = 'Un courriel a été envoyé avec un lien pour réinitialiser votre mot de passe.'; +$lang['Check your inbox'] = 'Vérifiez votre boîte de courriel'; +$lang['An email has been sent with a verification code'] = 'Un courriel contenant un code de vérification vous a été envoyé'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Si vous ne recevez pas ce courriel, veuillez contacter votre webmestre.'; \ No newline at end of file diff --git a/language/fr_CA/help_quick_search.lang.php b/language/fr_CA/help_quick_search.lang.php new file mode 100644 index 000000000..586e45feb --- /dev/null +++ b/language/fr_CA/help_quick_search.lang.php @@ -0,0 +1,9 @@ +account settings.'] = 'Vous pouvez gérer vos clés API dans les paramètres de votre compte.'; +$lang['Expert mode'] = 'Mode expert'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Si vous ne recevez pas cet e-mail, veuillez contacter votre webmaster.'; +$lang['Verification code'] = 'Code de vérification'; +$lang['Verify'] = 'Vérifier'; +$lang['Invalid verification code'] = 'Code de vérification invalide'; +$lang['Save your ID and secret'] = 'Enregistrez votre identifiant et votre secret'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Le secret ne sera plus affiché. Vous devez le copier pour continuer.'; +$lang['ID copied.'] = 'Identifiant copié.'; +$lang['Secret copied. Keep it in a safe place.'] = 'Secret copié. Gardez-le dans un endroit sûr.'; +$lang['edit user preferences'] = 'modifier les préférences utilisateur'; +$lang['Here is your verification code:'] = 'Voici votre code de vérification :'; +$lang['Your verification code'] = 'Votre code de vérification'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Si ce n\'était pas vous, veuillez changer immédiatement votre mot de passe ou contacter votre webmaster.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Si vous avez changé votre mot de passe car vous pensez qu\'il a été volé, nous vous recommandons de révoquer vos %d clefs d\'API sur votre profil.'; +$lang['Too many attempts, please try later..'] = 'Trop de tentatives, veuillez réessayer plus tard..'; +$lang['Verification successful! You can now choose a new password.'] = 'Vérification réussie ! Vous pouvez maintenant choisir un nouveau mot de passe.'; +$lang['If your account exists, a verification code has been sent to your email address.'] = 'Si votre compte existe, un code de vérification a été envoyé à votre adresse email.'; diff --git a/language/fr_FR/help_quick_search.lang.php b/language/fr_FR/help_quick_search.lang.php new file mode 100644 index 000000000..92e57490c --- /dev/null +++ b/language/fr_FR/help_quick_search.lang.php @@ -0,0 +1,58 @@ +%d+ albums found, try to refine the search'] = '%d+ אלבומים נמצאו, נסה לחדד את החיפוש'; +$lang['%d albums found'] = '%d אלבומים נמצאו'; +$lang['%d filtered user'] = '%d משתמש מסונן'; +$lang['%d filtered users'] = '%d משתמשים מסוננים'; +$lang['%d tag found'] = '%d תג נמצא'; +$lang['%d tag selected'] = '%d תג נבחר'; +$lang['%d tags found'] = '%d תגים נמצאו'; +$lang['1 album found'] = '1 אלבום נמצא'; +$lang['Activate button "%s"'] = 'הפעל כפתור "%s"'; +$lang['Activate create mode to create and select an album'] = 'הפעל מצב יצירה כדי ליצור ולבחור אלבום'; +$lang['Activated'] = 'הופעל'; +$lang['Activated plugin list'] = 'רשימת התוספים שהופעלו'; +$lang['Activity'] = 'פעילות'; +$lang['%sMB'] = '%s MB'; +$lang['%s status is required to edit parameters.'] = 'סטטוס %s דרוש כדי לערוך פרמטרים'; +$lang['%s pixels, %.2f MB'] = '%s פיקסלים, %.2f MB'; +$lang['%s MB'] = '%s MB'; +$lang['%s MB used'] = '%s MB בשימוש'; +$lang['%s GB used'] = '%s GB בשימוש'; +$lang['%sGB'] = '%s GB'; +$lang['%d tags moved'] = '%d תגים הוזזו'; +$lang['%d user added'] = '%d משתמש נוסף'; +$lang['%d user edited'] = '%d משתמש נערך'; +$lang['%d user logged in'] = '%d משתמש התחבר'; +$lang['%d user logged out'] = '%d משתמש נותק'; +$lang['%d users added'] = '%d משתמשים נוספו'; +$lang['%d users edited'] = '%d משתמשים נערכו'; +$lang['%d users logged in'] = '%d משתמשים התחברו'; +$lang['%d users logged out'] = '%d משתמשים נותקו'; +$lang['%s file type'] = '%s סוג קובץ'; +$lang['%s is the new main user'] = '%s הוא המשתמש הראשי החדש'; +$lang['%s line'] = '%s שורה'; +$lang['%s lines'] = '%s שורות'; +$lang['%s other tags available..'] = '%s תגים נוספים זמינים'; +$lang['%s plugin found'] = '%s תוסף נמצא'; +$lang['%s plugins found'] = '%s תוספים נמצאו'; +$lang['%d in whole branch'] = '%d בכל הענף'; +$lang['%d including sub-albums'] = '%d כולל תתי-אלבומים'; +$lang['%d photo added'] = '%d תמונה נוספה'; +$lang['%d photo deleted'] = '%d תמונה נמחקה'; +$lang['%d photo edited'] = '%d תמונה נערכה'; +$lang['%d photo moved'] = '%d תמונה הוזזה'; +$lang['%d photos'] = '%d תמונות'; +$lang['%d photos added'] = '%d תמונות נוספו'; +$lang['%d photos deleted'] = '%d תמונות נמחקו'; +$lang['%d photos edited'] = '%d תמונות נערכו'; +$lang['%d photos moved'] = '%d תמונות הוזזו'; +$lang['%d pictures in sub-albums'] = '%d תמונות בתתי-אלבומים'; +$lang['%d sub-albums'] = '%d תתי-אלבומים'; +$lang['%d tag added'] = '%d תגית נוספה'; +$lang['%d tag deleted'] = '%d תגית נמחקה'; +$lang['%d tag edited'] = '%d תגית נערכה'; +$lang['%d tag moved'] = '%d תגית הוזזה'; +$lang['%d tags added'] = '%d תגיות נוספו'; +$lang['%d tags deleted'] = '%d תגיות נמחקו'; +$lang['%d tags edited'] = '%d תגיות נערכו'; +$lang[' (copy %s)'] = '(העתק %s)'; +$lang[' (copy)'] = '(העתק)'; +$lang['%d Activities'] = '%d פעילויות'; +$lang['%d Activity'] = '%d פעילות'; +$lang['%d album added'] = '%d אלבום נוסף'; +$lang['%d album deleted'] = '%d אלבום נמחק'; +$lang['%d album edited'] = '%d אלבום נערך'; +$lang['%d albums added'] = '%d אלבומים נוספים'; +$lang['%d albums deleted'] = '%d אלבומים נמחקים'; +$lang['%d albums edited'] = '%d אלבומים נערכו'; +$lang['%d files'] = '%d קבצים'; +$lang['%d formats uploaded for %d photos'] = '%d פורמטים הועלו עבור %d תמונות'; +$lang['%d group added'] = '%d קבוצה נוספה'; +$lang['%d group deleted'] = '%d קבוצה נמחקה'; +$lang['%d group edited'] = '%d קבוצה נערכה'; +$lang['%d group moved'] = '%d קבוצה הוזזה'; +$lang['%d groups added'] = '%d קבוצות נוספו'; +$lang['%d groups deleted'] = '%d קבוצות נמחקו'; +$lang['%d groups edited'] = '%d קבוצות נערכו'; +$lang['%d groups moved'] = '%d קבוצות הוזזו'; +$lang['since the beginning'] = 'מההתחלה'; +$lang['to'] = 'אל'; +$lang['was succesfully deleted'] = 'נמחק בהצלחה'; +$lang['action successfully performed.'] = 'הפעולה בוצעה בהצלחה.'; +$lang['add'] = 'הוסף'; +$lang['and %d more'] = 'ועוד %d'; +$lang['and %s others'] = 'ועוד %s אחרים'; +$lang['between %d and %d'] = 'בין %d ל-%d'; +$lang['between %s and %s'] = 'בין %s ל-%s'; +$lang['calculated'] = 'חושבו'; +$lang['deletion'] = 'מחיקה'; +$lang['edit'] = 'ערוך'; +$lang['image(s) contains unsaved changes'] = 'התמונה(ות) מכילה שינויים שלא נשמרו'; +$lang['in administration'] = 'בניהול'; +$lang['in gallery'] = 'בגלריה'; +$lang['level of confidentiality'] = 'רמת סודיות'; +$lang['login'] = 'התחברות'; +$lang['logout'] = 'התנתקות'; +$lang['months ago'] = 'חודשים'; +$lang['move'] = 'העבר'; +$lang['never calculated'] = 'מעולם לא חושב'; +$lang['no photo'] = 'אין תמונה'; +$lang['right now'] = 'ברגע זה'; +$lang['Group(s) \{%s1\} succesfully merged into "%s2"'] = 'הקבוצות {\%s1}\ אוחדו בהצלחה ל-"%s2"'; +$lang['Groups \{%s\} succesfully deleted'] = 'הקבוצות {\%s}\ נמחקו בהצלחה'; +$lang['Webmaster status required'] = 'נדרש מעמד Webmaster'; +$lang['What\'s new in version %s'] = 'מה חדש בגרסה %s?'; +$lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'בעת שחזור התוסף, הוא יתאפס לפרמטרים המקוריים ונתונים משויכים יתאפסו'; +$lang['Who can see ?'] = 'מי יכול לראות?'; +$lang['Yes, I am sure'] = 'כן, אני בטוח'; +$lang['Yes, delete'] = 'כן, למחוק'; +$lang['Yes, let\'s proceed'] = 'כן, נמשיך'; +$lang['Yes, rename'] = 'כן, לשנות שם'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'אתה עומד להגדיר את %s כמשתמש הראשי במקום %s, האם ברצונך להמשיך?'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'אינך מורשה לשנות את המשתמש הראשי, אנא פנה למנהל האתר שלך'; +$lang['You can now change the main user from %s to %s.'] = 'כעת תוכל לשנות את המשתמש הראשי מ-%s ל-%s.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'אינך יכול להעתיק את הסיסמה אם החיבור לאתר זה אינו מאובטח.'; +$lang['You don\'t have access to this photo'] = 'אין לך גישה לתמונה זו'; +$lang['You have %d orphan tags %s'] = 'יש לך %d תגיות יתומות %s'; +$lang['You have %s inactive plugins'] = 'יש לך %s תוספים לא פעילים'; +$lang['You have %s1 orphan : %s2'] = 'יש לך %s1 יתום: %s2'; +$lang['You have unsaved changes'] = 'יש לך שינויים שלא נשמרו'; +$lang['Your selection'] = 'הבחירה שלך'; +$lang['Unlocked album'] = 'אלבום נפתח'; +$lang['Unset as group for new users'] = 'הסר כקבוצה עבור משתמשים חדשים'; +$lang['Update'] = 'עדכן'; +$lang['Upload Formats'] = 'העלאת פורמטים'; +$lang['User "%s" dissociated from this group'] = 'המשתמש "%s" הופרד מקבוצה זו'; +$lang['User associated'] = 'המשתמש שוייך'; +$lang['User updated'] = 'המשתמש עודכן'; +$lang['Username successfully modified'] = 'שם המשתמש שונה בהצלחה'; +$lang['Users not logged in will have these settings applied, these settings are used by default for new users'] = 'המשתמשים שלא מחוברים יזכו בהגדרות אלה, הגדרות אלו משומשות כברירת מחדל עבור משתמשים חדשים'; +$lang['Version %s'] = 'גרסה %s'; +$lang['Videos'] = 'סרטונים'; +$lang['Visit history'] = 'היסטוריית ביקורים'; +$lang['Visited'] = 'ביקרו'; +$lang['There is multiple image in the database with the following names : %s.'] = 'יש מספר תמונות בבסיס הנתונים עם השמות הבאים: %s.'; +$lang['This album is currently locked, visible only to administrators.'] = 'האלבום הזה נעול כרגע, וניתן לראותו רק על ידי מנהלים.'; +$lang['This albums is already in related categories list'] = 'האלבום הזה כבר ברשימת אלבומים קשורים'; +$lang['This is already the default theme'] = 'זה כבר העיצוב ברירת המחדל'; +$lang['This photo is an orphan'] = 'התמונה הזו היא יתומה'; +$lang['This photo no longer exists'] = 'התמונה הזו כבר לא קיימת'; +$lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'תמונה זו מחוברת פיזית לאלבום הזה, אינך יכול להפריד ביניהם.'; +$lang['This plugin has no recent update'] = 'לתוסף הזה אין עדכון אחרון'; +$lang['This plugin have been updated recently'] = 'התוסף הזה עודכן לאחרונה'; +$lang['This plugin have no update since 3 years ! It may be outdated'] = 'לתוסף הזה אין עדכון כבר 3 שנים! ייתכן שהוא מיושן'; +$lang['This plugin is incompatible with your version'] = 'התוסף הזה אינו תואם לגרסה שלך'; +$lang['This plugin was updated less than 6 months ago'] = 'התוסף הזה עודכן לפני פחות מ-6 חודשים'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'המשתמש הזה חייב להיות מוגדר קודם כל כמנהל האתר לפני שניתן לשדרגו למשתמש הראשי'; +$lang['Tile View'] = 'תצוגת ריבועים'; +$lang['To be sure, please rewrite the word “%s” below'] = 'כדי להיות בטוח, אנא כתוב מחדש את המילה "%s" למטה'; +$lang['Try now !'] = 'נסה עכשיו!'; +$lang['Understood, do not show again'] = 'הבנתי, אל תראה שוב'; +$lang['Unlock it'] = 'פתח אותו'; +$lang['Showing %s users out of %s'] = 'מציג %s משתמשים מתוך %s'; +$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'חלק מהתמונות חסרות ממערכת הקבצים שלך. פרטים מסופקים על ידי התוסף Check Uploads'; +$lang['Storage'] = 'אחסון'; +$lang['Synchronization'] = 'סנכרון'; +$lang['System Activities'] = 'פעילויות מערכת'; +$lang['Tag "%s" created'] = 'התג "%s" נוצר'; +$lang['Tag "%s" succesfully deleted'] = 'התג "%s" נמחק בהצלחה'; +$lang['Tag "%s1" renamed in "%s2"'] = 'התג "%s1" שונה ל-"%s2"'; +$lang['Tag Manager'] = 'מנהל תגים'; +$lang['Tag name'] = 'שם תג'; +$lang['Tags \{%s\} succesfully deleted'] = 'התגים {\%s}\ נמחקו בהצלחה'; +$lang['The %d tags on this page are selected'] = 'התגים %d בדף זה נבחרו'; +$lang['The best is to have them made automatically on a regular basis.'] = 'הכי טוב שיהיו מיוצרים אוטומטית באופן קבוע'; +$lang['The original picture will be detected with the filename (without extension).'] = 'התמונה המקורית תזוהה לפי שם הקובץ (ללא סיומת).'; +$lang['The other tags will be removed'] = 'התגים האחרים יוסרו'; +$lang['The passwords do not match'] = 'הסיסמאות אינן תואמות'; +$lang['Theme'] = 'עיצוב'; +$lang['Tag(s) \{%s1\} succesfully merged into "%s2"'] = 'התג(ים) {\%s1}\ מוזגו בהצלחה ל-"%s2"'; +$lang['Select groups or type them'] = 'בחר קבוצות או הקלד אותן'; +$lang['Select or create an album'] = 'בחר או צור אלבום'; +$lang['Selected user'] = 'משתמש נבחר'; +$lang['Selection mode'] = 'מצב בחירה'; +$lang['Sep'] = 'ספטמבר'; +$lang['Set as default'] = 'הגדר כברירת מחדל'; +$lang['Set as group for new users'] = 'הגדר כקבוצה למשתמשים חדשים'; +$lang['Set as main user'] = 'הגדר כמשתמש הראשי'; +$lang['Show'] = 'הצג'; +$lang['Show beta test plugins'] = 'הצג תוספים בבדיקת בטא'; +$lang['Show inactive plugins'] = 'הצג תוספים שאינם פעילים'; +$lang['Show plugins compatible with previous version of Piwigo'] = 'הצג תוספים תואמים לגרסה קודמת של Piwigo'; +$lang['Show sub-albums'] = 'הצג תתי-אלבומים'; +$lang['Shrink'] = 'צמצם'; +$lang['Put at the root'] = 'שמור בשורש'; +$lang['Rating greater than'] = 'דירוג גבוה מ'; +$lang['Read the release note'] = 'קרא את הערות הגירסה'; +$lang['Refresh thumbnail'] = 'רענן תמונת תצוגה'; +$lang['Registered'] = 'נרשם'; +$lang['Remove thumbnail'] = 'הסר תמונת תצוגה'; +$lang['Rename "%s"'] = 'שנה שם ל "%s"'; +$lang['Requires PHP %s'] = 'דורש PHP %s'; +$lang['Resend password link'] = 'שלח קישור לאיפוס סיסמה'; +$lang['Restored'] = 'שוחזר'; +$lang['Review'] = 'סקירה'; +$lang['Root'] = 'שורש'; +$lang['Save'] = 'שמור'; +$lang['Search albums'] = 'חפש אלבומים'; +$lang['Search tips'] = 'טיפים לחיפוש'; +$lang['Select'] = 'בחר'; +$lang['Select all %d tags'] = 'בחר את כל תגי %d'; +$lang['Select an album... or type it!'] = 'בחר אלבום... או הקלד אותו!'; +$lang['Pagination has changed and needs to be reloaded !'] = 'הדפדוף השתנה ויש לטעון מחדש!'; +$lang['Password copied'] = 'הסיסמה הועתקה'; +$lang['Photos per page'] = 'תמונות לעמוד'; +$lang['Picture to associate formats with'] = 'תמונה כדי לקשר פורמטים איתה'; +$lang['Piwigo core'] = 'ליבת Piwigo'; +$lang['Piwigo is also on mobile.'] = 'Piwigo זמין גם במובייל.'; +$lang['Place first'] = 'מקום ראשון'; +$lang['Place last'] = 'מקום אחרון'; +$lang['Please complete all fields'] = 'אנא מלא את כל השדות'; +$lang['Please upgrade your PHP version before any update.'] = 'אנא עדכן את גרסת ה-PHP שלך לפני כל עדכון.'; +$lang['Plugin "%s" deleted!'] = 'התוסף "%s" נמחק!'; +$lang['Plugin "%s" has been activated!'] = 'התוסף "%s" הופעל!'; +$lang['Portraits'] = 'דיוקנאות'; +$lang['Posted %s'] = 'פורסם %s'; +$lang['Promote mobile app on mobile devices'] = 'קדם את אפליקציית המובייל במכשירים ניידים'; +$lang['Properties of abums'] = 'מאפיינים של אלבומים'; +$lang['Purge Actions'] = 'ניקוי פעולות'; +$lang['Purge Cache'] = 'ניקוי מטמון'; +$lang['No format for this picture'] = 'אין פורמט לתמונה זו'; +$lang['No picture found with the following name : %s.'] = 'לא נמצאה תמונה עם השם הבא: %s.'; +$lang['No plugin activated'] = 'אין תוסף מופעל'; +$lang['No plugins found'] = 'לא נמצאו תוספים'; +$lang['No research in progress'] = 'אין חיפוש בתהליך'; +$lang['No search in progress'] = 'אין חיפוש בתהליך'; +$lang['No tag found'] = 'לא נמצא תג'; +$lang['No, I have changed my mind'] = 'לא, שיניתי את דעתי'; +$lang['Nov'] = 'נובמבר'; +$lang['Object'] = 'אובייקט'; +$lang['Oct'] = 'אוקטובר'; +$lang['Ok, got it!'] = 'אוקי, הבנתי!'; +$lang['On %d rating(s)'] = 'על %d דירוגים'; +$lang['Only admins in a specific group'] = 'רק מנהלים בקבוצה מסוימת'; +$lang['Open in gallery'] = 'פתח בגלריה'; +$lang['Other'] = 'אחר'; +$lang['Page Visited'] = 'דף נראה'; +$lang['Page Visited in %s'] = 'דף נראה ב %s'; +$lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'אלבומים נעולים מושבתים לתחזוקה. רק מנהלי המערכת יכולים לראות אותם בגלריה. נעילת אלבום זה תנעול גם את תתי-האלבומים שלו.'; +$lang['Main user'] = 'משתמש ראשי'; +$lang['Manage album photos'] = 'ניהול תמונות אלבום'; +$lang['Manage sub-albums'] = 'ניהול תמונות אלבום'; +$lang['Manage users'] = 'ניהול משתמשים'; +$lang['Manage users with user manager'] = 'ניהול משתמשים עם מנהל משתמשים'; +$lang['Mar'] = 'מרץ'; +$lang['May'] = 'מאי'; +$lang['Memories'] = 'מזכרות'; +$lang['Merge'] = 'מזג'; +$lang['Metadata sync complete'] = 'סנכרון מטה-נתונים הושלם'; +$lang['Modified'] = 'שונה'; +$lang['More information'] = 'מידע נוסף'; +$lang['Name field must not be empty'] = 'שדה השם לא יכול להיות ריק'; +$lang['Name is already taken'] = 'שם כבר תפוס'; +$lang['New user added'] = 'משתמש חדש נוסף'; +$lang['No access to administration, can see private content with appropriate permissions.'] = 'אין גישה לממשק ניהול, יכול לראות תוכן פרטי עם הרשאות מתאימות'; +$lang['No albums found'] = 'לא נמצאו אלבומים'; +$lang['A photo library administrator has created the following account for you:'] = 'מנהל ספריית התמונות יצר עבורך את החשבון הבא:'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'קישור להפעלה בתוקף ל-%s נשלח אל "%s". אם לא קיבלת את הקישור, ניתן ליצור קישור חדש ולהעתיק אותו על ידי עריכת המשתמש וניהול הסיסמה שלו.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'קישור להפעלה בתוקף ל-%s נוצר אך לא נשלח. כעת תוכל להעתיק את הקישור למטה ולשלוח אותו למשתמש.'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'הקישור הזה תקף למשך %s. לאחר מכן, תצטרך לבקש קישור חדש.'; +$lang['To set your password, visit the following address:'] = 'כדי להגדיר את הסיסמה שלך, בקר בכתובת הבאה:'; +$lang['Welcome to %s'] = 'ברוכים הבאים ל %s'; +$lang['We have found %d duplicate paths. Details provided by plugin Check Uploads'] = 'נמצאו %d נתיבים כפולים. פרטים ניתנו על ידי התוסף Check Uploads'; +$lang['%d photos were moved from the upload lounge to their albums'] = '%d תמונות הועברו מחדר ההעלאות לאלבומים שלהן'; +$lang['Are you sure you want to delete "%d" comments?'] = 'האם אתה בטוח שברצונך למחוק "%d" תגובות?'; +$lang['Are you sure you want to delete comment #%s?'] = 'האם אתה בטוח שברצונך למחוק את התגובה מספר #%s?'; +$lang['Empty lounge'] = 'חדר ההעלאות ריק'; +$lang['If a photo in this album has the same filename, update the file without changing the photo\'s properties'] = 'אם יש תמונה באלבום זה עם אותו שם קובץ, עדכן את הקובץ ללא שינוי תכונות התמונה'; +$lang['No comments selected, no actions possible.'] = 'לא נבחרו תגובות, אין אפשרות לבצע פעולות.'; +$lang['Save all photos'] = 'שמור את כל התמונות'; +$lang['The comment has been validated.'] = 'התגובה אושרה.'; +$lang['The comments have been validated.'] = 'התגובות אושרו.'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'כרגע יש %d תמונות בחדר ההעלאות (מטמון העלאה)'; +$lang['Use standard Piwigo template for common pages.'] = 'השתמש בתבנית פיוויגו הסטנדרטית לדפים משותפים.'; +$lang['When enabled, a common template is used for the login, registration and forgotten password pages, regardless of the theme. Some themes might use these templates even if you uncheck this option'] = 'כאשר מופעל, תבנית משותפת משמשת לדפי התחברות, הרשמה ושחזור סיסמה, ללא קשר לערכת הנושא. ייתכן שחלק מהערכות ישתמשו בתבניות אלו גם אם אתה מבטל את האפשרות הזו.'; +$lang['Admins only'] = 'רק מנהלים'; \ No newline at end of file diff --git a/language/he_IL/common.lang.php b/language/he_IL/common.lang.php index 8f31764fd..e402d0b20 100644 --- a/language/he_IL/common.lang.php +++ b/language/he_IL/common.lang.php @@ -37,7 +37,6 @@ $lang['%d new users'] = "%d משתמשים חדשים"; $lang['About'] = 'אודות'; $lang['All tags'] = 'כל התגיות'; $lang['Any tag'] = 'תגית כלשהי'; -$lang['At least one listed rule must be satisfied.'] = 'לפחות קריטריון אחד מצויין פה חייב להתקיים.'; $lang['Author'] = 'יוצר'; $lang['Albums'] = 'אלבומים'; $lang['Album'] = 'אלבום'; @@ -53,7 +52,6 @@ $lang['Creation date'] = "תאריך יצירה"; $lang['Current password is wrong'] = 'סיסמא שגויה'; $lang['Dimensions'] = "מימדים"; $lang['Display'] = 'תצוגה'; -$lang['Each listed rule must be satisfied.'] = 'כל קריטריון ברשימה חייב להתמלא.'; $lang['Email address'] = "כתובת דואר אלקטרוני"; $lang['Enter your personnal informations'] = "הזן את הנתונים האישיים שלך"; $lang['Error sending email'] = "שגיאה בעת שליחת דואר אלקטרוני"; @@ -86,7 +84,6 @@ $lang['Registration'] = "הרשמה"; $lang['Related tags'] = 'תגיות קשורות'; $lang['Reset'] = 'אפס'; $lang['Retrieve password'] = 'שחזר את הסיסמא'; -$lang['Search rules'] = 'קריטריוני חיפוש'; $lang['Search tags'] = 'חפש תגיות'; $lang['Search'] = "חיפוש"; $lang['display available tags'] = 'הצג תגיות קיימות'; @@ -108,7 +105,6 @@ $lang['add this photo to your favorites'] = 'הוסף תמונה זאת למוע $lang['Administration'] = 'ניהול אדמינים'; $lang['all'] = 'הכול'; $lang['ascending'] = 'עולה'; -$lang['author(s) : %s'] = 'יוצר/ים: %s'; $lang['Expand all albums'] = 'הרחב את כל האלבומים'; $lang['posted after %s (%s)'] = 'פורסם אחרי %s (%s)'; $lang['posted before %s (%s)'] = 'פורסם לפני %s (%s)'; @@ -137,7 +133,7 @@ $lang['created after %s (%s)'] = 'נוצר אחרי %s (%s)'; $lang['created before %s (%s)'] = 'נוצר לפני %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'נוצר בין %s (%s) ל %s (%s)'; $lang['created on %s'] = 'נוצר ב %s'; -$lang['Customize'] = 'התאמה אישית'; + $lang['Your Gallery Customization'] = 'התאמה אישית של הגלריה שלך'; $lang['day'][0] = "יום ראשון"; $lang['day'][1] = "יום שני"; @@ -166,7 +162,7 @@ $lang['Hello'] = 'שלום'; $lang['available for administrators only'] = 'זמין לאדמינים בלבד'; $lang['display this album'] = 'הצג אלבום זה'; $lang['display last user comments'] = 'הצג את תגובות המשתמשים האחרונות'; -$lang['customize the appareance of the gallery'] = 'התאם אישית את מראה הגלריה'; + $lang['search'] = 'חפש'; $lang['Home'] = 'בית'; $lang['Identification'] = "הזדהה"; @@ -241,7 +237,6 @@ $lang['Search for any term'] = 'חפש לפי תנאי כלשהו'; $lang['Empty query. No criteria has been entered.'] = "שאילתה ריקה. לא הוכנסו קריטריונים."; $lang['Search results'] = 'תוצאות חיפוש'; $lang['Search in sub-albums'] = 'חפש באלבומי המשנה'; -$lang['searched words : %s'] = 'מילים לחיפוש : %s'; $lang['Contact'] = "צור קשר"; $lang['set as album representative'] = 'בחר כצלמית אלבום'; $lang['Show number of comments'] = "הראה מספר תגובות"; @@ -421,3 +416,122 @@ $lang['day']['6'] = 'שבת'; $lang['Your authentication key is no longer valid.'] = 'מפתח האימות שלך אינו תקף יותר.'; $lang['generate random password'] = 'ייצר סיסמא אקראית'; $lang['Invalid username or password!'] = 'שם משתמש או סיסמא שגויים!'; +$lang['last 24 hours'] = '24 השעות האחרונות'; +$lang['last 3 months'] = '3 החודשים האחרונים'; +$lang['last 30 days'] = '30 הימים האחרונים'; +$lang['last 6 months'] = '6 החודשים האחרונים'; +$lang['last 7 days'] = '7 הימים האחרונים'; +$lang['last year'] = 'שנה שעברה'; +$lang['rating score %s'] = 'ציון דירוג %s'; +$lang['year %d'] = 'שנה %d'; +$lang['Pages'] = 'עמודים'; +$lang['Password: ********** (no copy by email)'] = 'סיסמה: ********** (אין העתקה באמצעות אימייל)'; +$lang['Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'] = 'מסננים שהוגדרו מראש מוצעים, אך ניתן להוסיף או להסיר אותם באמצעות כפתור "בחר מסננים".'; +$lang['Related albums'] = 'אלבומים קשורים'; +$lang['Search in :'] = 'חפש ב:'; +$lang['Search in this set'] = 'חפש בקבוצה זו'; +$lang['Start-Date'] = 'תאריך התחלה'; +$lang['Tags found'] = 'תגיות שנמצאו'; +$lang['Tags listed here match your search by word. Click on one to browse by tag.'] = 'התגיות המופיעות כאן תואמות את החיפוש לפי מילה. לחץ על אחת כדי לעיין לפי תגית.'; +$lang['The PDF you requested is too large to display on this page.'] = 'ה-PDF שביקשת גדול מדי להצגה בעמוד זה.'; +$lang['There are no authors available for the photos currently filtered'] = 'אין מחברים זמינים עבור התמונות שמוצגות כרגע'; +$lang['There are no creation dates available for the photos currently filtered'] = 'אין תאריכי יצירה זמינים עבור התמונות המוצגות כרגע'; +$lang['There are no tags available for the photos currently filtered'] = 'אין תגיות זמינות עבור התמונות המוצגות כרגע'; +$lang['Unknown time period'] = 'תקופת זמן לא ידועה'; +$lang['You can try to edit your filters and perform a new search.'] = 'תוכל לנסות לערוך את המסננים ולבצע חיפוש חדש.'; +$lang['last 12 months'] = '12 החודשים האחרונים'; +$lang['%d visits'] = '%d ביקורים'; +$lang['Added by'] = 'נוסף על ידי'; +$lang['Album already selected'] = 'האלבום כבר נבחר'; +$lang['Album description'] = 'תיאור האלבום'; +$lang['Album title'] = 'כותרת האלבום'; +$lang['Albums found'] = 'אלבומים נמצאו'; +$lang['Albums listed here match your search by word. Click on one to browse by album.'] = 'האלבומים המופיעים כאן תואמים את החיפוש לפי מילה. לחץ על אחד כדי לעיין לפי אלבום.'; +$lang['Cancel'] = 'בטל'; +$lang['Choose filters'] = 'בחר מסננים'; +$lang['Clear'] = 'נקה'; +$lang['Click here to display it'] = 'לחץ כאן כדי להציג'; +$lang['Custom dates'] = 'תאריכים מותאמים אישית'; +$lang['File type'] = 'סוג קובץ'; +$lang['Fill in the filters to start a search'] = 'מלא את המסננים כדי להתחיל חיפוש'; +$lang['Filters'] = 'מסננים'; +$lang['No results are available.'] = 'אין תוצאות זמינות.'; +$lang['Only the first %d albums are displayed, out of %d.'] = 'רק %d האלבומים הראשונים מוצגים, מתוך %d.'; +$lang['Album name, 1 → 5 → 10 → 100'] = 'שם אלבום, 1 → 5 → 10 → 100'; +$lang['Album name, 100 → 10 → 5 → 1'] = 'שם אלבום, 100 → 10 → 5 → 1'; +$lang['Empty filters'] = 'נקה סינון'; +$lang['Validate'] = 'אמת'; +$lang['Set your password below.'] = 'הגדירו סיסמתכם מטה.'; +$lang['Your API key will expire in %d day.'] = 'מפתח ה-API שלך יפוג בעוד %d יום.'; +$lang['Your API key will expire in %d days.'] = 'מפתח ה-API שלך יפוג בעוד %d ימים.'; +$lang['Your API key will expire soon'] = 'מפתח ה-API שלך עומד לפוג בקרוב'; +$lang['Your changes have been applied.'] = 'השינויים שלך הוחלו.'; +$lang['Your password was successfully reset'] = 'הסיסמה שלך אופסה בהצלחה'; +$lang['Your password was successfully set'] = 'הסיסמה שלך הוגדרה בהצלחה'; +$lang['must not be empty'] = 'אסור שיהיה ריק'; +$lang['you must choose a date'] = 'עליך לבחור תאריך'; +$lang['Options'] = 'אפשרויות'; +$lang['Return to Sign in'] = 'חזור אלהתחברות'; +$lang['Return to the gallery'] = 'חזור לגלריה'; +$lang['Revoke'] = 'בטל הרשאה'; +$lang['Revoked'] = 'בוטלה ההרשאה'; +$lang['Set my password'] = 'קבע את הסיסמה שלי'; +$lang['Show expired keys'] = 'הצג מפתחות שפגו'; +$lang['The api key has been successfully created.'] = 'מפתח ה-API נוצר בהצלחה.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'הדוא"ל %s ישמש להודעה אליך כאשר מפתח ה-API שלך עומד לפוג.'; +$lang['The secret key can no longer be displayed.'] = 'לא ניתן עוד להציג את מפתח הסוד.'; +$lang['This API key was manually revoked on %s'] = 'מפתח ה-API הזה בוטל ידנית ב-%s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'כדי להמשיך להשתמש ב-API, נא לחדש את מפתחך לפני שיפוג.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'כדי לנהל את מפתחות ה-API שלך, אנא התחבר עם שם המשתמש/סיסמה שלך.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'כאשר מופעל, תבנית משותפת נמצאת בשימוש עבור דפי ההתחברות וההרשמה, ללא קשר לערכת הנושא.'; +$lang['You can manage your API keys in your account settings.'] = 'באפשרותך לנהל את מפתחות ה-API שלך בהגדרות החשבון שלך.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'אין לך כתובת דוא"ל, ולכן לא תקבל הודעה כאשר מפתח ה-API שלך עומד לפוג.'; +$lang['Custom date'] = 'תאריך מותאם אישית'; +$lang['Do you really want to revoke the "%s" API key?'] = 'האם אתה באמת רוצה לבטל את מפתח ה-API "%s"?'; +$lang['Don\'t have an account yet ?'] = 'עדיין אין לך חשבון?'; +$lang['Done'] = 'גמור'; +$lang['Duration'] = 'משך זמן'; +$lang['Edit API Key'] = 'ערוך מפתח API'; +$lang['Expert mode'] = 'מצב מומחה'; +$lang['Expired'] = 'פג תוקף'; +$lang['Expired on'] = 'פג תוקף בתאריך'; +$lang['Expires in'] = 'פג תוקף בעוד'; +$lang['Generate API Key'] = 'צור מפתח API'; +$lang['Generate key'] = 'צור מפתח'; +$lang['Hello %s, enter your new password below.'] = 'שלום%s, הזן את סיסמתך החדשה למטה.'; +$lang['Hide expired keys'] = 'הסתר מפתחות שפג תוקפם'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'בלתי אפשרי להעתיק אוטומטית. אנא העתק באופן ידני.'; +$lang['Last use'] = 'שימוש אחרון'; +$lang['Manage your account'] = 'נהל את חשבונך'; +$lang['Never'] = 'לעולם'; +$lang['New API Key'] = 'מפתח API חדש'; +$lang['No expiration'] = 'ללא תוקף'; +$lang['3xlarge'] = '3XL - ענק מאוד'; +$lang['4xlarge'] = '4XL - עצום'; +$lang['API Key has been successfully edited.'] = 'מפתח API נערך בהצלחה.'; +$lang['API Key has been successfully revoked.'] = 'מפתח API בוטל בהצלחה.'; +$lang['API Key name'] = 'שם מפתח API'; +$lang['API Key not found'] = 'מפתח API לא נמצא'; +$lang['API Keys'] = 'מפתחות API'; +$lang['Account'] = 'חשבון'; +$lang['Already have an account ?'] = 'כבר יש לך חשבון?'; +$lang['An email has been sent with a link to reset your password'] = 'נשלח אימייל עם קישור לאיפוס הסיסמה שלך'; +$lang['An error has occured please got back to Sign in or Register'] = 'אירעה שגיאה, אנא חזור להתחברות או הרשמה'; +$lang['Change your password'] = 'שנה את הסיסמה שלך'; +$lang['Check your inbox'] = 'בדוק את תיבת הדואר שלך'; +$lang['Choose how you want to see your gallery'] = 'בחר כיצד ברצונך לראות את הגלריה שלך'; +$lang['Confirm my new password'] = 'אשר את הסיסמה החדשה שלי'; +$lang['Confirm new password'] = 'אשר סיסמה חדשה'; +$lang['Create API Keys to secure your acount'] = 'צור מפתחות API כדי לאבטח את חשבונך'; +$lang['Create a new API key to secure your account.'] = 'צור מפתח API חדש כדי לאבטח את חשבונך.'; +$lang['Create an account'] = 'צור חשבון'; +$lang['Created at'] = 'נוצר בתאריך'; +$lang['An email has been sent with a verification code'] = 'נשלחה הודעת דוא"ל עם קוד אימות'; +$lang['ID copied.'] = 'המזהה הועתק.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'אם אינך מקבל את הדוא"ל, נא ליצור קשר עם מנהל האתר שלך.'; +$lang['Invalid verification code'] = 'קוד אימות לא חוקי'; +$lang['Save your ID and secret'] = 'שמור את המזהה והסוד שלך'; +$lang['Secret copied. Keep it in a safe place.'] = 'הסוד הועתק. שמור אותו במקום בטוח.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'הסוד לא יוצג יותר. עליך להעתיק אותו כדי להמשיך.'; +$lang['Verification code'] = 'קוד אימות'; +$lang['Verify'] = 'אמת'; \ No newline at end of file diff --git a/language/he_IL/help_quick_search.lang.php b/language/he_IL/help_quick_search.lang.php new file mode 100644 index 000000000..d92305a54 --- /dev/null +++ b/language/he_IL/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Click here to show log error.'] = 'Villa kom upp við útdrátt. Vinsamlegast athugaðu skráarheimildir á piwigo uppsetningu þinni.
    Smelltu hér til að birta villuskrá.'; +$lang['An error has occured during extract. Please check files permissions of your piwigo installation.
    Click here to show log error.'] = 'Villa kom upp við afþjöppun. Athugaðu skráarheimildir á Piwigo-uppsetningunni þinni.
    Smelltu hér til að birta villuskrá.'; $lang['Allowed file types: %s.'] = 'Leyfa skráartegundir: %s'; $lang['Allow users to edit their own comments'] = 'Leyfa notendum að breyta eigin umsögnum'; $lang['Allow users to delete their own comments'] = 'Leyfa notendum að eyða eigin umsögnum'; @@ -158,8 +156,8 @@ $lang['Allow users to add a link to their website'] = 'Leyfa notendum að bæta $lang['Allow user registration'] = 'Leyfa nýskráningu notanda'; $lang['Allow user customization'] = 'Leyfa aðlögun notanda'; $lang['Allow rating'] = 'Leyfa einkunn'; -$lang['All themes are up to date.'] = 'Öll þemu eru uppfærð'; -$lang['All plugins are up to date.'] = 'Allar viðbætur eru uppfærðar'; +$lang['All themes are up to date.'] = 'Öll þemu eru uppfærð.'; +$lang['All plugins are up to date.'] = 'Allar viðbætur eru uppfærðar.'; $lang['All extensions are up to date.'] = 'Allir viðaukar eru uppfærðir'; $lang['All optimizations have been successfully completed.'] = 'Allri bestun lokið með góðum árangri.'; $lang['All languages are up to date.'] = 'Öll tungumál eru uppfærð'; @@ -224,9 +222,9 @@ $lang['ACCESS_3'] = 'Aðgangur fyrir stjórnendur'; $lang['ACCESS_2'] = 'Aðgangur fyrir skráða notendur'; $lang['ACCESS_1'] = 'Aðgangur fyrir alla'; $lang['A new version of Piwigo is available.'] = 'Ný útgáfa af Piwigo er í boði.'; -$lang['A locked gallery is only visible to administrators'] = 'Læst gallerí er aðeins sýnilegt stjórnendum'; -$lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = 'Piwigo fyrir iOS forritið gerir þér kleift að tengjast Piwigo galleríinu þínu úr iPhone, iPad eða iPod Touch, búa til nokkur albúm og hlaða upp nokkrum myndum í einu.'; -$lang['Piwigo for Android application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = 'Piwigo fyrir Android forritið gerir þér kleift að tengja Android símann þinn eða spjaldtölvu við Piwigo galleríið þitt, búa til nokkur albúm og hlaða upp nokkrum myndum í einu.'; +$lang['A locked gallery is only visible to administrators'] = 'Læst myndasafn er aðeins sýnilegt stjórnendum'; +$lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = 'Piwigo fyrir iOS forritið gerir þér kleift að tengjast Piwigo-myndasafninu þínu úr iPhone, iPad eða iPod Touch, búa til nokkur albúm og hlaða upp nokkrum myndum í einu.'; +$lang['Piwigo for Android application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = 'Piwigo fyrir Android forritið gerir þér kleift að tengja Android símann þinn eða spjaldtölvu við Piwigo-myndasafnið þitt, búa til nokkur albúm og hlaða upp nokkrum myndum í einu.'; $lang['1 album found'] = '1 albúm fannst'; $lang['%d tags found'] = '%d merki valin'; $lang['%d tag selected'] = '%d merki valið'; @@ -236,19 +234,19 @@ $lang['%d+ albums found, try to refine the search'] = '%d+ albúm $lang['... or hide this link'] = '... eða feldu þennan hlekk'; $lang['... or '] = '... eða '; $lang[', click on'] = ', smelltu á'; -$lang['+ Add an upload box'] = '+ Bættu við upphleðsluboxi'; +$lang['+ Add an upload box'] = '+ Bættu við innsendingareit'; $lang['(this tag will be deleted)'] = '(þessu merki verður eytt)'; $lang['(filtered from %s total users)'] = '(síað frá %s notendum samtals)'; $lang['(determined from photos)'] = '(ákvarðað út frá myndum)'; $lang['%u users have automatic permission because they belong to a granted group.'] = '%u notendur hafa sjálfvirka heimild vegna þess að þeir tilheyra hópi með heimild.'; -$lang['%s value is not correct file because exif are not supported'] = '%s gildi er rangt vegna þess að exif eru ekki stutt'; +$lang['%s value is not correct file because exif are not supported'] = '%s gildi er rangt vegna þess að exif-merki eru ekki studd'; $lang['%s status is required to edit parameters.'] = '%s staða er nauðsynleg til að breyta notandabreytum.'; $lang['%s plugins found'] = '%s viðbætur fundust'; $lang['%s plugin found'] = '%s viðbót fannst'; $lang['%s photos have been regenerated'] = '%s myndir sem hafa verið endurskapaðar'; $lang['%s photos can not be regenerated'] = '%s myndir sem ekki var hægt að endurskapa'; $lang['%s other tags available..'] = '%s önnur merki í boði..'; -$lang['%s must be to set to false in your local/config/config.inc.php file'] = '%s verður að vera stillt á "false" í þinni local/config/config.inc.php skrá'; +$lang['%s must be to set to false in your local/config/config.inc.php file'] = '%s verður að vera stillt á "false" í local/config/config.inc.php skránni þinni'; $lang['%s lines'] = '%s línur'; $lang['%s line'] = '%s lína'; $lang['%s in the future'] = '%s í framtíðinni'; @@ -264,7 +262,7 @@ $lang['%d weeks'] = '%d vikur'; $lang['%d week'] = '%d vika'; $lang['%d waiting for validation'] = '%d bíða eftir staðfestingu'; $lang['%d users were updated.'] = '%d notendur uppfærðir.'; -$lang['%d users were not updated.'] = '%d notendur ekki uppfærðir'; +$lang['%d users were not updated.'] = '%d notendur ekki uppfærðir.'; $lang['%d users logged out'] = '%d notendur útskráðir'; $lang['%d users logged in'] = '%d notendur innskráðir'; $lang['%d users edited'] = '%d notendum breytt'; @@ -287,14 +285,14 @@ $lang['Optimizations have been completed with some errors.'] = 'Bestun er lokið $lang['Operation in progress'] = 'Meðferð í vinnslu.'; $lang['Operating system'] = 'Stýrikerfi'; $lang['Open user details'] = 'Opna notandaupplýsingar'; -$lang['Open in gallery'] = 'Opna í galleríi'; +$lang['Open in gallery'] = 'Opna í myndasafn'; $lang['Opacity'] = 'Gagnsæi'; $lang['Only private albums are listed'] = 'Aðeins einkaalbúm eru listuð'; $lang['Sum of rates'] = 'Samtala einkunna'; $lang['Rated %d times, score : %.2f'] = 'Einkunn gefin %d sinnum, stig: %.2f'; $lang['Rate date'] = 'Einkunnardagsetning'; $lang['Rate'] = 'Einkunn'; -$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Á þínum Linux skaltu einfaldlega setja upp Shotwell með pakkastjóranum þínum og virkja síðan Piwigo útgáfumöguleika.'; +$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Á Linux-kerfinu þínu skaltu einfaldlega setja upp Shotwell með pakkastjóranum þínum og virkja síðan Piwigo útgáfumöguleika.'; $lang['Oct'] = 'okt'; $lang['Obsolete Plugins'] = 'Úreltar viðbætur'; $lang['Numeric identifier : %d'] = 'Tölulegt auðkenni : %d'; @@ -353,7 +351,7 @@ $lang['Move albums'] = 'Færa albúm'; $lang['Move'] = 'Færa'; $lang['Month'] = 'Mánuður'; $lang['Modify information'] = 'Breyta upplýsingum'; -$lang['Missing a temporary folder'] = 'Vantar tímabundna möppu'; +$lang['Missing a temporary folder'] = 'Vantar bráðabirgðamöppu'; $lang['Missing Plugins'] = 'Viðbætur vantar'; $lang['Miscellaneous'] = 'Ýmislegt'; $lang['Minimum width'] = 'Lágmarks breidd'; @@ -401,7 +399,7 @@ $lang['Mail content'] = 'Innihald pósts'; $lang['Mail address is mandatory for registration'] = 'Netfang er skilyrt fyrir skráningu'; $lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Læst albúm eru óvirk vegna viðhalds. Aðeins stjórnendur geta skoðað þær í myndasafninu. Með því að læsa þessu albúmi læsast undiralbúm þess einnig'; $lang['Locked'] = 'Læst'; -$lang['Lock gallery'] = 'Læsa galleríi'; +$lang['Lock gallery'] = 'Læsa myndasafni'; $lang['Lock albums'] = 'Læsa albúmum'; $lang['Lock'] = 'Læsa'; $lang['Local'] = 'Staðbundið'; @@ -438,7 +436,7 @@ $lang['Invert'] = 'Snúa við'; $lang['Instructions to use Piwigo'] = 'Leiðbeiningar um notkun á Piwigo'; $lang['Installed Themes'] = 'Uppsett þemu'; $lang['Installed Languages'] = 'Uppsett tungumál'; -$lang['Install on your computer,'] = 'Settu upp á þinni tölvu,'; +$lang['Install on your computer,'] = 'Settu upp á tölvunni þinni,'; $lang['Install'] = 'Settu upp'; $lang['Informations'] = 'Upplýsingar'; $lang['Information data registered in database'] = 'Upplýsingagögn skráð í gagnagrunn'; @@ -460,7 +458,7 @@ $lang['Image Quality'] = 'Myndgæði'; $lang['Ignore selected anomalies'] = 'Hunsa valin frávik'; $lang['Ignore this update'] = 'Hunsa þessa endurnýjun'; $lang['Ignore All'] = 'Hunsa allt'; -$lang['If you encounter problems or have any question, please send a message to'] = 'Ef þú lendir í vandræðum eða hefur einhverjar spurningar, vinsamlegast sendu skilaboð á'; +$lang['If you encounter problems or have any question, please send a message to'] = 'Ef þú lendir í vandræðum eða hefur einhverjar spurningar, þá ættirðu að senda skilaboð á'; $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'Ef engin HD er tiltæk og ef núverandi vefstærð er stærri en stærðarbreytingar, þá mun Piwigo færa það sem HD og búa til minni vefstærðarmynd úr því.'; $lang['IP'] = 'IP'; $lang['I decide to update anyway'] = 'Ég ákveð engu að síður að uppfæra'; @@ -496,14 +494,14 @@ $lang['Grant selected users'] = 'Veittu völdum notendum'; $lang['Grant selected groups'] = 'Veittu völdum hópum'; $lang['Go to %s or %s for more informations'] = 'Fara til %s eða %s fyrir frekari upplýsingar'; $lang['Go to'] = 'Fara til'; -$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Veittu skrifaðgang (chmod 777) á "%s" möppuna í rótinni á Piwigo uppsetningu þinni'; +$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Veittu skrifaðgang (chmod 777) á "%s" möppuna í rótinni á Piwigo-uppsetningunni þinni'; $lang['Get Support on Piwigo Forum'] = 'Fáðu aðstoð á Piwigo spjallborði'; $lang['Generate random password'] = 'Búðu til handahófskennt lykilorð'; $lang['Generate multiple size images'] = 'Búðu til myndir í mörgum stærðum'; $lang['General statistics'] = 'Almenn tölfræði'; $lang['General'] = 'Almennt'; -$lang['Gallery unlocked'] = 'Gallerí ólæst'; -$lang['Gallery title'] = 'Gallerí titill'; +$lang['Gallery unlocked'] = 'Myndasafn er ólæst'; +$lang['Gallery title'] = 'Titill myndasafns'; $lang['GD version'] = 'GD útgáfa'; $lang['GD library is missing'] = 'GD forritasafn vantar'; $lang['Formats'] = 'Snið'; @@ -523,7 +521,7 @@ $lang['File upload stopped by extension'] = 'Upphleðsla skráa stöðvuð af vi $lang['File type: %s'] = 'Skráargerð: %s'; $lang['File'] = 'Skrá'; $lang['Feb'] = 'feb'; -$lang['Features include gallery browsing, album creation and photo upload.'] = 'Eiginleikar fela í sér að skoða gallerí, búa til albúm og hlaða upp myndum.'; +$lang['Features include gallery browsing, album creation and photo upload.'] = 'Eiginleikar fela í sér að skoða myndasafn, búa til albúm og hlaða upp myndum.'; $lang['Failed to write file to disk'] = 'Mistókst að skrifa skrá á disk'; $lang['FTP + Synchronization'] = 'FTP + Samstilling'; $lang['Extensions Update'] = 'Viðaukar Endurnýjun'; @@ -628,7 +626,7 @@ $lang['Current name'] = 'Núverandi heiti'; $lang['Crop'] = 'Kroppa'; $lang['Created on %s'] = 'Stofnað %s'; $lang['Create this site'] = 'Stofnaðu þessa vefsíðu'; -$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Stofnaðu "%s" möppuna í rótinni á Piwigo uppsetningu þinni'; +$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Útbúðu "%s" möppuna í rótinni á Piwigo-uppsetningunni þinni'; $lang['Create a first album'] = 'Stofna fyrsta albúm'; $lang['Create'] = 'Stofna'; $lang['Correction the anomaly will cancel the fact that it\'s ignored'] = 'Leiðrétt frávik verður ekki lengur hunsað'; @@ -639,7 +637,7 @@ $lang['Continue processing treatment'] = 'Haltu áfram meðferð sem er í gangi $lang['Confirm merge'] = 'Staðfestu sameiningu'; $lang['Confirm deletion'] = 'Staðfestu eyðingu'; $lang['Configuration'] = 'Stillingar'; -$lang['Compute %d missing checksums'] = 'Reiknaðu %d prófsummur sem vantar'; +$lang['Compute %d missing checksums'] = 'Reiknaðu %d gátsummur sem vantar'; $lang['Complementary mail content'] = 'Viðbótarefni tölvupósts'; $lang['Compare mode'] = 'Samanburðarhamur'; $lang['Compact View'] = 'Samþjöppuð Notandasýn'; @@ -658,19 +656,19 @@ $lang['%d physical'] = '%d raunlæg'; $lang['%d associations'] = '%d tengingar'; $lang['%d association'] = '%d tenging'; $lang['Check for upgrade'] = 'Athugaðu með uppfærslu'; -$lang['Check for updates'] = 'Athugaðu með endurnýjanir'; +$lang['Check for updates'] = 'Athugaðu með uppfærslur'; $lang['Check automatic corrections'] = 'Athugaðu sjálfvirkar leiðréttingar'; $lang['Check all'] = 'Athugaðu allt'; $lang['Change username'] = 'Breyttu notandanafni'; $lang['Change password'] = 'Breyttu lykilorði'; -$lang['Change Password'] = 'Breyttu Lykilorði'; -$lang['Change Admin Colors'] = 'Breyttu stjórnunarlitum'; +$lang['Change Password'] = 'Breyttu lykilorði'; +$lang['Change Admin Colors'] = 'Breyttu litum stjórnunar'; $lang['Center of interest'] = 'Miðja athyglinnar'; $lang['Cannot delete the old permalink !'] = 'Ekki er hægt að eyða gömlu fasttenglunum!'; $lang['Cancel'] = 'Hætta við'; -$lang['Can\'t read or extract archive.'] = 'Ekki er hægt að lesa skjalasafn eða draga það út.'; -$lang['Can\'t download archive.'] = 'Ekki er hægt að hlaða niður skjalasafni.'; -$lang['Can\'t create temporary file.'] = 'Ekki er hægt að búa til tímabundna skrá.'; +$lang['Can\'t read or extract archive.'] = 'Ekki er hægt að lesa safnskrá eða afþjappa henni.'; +$lang['Can\'t download archive.'] = 'Ekki er hægt að hlaða niður safnskrá.'; +$lang['Can\'t create temporary file.'] = 'Ekki er hægt að búa til bráðabirgðaskrá.'; $lang['Can\'t connect to server.'] = 'Tenging við netþjón ekki tiltæk.'; $lang['Can be shared by several individuals without conflict (they cannot change the password).'] = 'Hægt að deila með nokkrum einstaklingum án árekstra (þeir geta ekki breytt lykilorðinu).'; $lang['add new photos to caddie'] = 'bæta við myndum í körfu'; @@ -691,10 +689,10 @@ $lang['Plugin list'] = 'Listi yfir viðbætur'; $lang['Plugin has been successfully copied'] = 'Það tókst að afrita viðbótina'; $lang['Plugin "%s" has been activated!'] = 'Viðbót “%s” hefur verið virkjuð!'; $lang['Plugin "%s" deleted!'] = 'Viðbót “%s” eytt!'; -$lang['Please wait...'] = 'Vinsamlega bíðið...'; -$lang['Please upgrade your PHP version before any update.'] = 'Vinsamlegast uppfærðu þína PHP útgáfu áður en aðrar uppfærslur eru framkvæmdar.'; -$lang['Please select at least two groups'] = 'Vinsamlegast veldu að minnsta kosti tvo hópa'; -$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Vinsamlegast athugaðu heimildir (CHMOD) á möppum og undirmöppum fyrir "viðbætur".'; +$lang['Please wait...'] = 'Bíddu aðeins...'; +$lang['Please upgrade your PHP version before any update.'] = 'Uppfærðu PHP-útgáfu þína áður en aðrar uppfærslur eru framkvæmdar.'; +$lang['Please select at least two groups'] = 'Veldu að minnsta kosti tvo hópa'; +$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Athugaðu heimildir (CHMOD) fyrir "viðbætur"-möppuna og undirmöppur hennar.'; $lang['Piwigo version'] = 'Piwigo útgáfa'; $lang['Piwigo requires an album to add photos.'] = 'Piwigo þarf albúm til að bæta við myndum.'; $lang['Piwigo publish plugin for digiKam'] = 'Piwigo útgáfuviðbót fyrir digiKam'; @@ -711,7 +709,7 @@ $lang['Piwigo Remote Sync is able to upload a whole folder hierarchy. If you run $lang['Piwigo Publish plugin for Lightroom'] = 'Piwigo Útgáfuviðbót fyrir Lightroom'; $lang['Piwigo Announcements Newsletter'] = 'Piwigo Tilkynningafréttabréf'; $lang['Piwigo Administration'] = 'Piwigo Umsýsla'; -$lang['Piwigo %s is available, please update'] = 'Piwigo %s er í boði, vinsamlegast uppfærðu'; +$lang['Piwigo %s is available, please update'] = 'Piwigo %s er í boði, þú ættir endilega að uppfæra'; $lang['Photos per page'] = 'Myndir á síðu'; $lang['Photos generation in progress...'] = 'Myndagerð í gangi...'; $lang['Photos'] = 'Myndir'; @@ -737,9 +735,9 @@ $lang['Permalink'] = 'Fasttengill'; $lang['Pending Comments'] = 'Umsagnir í bið'; $lang['Path'] = 'Slóði'; $lang['Password updated'] = 'Lykilorð uppfært'; -$lang['Password is missing. Please enter the password.'] = 'Lykilorð vantar. Vinsamlegast sláðu inn lykilorðið.'; +$lang['Password is missing. Please enter the password.'] = 'Lykilorð vantar. Settu inn lykilorðið.'; $lang['Page Visited'] = 'Síða heimsótt'; -$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Staðfestingu lykilorðs vantar. Vinsamlegast staðfestu valið lykilorð.'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Staðfestingu lykilorðs vantar. Staðfestu valið lykilorð.'; $lang['Parent album'] = 'Foreldraalbúm'; $lang['Parameters'] = 'Notandabreytur'; $lang['Parameter'] = 'Stillingar'; @@ -759,8 +757,8 @@ $lang['Original file : %s'] = 'Upprunaleg skrá : %s'; $lang['Original Size'] = 'Upprunaleg stærð'; $lang['Order of menubar items has been updated successfully.'] = 'Röð atriða í valmyndastiku hafa verið uppfærð með góðum árangri.'; $lang['cancel manual order'] = 'hætta við handvirka röðun'; -$lang['checksum'] = 'prófsumma'; -$lang['checksums to add'] = 'prófsumma að bæta við'; +$lang['checksum'] = 'gátsumma'; +$lang['checksums to add'] = 'gátsummum á að bæta við'; $lang['clean'] = 'hreinsa upp'; $lang['close'] = 'loka'; $lang['confirm'] = 'staðfesta'; @@ -801,7 +799,7 @@ $lang['You can update to Piwigo %s directly, without upgrading to Piwigo %s (rec $lang['You have %d orphan tags: %s.'] = 'Þú ert með %d munaðarlaus merki: %s.'; $lang['You have %s inactive plugins'] = 'Þú ert með %s óvirkar viðbætur'; $lang['You have %s1 orphan : %s2'] = 'Þú ert með %s1 munaðarlaus : %s2'; -$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'Þú hefur tilgreint $conf[\'order_by\'] í þinni staðbundnu uppsetningaskrá, þessi notandabreyta er úrelt, vinsamlega fjarlægðu hana eða endurnefndu hana í $conf[\'order_by_custom\'] !'; +$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'Þú hefur tilgreint $conf[\'order_by\'] í staðbundnu uppsetningaskránni þinni, þessi færibreyta er úrelt, fjarlægðu hana eða endurnefndu hana í $conf[\'order_by_custom\'] !'; $lang['You have subscribed to receiving notifications by mail.'] = 'Þú hefur gerst áskrifandi að tilkynningum með tölvupósti.'; $lang['You have unsubscribed from receiving notifications by mail.'] = 'Þú hefur hætt áskrift að tilkynningu með tölvupósti.'; $lang['You need to confirm deletion'] = 'Þú verður að staðfesta eyðingu'; @@ -831,8 +829,8 @@ $lang['You are running the latest version of Piwigo.'] = 'Þú ert að keyra ný $lang['You are using the Browser uploader. Try the Flash uploader instead.'] = 'Þú ert að nota vafrainnflytjanda. Prófaðu Flash innflytjanda í staðinn.'; $lang['You are using the Flash uploader. Problems? Try the Browser uploader instead.'] = 'Þú ert að nota Flash innflytjanda. Vandamál? Prófaðu Vafrainnflytjanda í staðinn.'; $lang['You can activate only one mobile theme.'] = 'Þú getur aðeins virkjað eitt farsímaþema'; -$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Þú getur ekki skilgreint sjálfgefna myndaröðun vegna þess að þú ert með sérsniðna stillingu í þinni staðbundnu uppsetningu.'; -$lang['You cannot delete your account'] = 'Þú getur ekki eytt þínum reikningi'; +$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Þú getur ekki skilgreint sjálfgefna myndaröðun vegna þess að þú ert með sérsniðna stillingu í staðbundnu uppsetningunni þinni.'; +$lang['You cannot delete your account'] = 'Þú getur ekki eytt reikningnum þínum'; $lang['You cannot move an album in its own sub album'] = 'Þú getur ekki fært albúm í eigin undiralbúmi'; $lang['You don\'t have access to this photo'] = 'Þú hefur ekki aðgang að þessari mynd'; $lang['You have %d orphan tags %s'] = 'Þú ert með %d munaðarlaus merki %s'; @@ -853,9 +851,9 @@ $lang['Welcome!'] = 'Velkominn!'; $lang['Who can see these photos?'] = 'Hver getur séð þessar myndir?'; $lang['Who can see this photo?'] = 'Hver getur séð þessa mynd?'; $lang['Width'] = 'Breidd'; -$lang['With blank value, gallery title will be used'] = 'Ef autt, þá verður titill gallerís notaður'; +$lang['With blank value, gallery title will be used'] = 'Ef autt, þá verður titill myndasafns notaður'; $lang['With no album'] = 'Með engu albúmi'; -$lang['With no checksum'] = 'Með engri prófsummu'; +$lang['With no checksum'] = 'Með engri gátsummu'; $lang['User list'] = 'Notandalisti'; $lang['User status'] = 'Notandastaða'; $lang['User updated'] = 'Notandi uppfærður'; @@ -866,7 +864,7 @@ $lang['Validate'] = 'Staðfesta'; $lang['Validation'] = 'Staðfesting'; $lang['Version'] = 'Útgáfa'; $lang['Videos'] = 'Myndbönd'; -$lang['View in gallery'] = 'Skoða í galleríi'; +$lang['View in gallery'] = 'Skoða í myndasafni'; $lang['Virtual Links'] = 'Sýndarhlekkir'; $lang['Virtual album'] = 'Sýndaralbúm'; $lang['Virtual album added'] = 'Sýndaralbúmi bætt við'; @@ -874,7 +872,7 @@ $lang['Virtual album deleted'] = 'Sýndaralbúmi eytt'; $lang['Virtual album name'] = 'Heiti sýndaralbúms'; $lang['Virtual albums to move'] = 'Sýndaralbúm til að færa'; $lang['Visit'] = 'Heimsækja'; -$lang['Visit Gallery'] = 'Heimsækja galleríið'; +$lang['Visit Gallery'] = 'Heimsækja myndasafnið'; $lang['Visit Piwigo project website'] = 'Heimsækja Piwigo verkefnavef'; $lang['Updates'] = 'Uppfærslur'; $lang['Upload'] = 'Flytja inn'; @@ -898,7 +896,7 @@ $lang['User comments validation'] = 'Staðfesting umsagna notenda'; $lang['Update user'] = 'Uppfæra notanda'; $lang['Update to Piwigo %s'] = 'Uppfæra í Piwigo %s'; $lang['Update photos information'] = 'Uppfæra upplýsingar myndar'; -$lang['Update in progress... Please wait.'] = 'Uppfærsla í gangi... Vinsamlega bíðið.'; +$lang['Update in progress... Please wait.'] = 'Uppfærsla í gangi... Hinkraðu aðeins.'; $lang['Update albums informations'] = 'Uppfæra upplýsingar albúms'; $lang['Update Complete'] = 'Uppfærslu Lokið'; $lang['Update All'] = 'Uppfæra Allt'; @@ -907,7 +905,7 @@ $lang['Unsubscribed'] = 'Áskrift hætt'; $lang['Unsubscribe from notification by mail'] = 'Hætta áskrift að tilkynningum með tölvupósti'; $lang['Unset as group for new users'] = 'Óvirkt sem hópur fyrir nýja notendur'; $lang['Unlocked'] = 'Aflæst'; -$lang['Unlock gallery'] = 'Aflæsa galleríi'; +$lang['Unlock gallery'] = 'Aflæsa myndasafni'; $lang['Unknown upload error'] = 'Óþekkt innflutningsvilla'; $lang['Uninstalled Plugins'] = 'Fjarlægðar Viðbætur'; $lang['Uninstall'] = 'Fjarlægja'; @@ -924,7 +922,7 @@ $lang['Toggle \'default group\' property'] = 'Snúa við eiginleikum \'sjálfgef $lang['To unsubscribe'] = 'Að hætta áskrift'; $lang['To subscribe'] = 'Að gerast áskrifandi'; $lang['To send ?'] = 'Að senda?'; -$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'Til að flytja út þínar myndir frá digiKam í Piwigo, settu þá einfaldlega upp digiKam og Kipi-viðbótina.'; +$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'Til að flytja út myndirnar þínar úr digiKam inn í Piwigo, settu þá einfaldlega upp digiKam og Kipi-viðbæturnar.'; $lang['Title'] = 'Titill'; $lang['Time to send mail is limited. Others mails are skipped.'] = 'Tíminn til að senda tölvupóst er takmarkaður. Öðrum tölvupóstum hefur verið sleppt.'; $lang['Time has come to update your Piwigo with version %s, go to %s'] = 'Tíminn er kominn á að uppfæra þitt Piwigo í útgáfu %s, farðu í %s'; @@ -945,7 +943,7 @@ $lang['This album contains %d photos, added between %s and %s.'] = 'Þetta albú $lang['There is no other theme available.'] = 'Það er ekkert annað þema aðgengilegt.'; $lang['There is no other plugin available.'] = 'Það er engin önnur viðbót aðgengileg.'; $lang['There is no other language available.'] = 'Það er ekkert annað tungumál aðgengilegt.'; -$lang['There is no group in this gallery.'] = 'Það eru engir hópar í þessu galleríi.'; +$lang['There is no group in this gallery.'] = 'Það eru engir hópar í þessu myndasafni.'; $lang['There is no available subscribers to mail.'] = 'Það eru engir áskrifendur að tilkynningu með tölvupósti.'; $lang['Themes which need upgrade'] = 'Þemu sem þarfnast uppfærslu'; $lang['Themes'] = 'Þemu'; @@ -976,7 +974,7 @@ $lang['The following tag was deleted'] = 'Eftirfarandi merki var eytt'; $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'Ekki er hægt að nálgast skrána eða möppuna (annaðhvort er hún ekki til eða aðgangi er hafnað)'; $lang['The center of interest is the most meaningful zone in the photo.'] = 'Miðja athyglinnar er mikilvægasta svæðið á myndinni.'; $lang['The anomaly will be ignored until next application version'] = 'Frávikið verður hunsað þar til í næstu útgáfu forritsins'; -$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'Piwigo útgáfuviðbótin gerir þér kleift að flytja út og samstilla myndir frá Lightroom beint í þitt Piwigo myndagallerí.'; +$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'Piwigo-útgáfuviðbótin gerir þér kleift að flytja út og samstilla myndir úr Lightroom beint í Piwigo-myndasafníð þitt.'; $lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Piwigo útflutningsviðbótin gerir þér kleift að búa til albúm og flytja út myndir.'; $lang['The %d tags on this page are selected'] = 'Merkin %d á þessari síðu hafa verið valin'; $lang['The %d following tags were deleted'] = 'Eftirfarandi %d merkjum hefur verið eytt'; @@ -1014,12 +1012,12 @@ $lang['Storage'] = 'Geymsla'; $lang['Status of user "%s" updated'] = 'Notandastaða "%s" uppfærð'; $lang['Status'] = 'Staða'; $lang['Statistics'] = 'Tölfræði'; -$lang['Start pLoader and add your photos.'] = 'Settu pLoader í gang og bættu þínum myndum við.'; +$lang['Start pLoader and add your photos.'] = 'Settu pLoader í gang og bættu myndunum þínum við.'; $lang['Start Upload'] = 'Hefja innflutning'; $lang['Source tag'] = 'Heimildarmerki'; $lang['Some upgrades are available for extensions.'] = 'Sumar uppfærslur eru fáanlegar fyrir viðauka.'; $lang['Some themes and plugins may be not available yet.'] = 'Nokkrar þemur og viðbætur kunna að vera óaðgengilegar ennþá.'; -$lang['Some checksums are missing.'] = 'Nokkrar prófsummur vantar.'; +$lang['Some checksums are missing.'] = 'Nokkrar gátsummur vantar.'; $lang['Site manager'] = 'Vefstjóri'; $lang['Simulation'] = 'Hermun'; $lang['Showing %s users out of %s'] = 'Sýnir %s notendur af %s'; @@ -1032,7 +1030,7 @@ $lang['Show %s users'] = 'Sýna %s notendur'; $lang['Show'] = 'Sýna'; $lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell er opinn stafrænn ljósmyndaskipuleggjari sem keyrir á Linux. Hann er sjálfgefinn ljósmyndastjóri í Ubuntu og Fedora.'; $lang['Sharpen'] = 'Skerpa'; -$lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Deildu / sendu myndirnar þínar beint úr þínum macOS (10.10 og seinna) til Piwigo'; +$lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Deildu / Sendu myndirnar þínar beint úr macOS-kerfinu þínu (10.10 og seinna) til Piwigo'; $lang['Settings'] = 'Stillingar'; $lang['Set title'] = 'Stilltu titil'; $lang['Set creation date'] = 'Stilltu stofnunardag'; @@ -1139,7 +1137,7 @@ $lang['Prepared time for list of users to send mail is limited. Others users are $lang['user_status_admin'] = 'Stjórnandi'; $lang['user_status_generic'] = 'Almennt'; $lang['user_status_guest'] = 'Gestur'; -$lang['user_status_normal'] = 'Notandi'; + $lang['user_status_webmaster'] = 'Vefstjóri'; $lang['visitors need to login and have the appropriate permissions to see this album'] = 'gestir þurfa að skrá sig inn og hafa viðeigandi heimildir til að sjá þetta albúm'; $lang['width & height'] = 'breidd og hæð'; @@ -1209,9 +1207,9 @@ $lang['guest'] = 'gestur'; $lang['height must be a number superior to'] = 'hæð verður að vera tala stærri en'; $lang['hide details'] = 'fela ítarupplýsingar'; $lang['high'] = 'hátt'; -$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto er sjálfgefin myndastjóri á macOS. Piwigo útflutningsviðbótin gerir þér kleift að stofna ný albúm og flytja út þínar myndir frá iPhoto í þitt Piwigo myndasafn.'; +$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto er sjálfgefin myndastjóri á macOS. Piwigo-útflutningsviðbótin gerir þér kleift að útbúaa ný albúm og flytja út myndirnar þínar úr iPhoto í Piwigo-myndasafnið þitt.'; $lang['in administration'] = 'í umsýslu'; -$lang['in gallery'] = 'í galleríi'; +$lang['in gallery'] = 'í myndasafni'; $lang['include child albums'] = 'innihalda undiralbúm'; $lang['include photos with lower privacy level'] = 'innihalda myndir með lægri friðhelgisréttindi'; $lang['jump to album'] = 'hoppa í albúm'; @@ -1285,12 +1283,12 @@ $lang['Piwigo core'] = 'Piwigo kjarni'; $lang['Piwigo is also on mobile.'] = 'Piwigo er einnig á farsíma.'; $lang['Properties of abums'] = 'Eiginleikar albúma'; $lang['Purge Actions'] = 'Hreinsa aðgerðir'; -$lang['%d formats uploaded for %d photos'] = '%d skráarsnið hlaðin upp fyrir %d myndir'; +$lang['%d formats uploaded for %d photos'] = '%d skráarsnið send inn fyrir %d myndir'; $lang['%s pixels, %.2f MB'] = '%s pixlar, %.2f MB'; $lang['%sGB'] = '%s GB'; $lang['%sMB'] = '%s MB'; $lang['Add New Plugin'] = 'Bættu við nýrri viðbót'; -$lang['Add another set of formats'] = 'Bættu við öðru setti af skráarsniðum'; +$lang['Add another set of formats'] = 'Bættu við öðru setti af skráasniðum'; $lang['Add as filter'] = 'Bæta við sem síu'; $lang['Add formats'] = 'Bæta við skráarsniðum'; $lang['Additional filters'] = 'Viðbótar síur'; @@ -1310,7 +1308,7 @@ $lang['Place first'] = 'Settu fyrst'; $lang['Place last'] = 'Settu síðast'; $lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'Þessi mynd er raunlægt tengd þessu albúmi, þú getur ekki aðgreint þær.'; $lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'Þegar þessi viðbót er endurheimt verður hún endurstillt á upprunalegu stillibreyturnar og tengd gögn verða endurstillt'; -$lang['Always have a backup of your database and files.'] = 'Vertu alltaf með öryggisafrit af gagnagrunninum þínum og skrám.'; +$lang['Always have a backup of your database and files.'] = 'Vertu alltaf með öryggisafrit af gagnagrunninum og skránum þínum.'; $lang['Details'] = 'Smáatriði'; $lang['If anything bad happens during the update, you would be able to restore a backup.'] = 'Ef eitthvað slæmt gerist meðan á uppfærslu stendur gætirðu endurheimt öryggisafrit.'; $lang['The best is to have them made automatically on a regular basis.'] = 'Best er að láta útbúa þær sjálfkrafa með reglubundnum hætti.'; @@ -1322,7 +1320,7 @@ $lang['Some photos are missing from your file system. Details provided by plugin $lang['%d pictures in sub-albums'] = '%d myndir í undiralbúmum'; $lang['%d filtered user'] = '%d síaður notandi'; $lang['%d filtered users'] = '%d síaðir notendur'; -$lang['%d in whole branch'] = '%d í öllu útibúi'; +$lang['%d in whole branch'] = '%d í öllum greinum'; $lang['%d including sub-albums'] = '%d að meðtöldum undiralbúmum'; $lang['Activate button "%s"'] = 'Virkjaðu hnappinn „%s“'; $lang['All admins'] = 'Allir stjórnendur'; @@ -1368,4 +1366,49 @@ $lang['Save'] = 'Vista'; $lang['Select or create an album'] = 'Velja eða stofna albúm'; $lang['System Activities'] = 'Kerfisvirkni'; $lang['Who can see ?'] = 'Hverja getum við séð ?'; -$lang['You have unsaved changes'] = 'Þú ert með óvistaðar breytingar'; \ No newline at end of file +$lang['You have unsaved changes'] = 'Þú ert með óvistaðar breytingar'; +$lang['Set as main user'] = 'Setja sem aðalnotanda'; +$lang['The passwords do not match'] = 'Lykilorðin passa ekki saman'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Þessi notandi verður fyrst að vera skilgreindur sem vefstjóri áður en hægt er að uppfæra hann í aðalnotanda'; +$lang['To be sure, please rewrite the word “%s” below'] = 'Til að vera viss skaltu endurskrifa orðið “%s” hér að neðan'; +$lang['Username successfully modified'] = 'Notandanafni breytt'; +$lang['Yes, let\'s proceed'] = 'Já, höldum áfram'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Þú ert að fara að setja %s sem aðalnotanda í stað %s, viltu halda áfram?'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Þú hefur ekki heimild til að breyta aðalnotandanum, spurðu vefstjórann þinn um þetta'; +$lang['You can now change the main user from %s to %s.'] = 'Þú getur núna breytt aðalnotandanum úr %s í %s.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Þú getur ekki afritað lykilorðið ef tengingin við þessa síðu er ekki örugg.'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Get ekki sent tölvupóst til þessa notanda vegna þess að hann er ekki með netfang'; +$lang['Changing the main user'] = 'Skipta um aðalnotanda'; +$lang['Copied link'] = 'Afritaður tengill'; +$lang['Copy password'] = 'Afritaðu lykilorð'; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Afritaðu hlekkinn hér að neðan og sendu til notandans svo hægt sé að stilla lykilorðið.'; +$lang['Copy the password link'] = 'Afritaðu lykilorðstengilinn'; +$lang['Main user'] = 'Aðalnotandi'; +$lang['Password copied'] = 'Lykilorð afritað'; +$lang['Please complete all fields'] = 'Fylltu út alla reiti'; +$lang['Resend password link'] = 'Senda lykilorðstengil aftur'; +$lang['%s is the new main user'] = '%s er nýi aðalnotandinn'; +$lang['Ok, got it!'] = 'Í lagi, náði því!'; +$lang['Read the release note'] = 'Lestu útgáfuskýrsluna'; +$lang['What\'s new in version %s'] = 'Hvað er nýtt í útgáfu %s?'; +$lang['A photo library administrator has created the following account for you:'] = 'Stjórnandi myndasafns hefur útbúið eftirfarandi notandareikning fyrir þig:'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'Virkjunarhlekkur sem gildir fyrir %s hefur verið sendur á "%s". Ef notandinn fær ekki hlekkinn geturðu útbúið og afritað nýjan með því að breyta notandanum og stjórna lykilorðinu hans.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'Virkjunarhlekkur sem gildir fyrir %s var útbúinn en ekki var hægt að senda hann. Þú getur núna afritað hlekkinn hér að neðan og sent til notandans.'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'Þessi hlekkur gildir fyrir %s. Eftir þennan tíma þarftu að biðja um nýjan hlekk.'; +$lang['To set your password, visit the following address:'] = 'Til að stilla lykilorðið þitt skaltu fara á eftirfarandi veffang:'; +$lang['Welcome to %s'] = 'Velkomin í %s'; +$lang['We have found %d duplicate paths. Details provided by plugin Check Uploads'] = 'Við fundum %d tvíteknar slóðir. Upplýsingar frá viðbótinni Check Uploads'; +$lang['%d photos were moved from the upload lounge to their albums'] = '%d myndir voru færðar úr biðminni innsendinga í viðeigandi albúm'; +$lang['Are you sure you want to delete "%d" comments?'] = 'Ertu viss um að þú viljir eyða "%d" athugasemdum?'; +$lang['Are you sure you want to delete comment #%s?'] = 'Ertu viss um að þú viljir eyða athugasemd #%s?'; +$lang['Empty lounge'] = 'Tæma biðsvæði'; +$lang['If a photo in this album has the same filename, update the file without changing the photo\'s properties'] = 'Ef mynd í þessu albúmi hefur sama skráarnafn, uppfærðu skrána án þess að breyta eiginleikum myndarinnar.'; +$lang['No comments selected, no actions possible.'] = 'Engar athugasemdir valdar, engar aðgerðir mögulegar.'; +$lang['Save all photos'] = 'Vista allar myndir'; +$lang['The comment has been validated.'] = 'Athugasemdin hefur verið staðfest.'; +$lang['The comments have been validated.'] = 'Athugasemdirnar hafa verið staðfestar.'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'Núna eru %d myndir á biðsvæðinu (biðminni innsendinga)'; +$lang['Use standard Piwigo template for common pages.'] = 'Notið staðlað Piwigo sniðmát fyrir algengar síður.'; +$lang['When enabled, a common template is used for the login, registration and forgotten password pages, regardless of the theme. Some themes might use these templates even if you uncheck this option'] = 'Þegar þetta er virkjað er sameiginlegt sniðmát notað fyrir síðurnar innskráning, skráning og gleymd lykilorð óháð þema. Sum þemu gætu notað þessi sniðmát jafnvel þótt þú hakir ekki við þennan valkost.'; +$lang['Admins only'] = 'Aðeins stjórnendur'; +$lang['user_status_normal'] = 'Grunnatriði'; \ No newline at end of file diff --git a/language/is_IS/common.lang.php b/language/is_IS/common.lang.php index 508539091..517585e5b 100644 --- a/language/is_IS/common.lang.php +++ b/language/is_IS/common.lang.php @@ -23,15 +23,15 @@ $lang_info['zero_plural'] = true; $lang['%d Kb'] = '%d Kb'; $lang['%d comment to validate'] = '%d umsögn til að staðfesta'; $lang['%d comments to validate'] = '%d umsagnir til að staðfesta'; -$lang['%d new comment'] = '%d ný athugasemt'; -$lang['%d new comments'] = '%d nýar athugasemtir'; +$lang['%d new comment'] = '%d ný athugasemd'; +$lang['%d new comments'] = '%d nýar athugasemdir'; $lang['%d comment'] = '%d umsögn'; $lang['%d comments'] = '%d umsagnir'; $lang['%d hit'] = '%d ýtt á'; $lang['%d hits'] = '%d ýtt á'; $lang['%d new user'] = '%d nýr notandi'; $lang['%d new users'] = '%d nýir notendur'; -$lang['About'] = 'Um'; +$lang['About'] = 'Um hugbúnaðinn'; $lang['All tags'] = 'Öll merki'; $lang['Any tag'] = 'Hvaða merki sem er'; $lang['Author'] = 'Höfundur'; @@ -47,20 +47,20 @@ $lang['Current password is wrong'] = 'Núverandi lykilorð er rangt'; $lang['Dimensions'] = 'Stærðir'; $lang['Display'] = 'Birta'; $lang['Email address'] = 'Netfang'; -$lang['Enter your personnal informations'] = 'Settu inn þínar persónuupplýsingar'; +$lang['Enter your personnal informations'] = 'Settu inn persónuupplýsingar þínar'; $lang['Error sending email'] = 'Villa við sendingu tölvupósts'; -$lang['File name'] = 'Nafn skjals'; -$lang['File'] = 'Skjal'; -$lang['Filesize'] = 'Stærð skjals'; -$lang['Filter and display'] = 'Sía og sýna'; +$lang['File name'] = 'Nafn skráar'; +$lang['File'] = 'Skrá'; +$lang['Filesize'] = 'Stærð skráar'; +$lang['Filter and display'] = 'Sía og birta'; $lang['Filter'] = 'Sía'; $lang['Forgot your password?'] = 'Gleymt lykilorð?'; $lang['Go through the gallery as a visitor'] = 'Skoða myndasafn sem gestur'; $lang['Help'] = 'Hjálp'; $lang['Identification'] = 'Auðkenni'; -$lang['Keyword'] = 'Leitarorð'; +$lang['Keyword'] = 'Stikkorð'; $lang['Links'] = 'Hlekkir'; -$lang['N/A'] = 'N/A'; +$lang['N/A'] = 'E/T'; $lang['month'][10] = "Október"; $lang['month'][11] = "Nóvember"; $lang['month'][12] = "Desember"; @@ -80,25 +80,25 @@ $lang['day'][3] = "Miðvikudagur"; $lang['day'][4] = "Fimmtudagur"; $lang['day'][5] = "Föstudagur"; $lang['day'][6] = "Laugardagur"; -$lang['Complete RSS feed (photos, comments)'] = 'Klára RSS flæði (myndir, umsagnir)'; -$lang['Photos only RSS feed'] = 'aðeins myndir RSS flæði'; +$lang['Complete RSS feed (photos, comments)'] = 'Klára RSS-streymi (myndir, umsagnir)'; +$lang['Photos only RSS feed'] = 'RSS-streymi aðeins með myndum'; $lang['New on %s'] = 'Nýtt á %s'; $lang['Notification'] = 'Tilkynning'; $lang['Number of items'] = 'Fjöldi atriða'; $lang['Original dimensions'] = 'Upprunaleg stærðir'; -$lang['Password forgotten'] = 'Gleymdir þú lykilorðinu þínu?'; +$lang['Password forgotten'] = 'Gleymt lykilorð'; $lang['Password'] = 'Lykilorð'; $lang['Post date'] = 'Birt á'; $lang['Posted on'] = 'Birt á'; $lang['Profile'] = 'Síðan mín'; $lang['Quick connect'] = 'Flýtitenging'; -$lang['RSS feed'] = 'RSS flæði'; +$lang['RSS feed'] = 'RSS-streymi'; $lang['Register'] = 'Nýskrá'; $lang['Registration'] = 'Nýskráning'; $lang['Related tags'] = 'Svipuð merki'; $lang['Reset'] = 'Endurstilla'; $lang['Retrieve password'] = 'Sækja lykilorð'; -$lang['Search tags'] = 'Leita að merki'; +$lang['Search tags'] = 'Leita að merkjum'; $lang['Search'] = 'Leita'; $lang['display available tags'] = 'birta tiltæk merki'; $lang['Since'] = 'Frá'; @@ -106,16 +106,16 @@ $lang['Sort by'] = 'Flokka eftir'; $lang['Sort order'] = 'Flokkunarröð'; $lang['Tag'] = 'Merki'; $lang['Tags'] = 'Merki'; -$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'RSS flæði tilkynnir um nýja atburði á þessari vefsíðu: nýjar myndir, uppfærslur albúma, Nýjar umsagnir. Til að nota með RSS flæðilesara.'; -$lang['Unknown feed identifier'] = 'Óþekkt flæði auðkenni'; +$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'RSS-streymið tilkynnir um nýja atburði á þessari vefsíðu: nýjar myndir, uppfærslur albúma, nýjar umsagnir. Notist með RSS-streymislesara.'; +$lang['Unknown feed identifier'] = 'Óþekkt auðkenni streymis'; $lang['User comments'] = 'Umsagnir notenda'; $lang['Username'] = 'Notandanafn'; $lang['Visits'] = 'Heimsóknir'; $lang['Webmaster'] = 'Vefstjóri'; $lang['Week %d'] = 'Vika %d'; $lang['About Piwigo'] = 'Um Piwigo'; -$lang['You are not authorized to access the requested page'] = 'Þú hefur ekki leyfi til að fá aðgang að umbeðinni síðu'; -$lang['add this photo to your favorites'] = 'bæta þessari mynd við uppáhalds'; +$lang['You are not authorized to access the requested page'] = 'Þú hefur ekki heimild til að fá aðgang að umbeðinni síðu'; +$lang['add this photo to your favorites'] = 'bæta þessari mynd við eftirlæti'; $lang['Administration'] = 'Stjórnun'; $lang['all'] = 'allt'; $lang['%d album updated'] = '%d albúm uppfært'; @@ -125,38 +125,38 @@ $lang['%d new photos'] = '%d nýjar myndir'; $lang['Albums'] = 'Albúm'; $lang['Album'] = 'Albúm'; $lang['ascending'] = 'hækkandi'; -$lang['Expand all albums'] = 'Stækka öll albúm'; +$lang['Expand all albums'] = 'Fletta út öllum albúmum'; $lang['posted after %s (%s)'] = 'sett inn eftir %s (%s)'; $lang['posted before %s (%s)'] = 'sett inn fyrir %s (%s)'; $lang['posted between %s (%s) and %s (%s)'] = 'sett inn milli %s (%s) og %s (%s)'; -$lang['posted on %s'] = 'sett inn á %s'; +$lang['posted on %s'] = 'sett inn þann %s'; $lang['Best rated'] = 'Besta einkunn'; $lang['display best rated photos'] = 'birta myndir með bestu einkunn'; $lang['Calendar'] = 'Dagatal'; $lang['All'] = 'Allt'; $lang['display each day with photos, month per month'] = 'birta hvern dag með myndum, mánuð eftir mánuð'; $lang['View'] = 'Skoða'; -$lang['chronology_monthly_calendar'] = 'Mánaðar dagatal'; -$lang['chronology_monthly_list'] = 'Mánaðalegur listi'; -$lang['chronology_weekly_list'] = 'Viku listi'; +$lang['chronology_monthly_calendar'] = 'Mánaðardagatal'; +$lang['chronology_monthly_list'] = 'Mánaðarlisti'; +$lang['chronology_weekly_list'] = 'Vikulisti'; $lang['Click here if your browser does not automatically forward you'] = 'Smelltu hér ef vafrinn sendir þig ekki áfram sjálfkrafa'; -$lang['comment date'] = 'dasetning umsagnar'; +$lang['comment date'] = 'dagsetning umsagnar'; $lang['Comment'] = 'Umsögn'; -$lang['Your comment has been registered'] = 'Umsögn þín hefur verið skráð'; -$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Vörn gegn ruslpósti : vinsamlega bíðið augnablik áður en þið reynið að birta aðra umsögn'; -$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Umsögn þín hefur ekki verið skráð vegna þess að hún stóðst ekki reglur'; +$lang['Your comment has been registered'] = 'Umsögnin þín hefur verið skráð'; +$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Vörn gegn ruslpósti : bíddu augnablik áður en þú reynir að birta aðra umsögn'; +$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Umsögnin þín hefur ekki verið skráð vegna þess að hún stóðst ekki reglur'; $lang['An administrator must authorize your comment before it is visible.'] = 'Stjórnandi verður að samþykkja umsögn þína áður en hún verður sýnileg.'; -$lang['This login is already used by another user'] = 'Þetta notendanafn er nú þegar í notkun'; +$lang['This login is already used by another user'] = 'Þetta notandanafn er nú þegar í notkun'; $lang['Comments'] = 'Umsagnir'; $lang['Add a comment'] = 'Bæta við umsögn'; $lang['created after %s (%s)'] = 'búið til eftir %s (%s)'; $lang['created before %s (%s)'] = 'búið til fyrir %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'búið til milli %s (%s) og %s (%s)'; -$lang['created on %s'] = 'búið til á %s'; -$lang['Customize'] = 'Aðgangur'; -$lang['Your Gallery Customization'] = 'Aðlögun á þínu galleríi'; +$lang['created on %s'] = 'búið til þann %s'; + +$lang['Your Gallery Customization'] = 'Aðlögun á myndasafninu þínu'; $lang['Default'] = 'Sjálfgefið'; -$lang['delete this photo from your favorites'] = 'eyða þessari mynd úr uppáhalds'; +$lang['delete this photo from your favorites'] = 'eyða þessari mynd úr eftirlætum'; $lang['Delete'] = 'Eyða'; $lang['descending'] = 'lækkandi'; $lang['Download'] = 'niðurhal'; @@ -164,18 +164,18 @@ $lang['Download this file'] = 'sækja þessa skrá'; $lang['edit'] = 'breyta'; $lang['wrong date'] = 'röng dagsetning'; $lang['excluded'] = 'útilokað'; -$lang['Your favorites'] = 'Þínar uppáhalds'; -$lang['display your favorites photos'] = 'birta uppáhaldsmyndirnar þínar'; -$lang['Favorites'] = 'Uppáhalds'; +$lang['Your favorites'] = 'Eftirlætin þín'; +$lang['display your favorites photos'] = 'birta eftirlætismyndirnar þínar'; +$lang['Favorites'] = 'Eftirlæti'; $lang['First'] = 'Fyrsta'; -$lang['The gallery is locked for maintenance. Please, come back later.'] = 'Galleríið er lokað vegna viðhalds. Vinsamlega reynið aftur síðar.'; +$lang['The gallery is locked for maintenance. Please, come back later.'] = 'Myndasafnið er lokað vegna viðhalds. Reyndu aftur síðar.'; $lang['Page generated in'] = 'Síða útbúin á'; $lang['guest'] = 'gestur'; $lang['Hello'] = 'Halló'; $lang['available for administrators only'] = 'Aðeins í boði fyrir stjórnendur'; $lang['display this album'] = 'birta þetta albúm'; $lang['display last user comments'] = 'birta umsagnir síðasta notenda'; -$lang['customize the appareance of the gallery'] = 'aðlaga útlit gallerís'; + $lang['search'] = 'leita'; $lang['Home'] = 'Heim'; $lang['in this album'] = 'í þessu albúmi'; @@ -186,14 +186,14 @@ $lang['Invalid password!'] = 'Ógilt lykilorð!'; $lang['Language'] = 'Tungumál'; $lang['last %d days'] = 'síðustu %d daga'; $lang['Last'] = 'Síðasta'; -$lang['Logout'] = 'Útskrá'; -$lang['obligatory'] = 'skylda'; -$lang['display a calendar by creation date'] = 'birta dagatal eftir stofnunardagsetningu'; +$lang['Logout'] = 'Skrá út'; +$lang['obligatory'] = 'skilyrði'; +$lang['display a calendar by creation date'] = 'birta dagatal eftir upprunadagsetningu'; $lang['display all photos in all sub-albums'] = 'birta allar myndir í öllum undiralbúmum'; $lang['return to normal view mode'] = 'aftur í venjulegan skjá'; $lang['display a calendar by posted date'] = 'birta dagatal eftir birtingardagsetningu'; $lang['Most visited'] = 'Oftast heimsótt'; -$lang['display most visited photos'] = 'birta mest heimsóttar myndir'; +$lang['display most visited photos'] = 'birta mest skoðuðu myndir'; $lang['Unknown identifier'] = 'Óþekkt auðkenni'; $lang['New password'] = 'Nýtt lykilorð'; $lang['Rate this photo'] = 'Gefa þessari mynd einkunn'; @@ -202,11 +202,11 @@ $lang['no rate'] = 'engin einkunn'; $lang['Photos posted within the last %d day.'] = 'Aðeins myndir birtar á síðasta %d degi.'; $lang['Photos posted within the last %d days.'] = 'Aðeins myndir birtar á síðustu %d dögum.'; $lang['password updated'] = 'lykilorð uppfært'; -$lang['Recent period must be a positive integer value'] = 'Nýlegt tímabil verður að vera a jákvæð heiltala gildi'; +$lang['Recent period must be a positive integer value'] = 'Nýlegt tímabil verður að vera jákvætt heiltölugildi'; $lang['photo'] = 'mynd'; -$lang['Click on the photo to see it in high definition'] = 'Styðjið á myndina til að sjá hana í háskerpu'; +$lang['Click on the photo to see it in high definition'] = 'Smelltu á myndina til að sjá hana í háskerpu'; $lang['Show file metadata'] = 'Sýna lýsigögn skráar'; -$lang['Powered by'] = 'Keyrt af'; +$lang['Powered by'] = 'Keyrt með'; $lang['Preferences'] = 'Valmöguleikar'; $lang['Previous'] = 'Fyrri'; $lang['Random photos'] = 'Myndir af handahófi'; @@ -217,13 +217,13 @@ $lang['Recent period'] = 'Nýlegt tímabil'; $lang['Recent photos'] = 'Nýlegar myndir'; $lang['display most recent photos'] = 'birta nýlegustu myndirnar'; $lang['Redirection...'] = 'Áframsending…'; -$lang['Please, enter a login'] = 'Vinsamlegast sláið inn notandanafn'; +$lang['Please, enter a login'] = 'Settu inn notandanafn'; $lang['login mustn\'t end with a space character'] = 'notandanafn má ekki enda á bili'; $lang['login mustn\'t start with a space character'] = 'notandanafn má ekki byrja á bili'; $lang['this login is already used'] = 'þetta notandanafn er nú þegar í notkun'; -$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'netfang verður að vera xxx@yyy.eee (example : jack@altern.org)'; +$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'netfang verður að vera xxx@yyy.eee (dæmi : jack@altern.org)'; $lang['Auto login'] = 'Sjálfvirk innskráning'; -$lang['remove this tag from the list'] = 'fjarlægja merki úr lista'; +$lang['remove this tag from the list'] = 'fjarlægja þetta merki úr listanum'; $lang['representative'] = 'smámynd albúms'; $lang['Search for Author'] = 'Leita að höfundi'; $lang['Search in albums'] = 'Leita í albúmum'; @@ -232,9 +232,9 @@ $lang['Date'] = 'Dagsetning'; $lang['End-Date'] = 'Lokadagsetning'; $lang['Kind of date'] = 'Hvers konar dagsetning'; $lang['Search for words'] = 'Leita að orðum'; -$lang['Search for all terms'] = 'Leita að öllum skilmálum'; -$lang['Search for any term'] = 'Leita að hvaða skilmálum sem er'; -$lang['Empty query. No criteria has been entered.'] = 'Tóm fyrirspurn. Engin viðmið hafa verið skráð.'; +$lang['Search for all terms'] = 'Leita að öllum hugtökum'; +$lang['Search for any term'] = 'Leita að hvaða hugtökum sem er'; +$lang['Empty query. No criteria has been entered.'] = 'Tóm fyrirspurn. Engin skilyrði hafa verið skráð.'; $lang['Search results'] = 'Leitarniðurstöður'; $lang['Search in sub-albums'] = 'Leita í undiralbúmum'; $lang['Contact'] = 'Hafa samband'; @@ -244,7 +244,7 @@ $lang['Show number of hits'] = 'Sýna fjölda niðurstaða'; $lang['slideshow'] = 'myndasýning'; $lang['stop the slideshow'] = 'stöðva myndasýningu'; $lang['Specials'] = 'Meira'; -$lang['SQL queries in'] = 'SQL fyrirspurnir í'; +$lang['SQL queries in'] = 'SQL-fyrirspurnir í'; $lang['display only recently posted photos'] = 'birta aðeins myndir sem nýlega voru settar inn'; $lang['return to the display of all photos'] = 'aftur í sýningu á öllum myndum'; $lang['the beginning'] = 'upphafið'; @@ -252,7 +252,7 @@ $lang['Thumbnails'] = 'Smámyndir'; $lang['Menu'] = 'Valmynd'; $lang['A comment on your site'] = 'Umsögn á síðuni þinni'; $lang['today'] = 'í dag'; -$lang['Update your rating'] = 'uppfæra einkunn þína'; +$lang['Update your rating'] = 'Uppfæra einkunn þína'; $lang['the username must be given'] = 'notandanafnsins er krafist'; $lang['useful when password forgotten'] = 'gagnlegt ef lykilorð gleymist'; $lang['Quick search'] = 'Hraðleit'; @@ -264,16 +264,16 @@ $lang['Comment: %s'] = 'Umsögn: %s'; $lang['Comment by %s'] = 'Umsögn eftir %s'; $lang['User: %s'] = 'Notandi: %s'; $lang['Email: %s'] = 'Netfang: %s'; -$lang['Admin: %s'] = 'Admin: %s'; +$lang['Admin: %s'] = 'Stjórnandi: %s'; $lang['Registration of %s'] = 'Nýskráning %s'; $lang['Album: %s'] = 'Albúm: %s'; -$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Slæm staða fyrir notanda "gestur", sjálfgefin staða verðu notuð. Vinsamlegast tilkynnið til vefstjóra.'; +$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Röng staða fyrir notandann "gestur", sjálfgefin staða verður notuð. Endilega tilkynntu þetta til vefstjóra.'; $lang['this email address is already in use'] = 'þetta netfang er nú þegar í notkun'; -$lang['Album results for'] = 'Albúm noðurstöðut fyrir'; +$lang['Album results for'] = 'Niðurstöðu albúma fyrir'; $lang['Tag results for'] = 'Merkja niðurstöður fyrir'; $lang['from %s to %s'] = 'frá %s til %s'; $lang['Play of slideshow'] = 'Spila myndasýningu'; -$lang['Pause of slideshow'] = 'Setja hlé á myndasýningu'; +$lang['Pause of slideshow'] = 'Gera hlé á myndasýningu'; $lang['Repeat the slideshow'] = 'Endurtaka myndasýningu'; $lang['Not repeat the slideshow'] = 'Ekki endurtaka myndasýningu'; $lang['Reduce diaporama speed'] = 'Minnka hraða á myndasýningu'; @@ -283,48 +283,48 @@ $lang['Yes'] = 'Já'; $lang['No'] = 'Nei'; $lang['%d photo'] = '%d mynd'; $lang['%d photos'] = '%d myndir'; -$lang['%d photo is also linked to current tags'] = '%d mynd er einnig tengd við núverandi merkingar'; -$lang['%d photos are also linked to current tags'] = '%d myndir eru einnig tengdar við núverandi merkingar'; +$lang['%d photo is also linked to current tags'] = '%d mynd er einnig tengd við fyrirliggjandi merki'; +$lang['%d photos are also linked to current tags'] = '%d myndir eru einnig tengdar við fyrirliggjandi merki'; $lang['display photos linked to this tag'] = 'birta myndir tengdar við þetta merki'; $lang['photos posted during the last %d days'] = 'myndir birtar síðustu %d daga'; -$lang['Piwigo Help'] = 'Piwigo hjáp'; +$lang['Piwigo Help'] = 'Aðstoð fyrir Piwigo'; $lang['Rank'] = 'Staða'; $lang['group by letters'] = 'hópa eftir bókstöfum'; $lang['letters'] = 'bókstafir'; -$lang['show tag cloud'] = 'sýna merkingarský'; +$lang['show tag cloud'] = 'sýna merkjaský'; $lang['cloud'] = 'ský'; $lang['Reset to default values'] = 'Endurstilla á sjálfgefin gildi'; -$lang['delete all photos from your favorites'] = 'eyða öllum myndum úr uppáhalds'; +$lang['delete all photos from your favorites'] = 'eyða öllum myndum úr eftirlætum'; $lang['Sent by'] = 'Sent af'; -$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Lokað er fyrir vefkökur eða ekki stuðningur í vafranum þínum. Þú verður að virkja vefkökur til að tengjast.'; +$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Lokað er fyrir vefkökur eða ekki stuðningur við þær í vafranum þínum. Þú verður að virkja vefkökur til að tengjast.'; $lang['Edit a comment'] = 'Breyta umsögn'; $lang['Are you sure?'] = 'Ertu viss?'; $lang['(!) This comment requires validation'] = '(!) Þessi umsögn krefst staðfestingar'; $lang['Welcome'] = 'Velkomin'; -$lang['Welcome to your Piwigo photo gallery!'] = 'Velkomin í Piwigo myndasafnið þitt!'; +$lang['Welcome to your Piwigo photo gallery!'] = 'Velkomin í Piwigo-myndasafnið þitt!'; $lang['... or browse your empty gallery'] = '... eða skoða tóma myndasafnið þitt'; -$lang['... or please deactivate this message, I will find my way by myself'] = '... eða vinsamlegast slökkva á þessum skilaboðum, ég mun rata sjálf/ur'; -$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hæ %s, Piwigo myndasafnið þitt er tómt!'; +$lang['... or please deactivate this message, I will find my way by myself'] = '... eða slökkva á þessum skilaboðum, ég mun rata sjálf/ur'; +$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hæ %s, Piwigo-myndasafnið þitt er tómt!'; $lang['I want to add photos'] = 'Ég vil bæta við myndum'; $lang['Manage this user comment: %s'] = 'Stjórna umsögn þessa notenda: %s'; -$lang['Email address is missing. Please specify an email address.'] = 'Netfang vantar. Vinsamlega tilgreinið netfang.'; +$lang['Email address is missing. Please specify an email address.'] = 'Netfang vantar. Tilgreindu netfang.'; $lang['This author modified following comment:'] = 'Þessi höfundur breytti eftirfarandi umsögn:'; $lang['This author removed the comment with id %d'] = 'Þessi höfundur fjarlægði umsögnina með auðkenninu %d'; -$lang['html tags are not allowed in login'] = 'html merkingar eru ekki leyfilegar við innskráningu'; +$lang['html tags are not allowed in login'] = 'html-merkingar eru ekki leyfilegar við innskráningu'; $lang['Desktop'] = 'Tölvuskjá'; $lang['Mobile'] = 'Farsíma'; $lang['Photo title, A → Z'] = 'Titill myndar, A → Ö'; $lang['Photo title, Z → A'] = 'Titill myndar, Ö → A'; $lang['Edit'] = 'Breyta'; $lang['Email'] = 'Tölvupóstur'; -$lang['EXIF Metadata'] = 'EXIF Lýsigögn'; -$lang['Date posted, old → new'] = 'Dagsetning birt, gömul → ný'; -$lang['Date posted, new → old'] = 'Dagsetning birt, ný → gömul'; -$lang['Date created, old → new'] = 'Dagsetning stofnað, gömul → ný'; -$lang['Date created, new → old'] = 'Dagsetning stofnað, ný → gömul'; +$lang['EXIF Metadata'] = 'EXIF-lýsigögn'; +$lang['Date posted, old → new'] = 'Dagsetning birt, eldra → nýtt'; +$lang['Date posted, new → old'] = 'Dagsetning birt, nýtt → eldra'; +$lang['Date created, old → new'] = 'Dagsetning stofnað, eldra → nýtt'; +$lang['Date created, new → old'] = 'Dagsetning stofnað, nýtt → eldra'; $lang['Check your email for the confirmation link'] = 'Athugaðu tölvupóstinn þinn með staðfestingartengilinn'; $lang['Change my password'] = 'Breyta lykilorðinu mínu'; -$lang['Bad request'] = 'Slæm beiðni'; +$lang['Bad request'] = 'Röng beiðni'; $lang['Apply on properties'] = 'Setja á eigindi'; $lang['Album name, Z → A'] = 'Albúmsheiti, Ö → A'; $lang['Album name, A → Z'] = 'Albúmsheiti, A → Ö'; @@ -341,20 +341,20 @@ $lang['Last Page'] = 'Síðasta síða'; $lang['Invalid username or password!'] = 'Ógilt notandanafn eða lykilorð!'; $lang['Invalid username or email'] = 'Ógilt notandanafn eða netfang'; $lang['Invalid key'] = 'Ógildur lykill'; -$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Ef þú heldur að þú hafir fengið þennan tölvupóst fyrir mistök, vinsamlega hafðu samband við okkur í %s'; +$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Ef þú heldur að þú hafir fengið þennan tölvupóst fyrir mistök, þá ættirðu að hafa samband við okkur á %s'; $lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Ef þetta voru mistök þá skaltu bara hunsa þennan tölvupóst og ekkert mun gerast.'; -$lang['IPTC Metadata'] = 'IPTC Lýsigögn'; +$lang['IPTC Metadata'] = 'IPTC-lýsigögn'; $lang['Here are your connection settings'] = 'Hér eru tengistillingar þínar'; $lang['Hello %s,'] = 'Hæ %s,'; -$lang['Go back to the album'] = 'Farðu aftur í albúmið'; +$lang['Go back to the album'] = 'Fara aftur í albúmið'; $lang['Forbidden'] = 'Óheimilt'; $lang['First Page'] = 'Fyrsta síða'; -$lang['File name, A → Z'] = 'Skráarheiti, A → Ö'; -$lang['File name, Z → A'] = 'Skráarheiti, Ö → A'; -$lang['Enter your new password below.'] = 'Sláðu inn nýja lykilorðið þitt hér að neðan.'; -$lang['Email address is mandatory'] = 'Netfang er skilyrt'; +$lang['File name, A → Z'] = 'Skráaheiti, A → Ö'; +$lang['File name, Z → A'] = 'Skráaheiti, Ö → A'; +$lang['Enter your new password below.'] = 'Settu inn nýja lykilorðið þitt hér að neðan.'; +$lang['Email address is mandatory'] = 'Netfang er nauðsynlegt'; $lang['Rating score'] = 'Einkunnastig'; -$lang['Please enter your username or email address.'] = 'Vinsamlegast sláðu inn notandanafn eða netfang.'; +$lang['Please enter your username or email address.'] = 'Settu inn notandanafn eða netfang.'; $lang['Piwigo encountered a non recoverable error'] = 'Piwigo varð fyrir óafturkræfri villu'; $lang['Photo description'] = 'Lýsing myndar'; $lang['Photo sizes'] = 'Stærð myndar'; @@ -363,8 +363,8 @@ $lang['Permalink for album not found'] = 'Föst krækja fyrir albúm fannst ekki $lang['Password: ********** (no copy by email)'] = 'Lykilorð: ********** (ekkert afrit með tölvupósti)'; $lang['Password: %s'] = 'Lykilorð: %s'; $lang['Password reset is not allowed for this user'] = 'Endurstilling lykilorðs er ekki leyfð fyrir þennan notanda'; -$lang['Password is missing. Please enter the password.'] = 'Lykilorð vantar. Vinsamlega sláðu inn lykilorðið.'; -$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Staðfestingu lykilorðs vantar. Vinsamlega staðfestu valið lykilorð.'; +$lang['Password is missing. Please enter the password.'] = 'Lykilorð vantar. Settu inn lykilorðið.'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Staðfestingu lykilorðs vantar. Staðfestu valið lykilorð.'; $lang['Password Reset'] = 'Endurstilla lykilorð'; $lang['Page not found'] = 'Síða fannst ekki'; $lang['Original'] = 'Upprunaleg'; @@ -375,16 +375,16 @@ $lang['Username modification'] = 'Breyting á notandanafni'; $lang['Username is mandatory'] = 'Notandanafn er skilyrt'; $lang['Username "%s" on gallery %s'] = 'Notandanafn "%s" á myndasafni %s'; $lang['User "%s" has no email address, password reset is not possible'] = 'Notandinn "%s" er ekki með netfang, endurstilling lykilorðs er ekki möguleg'; -$lang['To reset your password, visit the following address:'] = 'Til að endurstilla lykilorðið þitt farðu á eftirfarandi vistfang:'; +$lang['To reset your password, visit the following address:'] = 'Til að endurstilla lykilorðið þitt skaltu fara á eftirfarandi vistfang:'; $lang['Theme'] = 'Þema'; $lang['The passwords do not match'] = 'Lykilorðin passa ekki saman'; $lang['The number of photos per page must be a not null scalar'] = 'Fjöldi mynda á hverri síðu verður að vera heiltala sem ekki er núll'; $lang['Thank you for registering at %s!'] = 'Takk fyrir að skrá þig hjá %s!'; -$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Skráning tókst, þú munt fljótlega fá tölvupóst með þínum tengistillingum. Velkominn!'; +$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Skráning tókst, þú munt fljótlega fá tölvupóst með þínum tengistillingum. Velkomin/n!'; $lang['Someone requested that the password be reset for the following user account:'] = 'Einhver bað um að lykilorðið yrði endurstillt fyrir eftirfarandi notandareikning:'; $lang['Show latest comments first'] = 'Sýna nýjustu umsagnir fyrst'; $lang['Show oldest comments first'] = 'Sýna elstu umsagnir fyrst'; -$lang['Send my connection settings by email'] = 'Sendu tengistillingar mínar með tölvupósti'; +$lang['Send my connection settings by email'] = 'Senda tengistillingar mínar með tölvupósti'; $lang['Return to home page'] = 'Fara aftur á forsíðuna'; $lang['Requested tag does not exist'] = 'Umbeðið merki er ekki til'; $lang['Requested album does not exist'] = 'Umbeðið albúm er ekki til'; @@ -400,7 +400,7 @@ $lang['Username or email'] = 'Notandanafn eða netfang'; $lang['xsmall'] = 'XS - auka lítil'; $lang['xlarge'] = 'XL - auka stór'; $lang['thumb'] = 'Smámynd'; -$lang['square'] = 'Ferningur'; +$lang['square'] = 'Ferningslaga'; $lang['small'] = 'S - lítil'; $lang['medium'] = 'M - miðlungs'; $lang['mandatory'] = 'skilyrt'; @@ -410,7 +410,7 @@ $lang['You will receive a link to create a new password via email.'] = 'Þú fæ $lang['Your authentication key is no longer valid.'] = 'Auðkenningarlykillinn þinn er ekki lengur gildur.'; $lang['Your password has been reset'] = 'Lykilorðið þitt hefur verið endurstillt'; $lang['Your username has been successfully changed to : %s'] = 'Notandanafni þínu hefur verið breytt í: %s'; -$lang['Your website URL is invalid'] = 'Vefslóðin að þínu vefsvæði er ógild'; +$lang['Your website URL is invalid'] = 'Vefslóðin að vefsvæðinu þínu er ógild'; $lang['generate random password'] = 'útbúa handahófskennt lykilorð'; $lang['Start-Date'] = 'Upphafsdagur'; $lang['%d visits'] = '%d heimsóknir'; @@ -418,7 +418,7 @@ $lang['Added by'] = 'Bætt við af'; $lang['Album description'] = 'Lýsing á albúmi'; $lang['Album title'] = 'Heiti albúms'; $lang['Albums found'] = 'Albúm fundust'; -$lang['Albums listed here match your search by word. Click on one to browse by album.'] = 'Albúm sem eru tilgreind hér passa við leit þína með orði. Smelltu á eitt til að fletta eftir albúmi.'; +$lang['Albums listed here match your search by word. Click on one to browse by album.'] = 'Albúm sem eru tilgreind hér samsvara við leit þína með orði. Smelltu á eitt til að fletta eftir albúmi.'; $lang['Cancel'] = 'Hætta við'; $lang['Choose filters'] = 'Velja síur'; $lang['Clear'] = 'Hreinsa'; @@ -427,14 +427,14 @@ $lang['File type'] = 'Skráartegund'; $lang['Fill in the filters to start a search'] = 'Veldu síur til að hefja leit'; $lang['Filters'] = 'Síur'; $lang['No results are available.'] = 'Engar niðurstöður liggja fyrir.'; -$lang['Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'] = 'Fyrirfram eru tilteknar síur lagðar eru til, en þú getur bætt við eða fjarlægt þær með því að nota hnappinn „Veldu síur“.'; -$lang['Search in :'] = 'Leitaðu í :'; -$lang['Search in this set'] = 'Leitaðu í þessu setti'; +$lang['Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'] = 'Boðið er upp á forskrifaðar síur, en þú getur bætt við eða fjarlægt þær með því að nota hnappinn „Veldu síur“.'; +$lang['Search in :'] = 'Leita í :'; +$lang['Search in this set'] = 'Leita í þessu setti'; $lang['Tags found'] = 'Merki fundust'; $lang['Tags listed here match your search by word. Click on one to browse by tag.'] = 'Merki sem skráð eru hér passa við leit þína með orði. Smelltu á eitt til að fletta eftir merki.'; $lang['Unknown time period'] = 'Óþekkt tímabil'; $lang['Validate'] = 'Staðfesta'; -$lang['You can try to edit your filters and perform a new search.'] = 'Þú getur prófað að breyta síunum þínum og framkvæmt nýja leit.'; +$lang['You can try to edit your filters and perform a new search.'] = 'Þú getur prófað að breyta síunum þínum og framkvæma nýja leit.'; $lang['last 24 hours'] = 'síðastu 24 klst.'; $lang['last 3 months'] = 'Síðustu 3 mánuði'; $lang['last 30 days'] = 'Síðustu 30 daga'; @@ -449,4 +449,88 @@ $lang['Only the first %d albums are displayed, out of %d.'] = 'Aðeins fyrstu %d $lang['Pages'] = 'Síður'; $lang['The PDF you requested is too large to display on this page.'] = 'PDF-skjalið sem þú baðst um er of stórt til að birta á þessari síðu.'; $lang['Custom dates'] = 'Sérsniðnar dagsetningar'; -$lang['last 12 months'] = 'Síðustu 12 mánuðir'; \ No newline at end of file +$lang['last 12 months'] = 'Síðustu 12 mánuði'; +$lang['There are no authors available for the photos currently filtered'] = 'Það eru engir höfundar tiltækir fyrir síuðu myndirnar'; +$lang['There are no creation dates available for the photos currently filtered'] = 'Það eru engar upprunadagsetningar í boði fyrir síuðu myndirnar'; +$lang['There are no tags available for the photos currently filtered'] = 'Það eru engin merki tiltæk fyrir síuðu myndirnar'; +$lang['Set your password below.'] = 'Stilltu lykilorðið þitt hér að neðan.'; +$lang['Custom date'] = 'Sérsniðin dagsetning'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Viltu virkilega afturkalla API lykilinn “%s“?'; +$lang['3xlarge'] = '3XL - extra stór'; +$lang['4xlarge'] = '4XL - risastór'; +$lang['API Key has been successfully edited.'] = 'API-lyklinum hefur verið breytt.'; +$lang['API Key has been successfully revoked.'] = 'API-lykillinn hefur verið afturkallaður.'; +$lang['API Key name'] = 'Heiti API-lykils'; +$lang['API Key not found'] = 'API-lykill fannst ekki'; +$lang['API Keys'] = 'API-lyklar'; +$lang['Account'] = 'Aðgangur'; +$lang['Already have an account ?'] = 'Ertu nú þegar með aðgang?'; +$lang['An email has been sent with a link to reset your password'] = 'Tölvupóstur hefur verið sendur með tengli til að endurstilla lykilorðið þitt'; +$lang['An error has occured please got back to Sign in or Register'] = 'Villa kom upp, farðu aftur í Innskráningu eða Skráningu'; +$lang['Change your password'] = 'Breyttu lykilorðinu'; +$lang['Check your inbox'] = 'Athugaðu innhólf póstfoprritsins'; +$lang['Choose how you want to see your gallery'] = 'Veldu hvernig þú vilt sjá myndasafnið þitt'; +$lang['Confirm my new password'] = 'Staðfesta nýja lykilorðið mitt'; +$lang['Confirm new password'] = 'Staðfestu nýtt lykilorð'; +$lang['Create API Keys to secure your acount'] = 'Búðu til API-lykla til að tryggja reikninginn þinn'; +$lang['Create a new API key to secure your account.'] = 'Búðu til nýjan API-lykil til að tryggja reikninginn þinn.'; +$lang['Create an account'] = 'Stofna reikning'; +$lang['Created at'] = 'Búið til kl.'; +$lang['This API key was manually revoked on %s'] = 'Þessi API-lykill var afturkallaður handvirkt þann %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Til að halda áfram að nota þetta API-beiðnakerfi, þá ættirðu að endurnýja lykilinn þinn áður en hann rennur út.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Til að sýsla með API-lyklana þínua skaltu skrá þig inn með notandanafni/lykilorði.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Þegar þetta er virkjað er sameiginlegt sniðmát notað fyrir innskráningar- og skráningarsíður, óháð þema.'; +$lang['You can manage your API keys in your account settings.'] = 'Þú getur stjórnað API-lyklunum þínum í reikningsstillingunum þínum.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Þú ert ekki með netfang, þannig að þú færð ekki tilkynningu þegar API-lykillinn þinn er að renna út.'; +$lang['Your API key will expire in %d day.'] = 'API-lykillinn þinn rennur út eftir %d dag.'; +$lang['Your API key will expire in %d days.'] = 'API-lykillinn þinn rennur út eftir %d daga.'; +$lang['Your API key will expire soon'] = 'API-lykillinn þinn rennur bráðum út'; +$lang['Your changes have been applied.'] = 'Breytingarnar þínar hafa verið virkjaðar.'; +$lang['Your password was successfully reset'] = 'Lykilorðið þitt var endurstillt'; +$lang['Your password was successfully set'] = 'Lykilorðið þitt hefur verið stillt'; +$lang['must not be empty'] = 'má ekki vera tómt'; +$lang['you must choose a date'] = 'þú verður að velja dagsetningu'; +$lang['Hide expired keys'] = 'Fela útrunna lykla'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Ekki er hægt að afrita sjálfvirkt. Afritaðu frekar handvirkt.'; +$lang['Last use'] = 'Síðasta notkun'; +$lang['Manage your account'] = 'Stjórnaðu reikningnum þínum'; +$lang['Never'] = 'Aldrei'; +$lang['New API Key'] = 'Nýr API-lykill'; +$lang['No expiration'] = 'Engin gildistími'; +$lang['Options'] = 'Valmöguleikar'; +$lang['Return to Sign in'] = 'Til baka á Innskráning'; +$lang['Return to the gallery'] = 'Til baka í myndasafnið'; +$lang['Revoke'] = 'Afturkalla'; +$lang['Revoked'] = 'Afturkallað'; +$lang['Set my password'] = 'Skrá lykilorðið mitt'; +$lang['Show expired keys'] = 'Sýna útrunna lykla'; +$lang['The api key has been successfully created.'] = 'API-lykillinn hefur verið útbúinn.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'Netfangið %s verður notað til að láta þig vita þegar API lykillinn þinn er að renna út.'; +$lang['The secret key can no longer be displayed.'] = 'Ekki er lengur hægt að birta leynilykilinn.'; +$lang['Don\'t have an account yet ?'] = 'Ertu ekki ennþá með aðgang?'; +$lang['Done'] = 'Lokið'; +$lang['Duration'] = 'Tímalengd'; +$lang['Edit API Key'] = 'Breyta API-lykli'; +$lang['Expert mode'] = 'Sérfræðingshamur'; +$lang['Expired'] = 'Útrunnið'; +$lang['Expired on'] = 'Útrunnið þann'; +$lang['Expires in'] = 'Rennur út eftir'; +$lang['Generate API Key'] = 'Búa til API-lykil'; +$lang['Generate key'] = 'Búa til lykil'; +$lang['Hello %s, enter your new password below.'] = 'Hæ %s, settu inn nýja lykilorðið þitt hér að neðan.'; +$lang['An email has been sent with a verification code'] = 'Tölvupóstur hefur verið sendur með staðfestingarkóða'; +$lang['ID copied.'] = 'Auðkenni afritað.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Ef þú færð ekki tölvupóstinn, vinsamlegast hafðu samband við vefstjóra þinn.'; +$lang['Invalid verification code'] = 'Ógildur staðfestingarkóði'; +$lang['Save your ID and secret'] = 'Vistaðu auðkennið og leyndarmálið'; +$lang['Secret copied. Keep it in a safe place.'] = 'Leyndarmálið afritað. Geymið það á öruggum stað.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Leyndarmálið verður ekki lengur birt. Þú verður að afrita það til að halda áfram.'; +$lang['Verification code'] = 'Staðfestingarkóði'; +$lang['Verify'] = 'Staðfesta'; +$lang['Here is your verification code:'] = 'Hér er staðfestingarkóðinn þinn:'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Ef þetta varst ekki þú, vinsamlegast breyttu lykilorðinu þínu strax eða hafðu samband við vefstjórann þinn.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Ef þú breyttir lykilorðinu þínu vegna þess að þú telur að það hafi verið stolið, mælum við með að þú afturkallir %d API lykla í prófílnum þínum.'; +$lang['Too many attempts, please try later..'] = 'Of margar tilraunir, vinsamlegast reynið síðar..'; +$lang['Verification successful! You can now choose a new password.'] = 'Staðfesting tókst! Þú getur nú valið nýtt lykilorð.'; +$lang['Your verification code'] = 'Staðfestingarkóðinn þinn'; +$lang['edit user preferences'] = 'breyta notandastillingum'; \ No newline at end of file diff --git a/language/is_IS/help_quick_search.lang.php b/language/is_IS/help_quick_search.lang.php new file mode 100644 index 000000000..1f4c59a57 --- /dev/null +++ b/language/is_IS/help_quick_search.lang.php @@ -0,0 +1,57 @@ +new exciting features.'] = 'Questo è un aggiornamento importante, con nuove e interessanti funzionalità.'; $lang['Some themes and plugins may be not available yet.'] = 'Alcuni temi e plugin possono non essere ancora disponibili.'; $lang['You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'E\' possibile aggiornare direttamente a Piwigo %s, senza passare per Piwigo %s (consigliato).'; -$lang['Save Template Directory'] = 'Salvare la template directory'; -$lang['Some upgrades are available for extensions.'] = 'Degli aggiornamenti sono disponibili per le estensioni.'; +$lang['Save Template Directory'] = 'Salva la directory template'; +$lang['Some upgrades are available for extensions.'] = 'Alcune estensioni hanno aggiornamenti disponibili.'; $lang['Please wait...'] = 'Attendere prego...'; -$lang['Ignore All'] = 'Ignorare tutto'; +$lang['Ignore All'] = 'Ignora tutto'; $lang['Crop'] = 'Ridimenzionare'; $lang['Width'] = 'Larghezza'; $lang['Height'] = 'Altezza'; $lang['Follow Orientation'] = 'Rispettare l\'orientamento'; $lang['Graphics Library'] = 'Libreria grafica'; -$lang['Show menubar'] = 'Visualizzare il menu'; +$lang['Show menubar'] = 'Visualizza il menu'; $lang['No results'] = 'Nessun risultato'; $lang['Type in a search term'] = 'Digitare un termine di ricerca'; $lang['Searching...'] = 'Ricerca...'; $lang['new'] = 'nuovo'; $lang['Default photos order'] = 'Ordinamento predefinita delle foto'; -$lang['Activate icon "new" next to albums and pictures'] = 'Visualizzare l\'icona "nuovo" a fianco degli album e delle foto'; +$lang['Activate icon "new" next to albums and pictures'] = 'Visualizza l\'icona "nuovo" a fianco degli album e delle foto'; $lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Non potete impostare l\'ordine predefinito delle foto perché avete un\'impostazione personalizzata nella configurazione locale.'; $lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'Avete specificato $conf[\'order_by\'] nel vostro file di configurazione locale, questo parametro è obsoleto, si prega di eliminarlo o rinominarlo in $conf[\'order_by_custom\'] !'; -$lang['Add a criteria'] = 'Aggiungere un criterio'; +$lang['Add a criteria'] = 'Aggiungi un criterio'; $lang['... or '] = '... oppure '; -$lang['Create'] = 'Creare'; -$lang['Start Upload'] = 'Avviare il caricamento'; +$lang['Create'] = 'Crea'; +$lang['Start Upload'] = 'Avvia il caricamento'; $lang['You are using the Flash uploader. Problems? Try the Browser uploader instead.'] = 'Si sta utilizzando il Flash uploader. Problemi? Provare il Browser uploader invece.'; $lang['You are using the Browser uploader. Try the Flash uploader instead.'] = 'State utilizzando il Browser uploader. Provate con il Flash uploader invece.'; $lang['Maximum file size: %sB.'] = 'Grandezza massima dei file: %sB.'; $lang['Allowed file types: %s.'] = 'Tipi di file autorizzati: %s.'; $lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'Risoluzione massima approssimativa: %dM pixels (sia %dx%d pixels)'; -$lang['Manage Permissions'] = 'Gestire i permessi'; +$lang['Manage Permissions'] = 'Gestisci i permessi'; $lang['Photo %s of %s'] = 'Foto %s su %s'; -$lang['show details'] = 'mostrare i dettagli'; -$lang['hide details'] = 'nascondere i dettagli'; -$lang['Merge tags'] = 'Unire i tags'; -$lang['Select the destination tag'] = 'Selezionare il tag di destinazione'; +$lang['show details'] = 'mostra i dettagli'; +$lang['hide details'] = 'nascondi dettagli'; +$lang['Merge tags'] = 'Unire i tag'; +$lang['Select the destination tag'] = 'Seleziona il tag di destinazione'; $lang['(this tag will be deleted)'] = '(questo tag sara cancellato)'; -$lang['Confirm merge'] = 'Confermare l\'unione'; -$lang['Merge selected tags'] = 'Unire i tags selezionati'; +$lang['Confirm merge'] = 'Conferma l\'unione'; +$lang['Merge selected tags'] = 'Unire i tag selezionati'; $lang['No destination tag selected'] = 'Non avete selezionato il tag di destinazione'; -$lang['Tags %s merged into tag %s'] = 'I tags %s sono stati uniti nel tag %s'; -$lang['Select at least two tags for merging'] = 'Selezionare almeno due tag da fuzionare'; +$lang['Tags %s merged into tag %s'] = 'I tag %s sono stati uniti nel tag %s'; +$lang['Select at least two tags for merging'] = 'Seleziona almeno due tag da unire'; $lang['Average rate'] = 'Voto medio'; $lang['Rate'] = 'Voto'; $lang['Learn more'] = 'Per saperne di più'; -$lang['Select an album'] = 'Selezionare un album'; +$lang['Select an album'] = 'Seleziona un album'; $lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'Per impostazione predefinita, Piwigo creerà una nuova dimensione web dalla versione HD (alta definizione) della vostra foto.'; $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'Se la foto HD non è disponibile e la foto dimensioni web è più grande delle dimensioni qui di seguito, allora Piwigo la considererà come una foto HD e creerà la nuova foto dimensioni web.'; $lang['An error has occured during upgrade.'] = 'Si è verificato un\'errore durante l\'aggiornamento.'; @@ -776,24 +776,24 @@ $lang['With no album'] = 'Senza album'; $lang['With no tag'] = 'Senza tag'; $lang['With no virtual album'] = 'Senza album virtuale'; $lang['Predefined filter'] = 'Filtro predefinito'; -$lang['Add tags'] = 'Aggiungere i tags'; +$lang['Add tags'] = 'Aggiungi tag'; $lang['Synchronize metadata'] = 'Sincronizzare i metadati'; -$lang['Add to caddie'] = 'Aggiungere al cestino'; +$lang['Add to caddie'] = 'Aggiungi al carrello'; $lang['Zoom'] = 'Zoom'; -$lang['Resize after upload'] = 'Ridimensionare dopo il caricamento'; +$lang['Resize after upload'] = 'Ridimensiona dopo il caricamento'; $lang['Resize after upload disabled due to the use of GD as graphic library'] = 'Ridimensionamento dopo l\'upload disattivato a causa dell\'uso di GD come libreria grafica'; $lang['Original Size'] = 'Dimensioni originali'; -$lang['Send connection settings by email'] = 'Inviare gli ID via email'; +$lang['Send connection settings by email'] = 'Invia gli ID via email'; $lang['Activate comments'] = 'Attivare i commenti'; $lang['Default comments order'] = 'Ordinamento predefinito dei commenti'; $lang['A locked gallery is only visible to administrators'] = 'Una galleria bloccata è visibile solo dagli amministratori'; -$lang['Unlock gallery'] = 'Sbloccare la galleria'; +$lang['Unlock gallery'] = 'Sblocca la galleria'; $lang['Gallery unlocked'] = 'Galleria sbloccata'; $lang['Notify administrators when a comment is'] = 'Notificare agli amministratori quando un commento viene'; $lang['modified'] = 'modificato'; $lang['deleted'] = 'cancellato'; $lang['pending validation'] = 'in attesa di convalida'; -$lang['Save visits in history for'] = 'Salvare storia delle visite per '; +$lang['Save visits in history for'] = 'Salva storia delle visite per '; $lang['simple visitors'] = 'singoli visitatori'; $lang['registered users'] = 'utenti registrati'; $lang['administrators'] = 'amministratori'; @@ -808,9 +808,9 @@ $lang['Not cropped correctly?'] = 'La foto non è ritagliata correttamente?'; $lang['Photo name'] = 'Nome foto'; $lang['Automatic sort order'] = 'Ordinamento automatico'; $lang['apply automatic sort order'] = 'applicare un criterio di ordinamento automatico'; -$lang['Save manual order'] = 'Salvare l\'ordinamento manuale'; +$lang['Save manual order'] = 'Salva l\'ordinamento manuale'; $lang['cancel manual order'] = 'cancellare l\'ordinamento manuale'; -$lang['Cancel'] = 'Cancellare'; +$lang['Cancel'] = 'Annulla'; $lang['List'] = 'Lista'; $lang['Web Form'] = 'Modulo web'; $lang['Applications'] = 'Applicazioni'; @@ -855,7 +855,7 @@ $lang['For photo sizes with crop, such as "Square", Piwigo will do its best to i $lang['By default, the center of interest is placed in the middle of the photo.'] = 'Per impostazione predefinita, il centro d\'interesse è posizionato nel mezzo della foto.'; $lang['Select a zone with your mouse to define a new center of interest.'] = 'Seleziona una zona con il mouse in modo da definire un nuovo centro d\'interesse.'; $lang['custom'] = 'Personalizzato'; -$lang['Delete multiple size images'] = 'Elimina immagini con dimensioni differenti'; +$lang['Delete multiple size images'] = 'Elimina immagini con dimensioni multiple'; $lang['Generate multiple size images'] = 'Genera immagini con dimensioni diverse'; $lang['add a new watermark'] = 'Aggiungi un nuovo watermark'; $lang['Apply watermark if height is bigger than'] = 'Aggiungi watermark se l\'altezza è maggiore di'; @@ -894,26 +894,26 @@ $lang['%d minute'] = '%d minuto'; $lang['%d minutes'] = '%d minuti'; $lang['%d second'] = '%d secondo'; $lang['%d seconds'] = '%d secondi'; -$lang['Sharpen'] = 'Evidenziare'; +$lang['Sharpen'] = 'Evidenzia'; $lang['Edit photo'] = 'Modificare foto'; -$lang['create a new site'] = 'creare un nuovo sito'; +$lang['create a new site'] = 'crea un nuovo sito'; $lang['No order field selected'] = 'Nessun criterio di ordinamento selezionato'; $lang['Name of the duplicate'] = 'Nome del duplicato'; $lang['Source tag'] = 'Sorgente tag'; $lang['Tag "%s" is now a duplicate of "%s"'] = 'Il tag "%s" è ormai una copia di "%s"'; -$lang['Duplicate selected tags'] = 'Duplicare i tags selezionati'; +$lang['Duplicate selected tags'] = 'Duplicare i tag selezionati'; $lang['Minimum height'] = 'Altezza minima'; $lang['Minimum width'] = 'Larghezza minima'; $lang['Portrait'] = 'Ritratto'; $lang['Landscape'] = 'Paesaggio'; $lang['Panorama'] = 'Panorama'; -$lang['Manage photos'] = 'Gestire foto'; +$lang['Manage photos'] = 'Gestisci foto'; $lang['View in gallery'] = 'Mostra nella galleria'; $lang['Number of albums per page'] = 'Numero d\'album per pagina'; $lang['Ratio'] = 'Rapporto'; $lang['between %d and %d pixels'] = 'tra %d e %d pixels'; $lang['between %.2f and %.2f'] = 'tra %.2f e %.2f'; -$lang['Manage the members'] = 'Gestire membri'; +$lang['Manage the members'] = 'Gestisci membri'; $lang['Type here the name of the new group'] = 'Digita quì il nome del nuovo gruppo'; $lang['No groups selected, no actions possible.'] = 'Nessun gruppo selezionato, nessuna azione possibile.'; $lang['Please select at least two groups'] = 'Seleziona almeno due gruppi'; @@ -923,10 +923,10 @@ $lang['This group will be unset to default'] = 'Questo gruppo non sarà più uti $lang['This group will be set to default'] = 'Questo gruppo sarà impostato sul valore predefinito'; $lang['No members to manage'] = 'Nessun membro da gestire'; $lang['Rename'] = 'Rinomina'; -$lang['Purge user cache'] = 'Svuotare la cache utente'; +$lang['Purge user cache'] = 'Svuota la cache utente'; $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'Le dimensioni dell\'immagine saranno ridotte a %dx%d pixel.'; $lang['Mail theme'] = 'Tema email'; -$lang['Select at least one tag'] = 'Selezionare almeno un tag'; +$lang['Select at least one tag'] = 'Seleziona almeno un tag'; $lang['Basic settings'] = 'Impostazioni base'; $lang['Loading...'] = 'Caricamento...'; $lang['Show %s users'] = 'Mostra %s utenti'; @@ -947,7 +947,7 @@ $lang['Change username'] = 'Cambia nome utente'; $lang['Update user'] = 'Aggiorna utente'; $lang['User %s updated'] = 'Utente %s aggiornato'; $lang['Users modified'] = 'Utenti modificati'; -$lang['Open user details'] = 'Aprire dettagli utente'; +$lang['Open user details'] = 'Apri dettagli utente'; $lang['Close user details'] = 'Chiudi dettagli utente'; $lang['close'] = 'chiudere'; $lang['Activate it now'] = 'Attivalo ora'; @@ -960,7 +960,7 @@ $lang['based on'] = 'basato su'; $lang['file name'] = 'nome file'; $lang['date & time'] = 'data e ora'; $lang['width & height'] = 'larghezza e altezza'; -$lang['No and unlock sub-albums'] = 'No e sbloccare sub-albums'; +$lang['No and unlock sub-albums'] = 'No e sblocca sub-albums'; $lang['Upload in progress'] = 'Trasferimento in corso...'; $lang['Delete %d orphan photos'] = 'Cancellazione di %d foto orfane'; $lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Ogni Email inviata conterrà una propria chiave di autenticazione automatica, valida per %s.'; @@ -972,27 +972,27 @@ $lang['Orphans'] = 'Orfane'; $lang['Recipients'] = ' Destinatari'; $lang['Y Repeat'] = 'Y Ripeti'; -$lang['Storage used'] = 'Stoccaggio utilizzato'; +$lang['Storage used'] = 'Memoria utilizzata'; $lang['Dashboard'] = 'Quadro di controllo'; $lang['checksum'] = 'checksum'; $lang['delete album and all %d photos, even the %d associated to other albums'] = 'cancellare l\'album et tutte le %d foto, anche le %d associate ad altri album'; $lang['delete only album, not photos'] = 'cancellare solo l\'album, e non le foto'; $lang['orphans to delete'] = 'orfane da cancellare'; $lang['delete album and the %d orphan photos'] = 'cancellare l\'album e le %d immagini orfane'; -$lang['Time has come to update your Piwigo with version %s, go to %s'] = 'È tempo di aggiornare la vostra version di Piwigp %s verso la %s'; +$lang['Time has come to update your Piwigo with version %s, go to %s'] = 'È tempo di aggiornare Piwigo alla versione %s, vai su %s'; $lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Condividete / Inviate le vostre foto direttamente dal vostro MacOS X (10.10 o successive) verso il vostro Piwigo.'; -$lang['Select tags'] = 'Selezionare dei Tag'; +$lang['Select tags'] = 'Seleziona i tag'; $lang['Running on an up-to-date Piwigo is important for security.'] = 'Mantenere Piwigo aggiornato è importante per la sicurezza.'; $lang['Piwigo Remote Sync is able to upload a whole folder hierarchy. If you run it again, only new photos will be uploaded.'] = 'Piwigo Remote Sync vi permette di aggiungere l\'insieme delle cartelle di una directory. Se eseguite di nuovo la sincronizzazione, verranno aggiunte solo le nuove foto.'; -$lang['Piwigo %s is available, please update'] = 'Piwigo %s è disponibile, siete pregati di effettuare l\'aggiornamento'; +$lang['Piwigo %s is available, please update'] = 'Piwigo %s è disponibile, aggiornalo!'; $lang['Delete album "%s" and its %d sub-albums.'] = 'Cancellare l\'album "%s" e i suoi %d sub-album.'; $lang['It only takes a few clicks.'] = 'Ciò si fa in pochi click'; $lang['Delete album "%s".'] = 'Cancellare l\'album "%s"'; -$lang['Display form'] = 'Visualizzare il modulo'; -$lang['No filter on album. Select one or type to search'] = 'Nessun filtro. Toccare qui per cercare un album.'; +$lang['Display form'] = 'Visualizza il modulo'; +$lang['No filter on album. Select one or type to search'] = 'Nessun filtro. Tocca qui per cercare un album.'; $lang['No tags selected, no actions possible.'] = 'Nessun tag selezionato, nessuna azione possibile.'; -$lang['Confirm deletion'] = 'Confermare l\'eliminazione'; -$lang['(determined from photos)'] = '(Determinata dalle foto)'; +$lang['Confirm deletion'] = 'Conferma l\'eliminazione'; +$lang['(determined from photos)'] = '(determinata dalle foto)'; $lang['Some checksums are missing.'] = 'Checkums mancanti'; $lang['Synchronization in progress'] = 'Sincronizzazione in corso'; $lang['Visit'] = 'Visita'; @@ -1010,15 +1010,15 @@ $lang['Display category date'] = 'Visualizza la data della categoria'; $lang['Piwigo requires an album to add photos.'] = 'Piwigo ha bisogno di un album per aggiungere delle foto.'; $lang[' (copy)'] = '(copia)'; $lang['Activity peak in the last weeks'] = 'Picchi di attività nelle ultime settimane'; -$lang['Album search tool'] = 'Ricerca d\'album'; -$lang['Are you sure you want to delete all sizes?'] = 'Sei sicuro di voler eliminare tutte le taglie ?'; -$lang['Are you sure you want to delete group "%s"?'] = 'Sei sicuro di voler eliminare il gruppo "%s" ?'; -$lang['Are you sure you want to delete the language "%s"?'] = 'Sei sicuro di voler rimuovere la lingua "%s" ?'; -$lang['Are you sure you want to delete the plugin "%s"?'] = 'Sei sicuro di voler rimuovere il plug-in "%s" ?'; -$lang['Are you sure you want to delete the ratings of the user "%s"?'] = 'Sei sicuro di voler eliminare le notazioni dell\'utente "%s" ?'; -$lang['Are you sure you want to delete the theme "%s"?'] = 'Sei sicuro di voler eliminare il tema "%s" ?'; -$lang['Are you sure you want to delete the user "%s"?'] = 'Sei sicuro di voler eliminare l\'utente "%s" ?'; -$lang['Are you sure you want to delete this site?'] = 'Sei sicuro di aver eliminato questo sito & nbsp?'; +$lang['Album search tool'] = 'Strumento di ricerca album'; +$lang['Are you sure you want to delete all sizes?'] = 'Sei sicuro di voler eliminare tutte le dimensioni?'; +$lang['Are you sure you want to delete group "%s"?'] = 'Sei sicuro di voler eliminare il gruppo "%s"?'; +$lang['Are you sure you want to delete the language "%s"?'] = 'Sei sicuro di voler rimuovere la lingua "%s"?'; +$lang['Are you sure you want to delete the plugin "%s"?'] = 'Sei sicuro di voler rimuovere il plug-in "%s"?'; +$lang['Are you sure you want to delete the ratings of the user "%s"?'] = 'Sei sicuro di voler eliminare i giudizi dell\'utente "%s"?'; +$lang['Are you sure you want to delete the theme "%s"?'] = 'Sei sicuro di voler eliminare il tema "%s"?'; +$lang['Are you sure you want to delete the user "%s"?'] = 'Sei sicuro di voler eliminare l\'utente "%s"?'; +$lang['Are you sure you want to delete this site?'] = 'Sei sicuro di voler eliminare questo sito?'; $lang['1 album found'] = '1 album trovato'; $lang['%s GB used'] = '%s GB utilizzati'; $lang['%s MB used'] = '%s MB utilizzati'; @@ -1035,17 +1035,17 @@ $lang['%d photos'] = '%d foto'; $lang['%d sub-albums'] = '%d sub-album'; $lang['Cache'] = 'Cache'; $lang['Choose which tag to merge these tags into'] = 'Scegli in quale tag unire questi tag'; -$lang['Are you sure you want to delete this theme?'] = 'Sei sicuro di aver eliminato questo tema ?'; -$lang['Are you sure you want to delete this?'] = 'Sei sicuro di rimuovere questo ?'; -$lang['Are you sure you want to install the plugin "%s"?'] = 'Sei sicuro di voler installare il plugin "%s" ?'; -$lang['Are you sure you want to lock the gallery?'] = 'Sei sicuro di voler bloccare la galleria ?'; -$lang['Delete album'] = 'Eliminare l\'album'; +$lang['Are you sure you want to delete this theme?'] = 'Sei sicuro di voler eliminare questo tema?'; +$lang['Are you sure you want to delete this?'] = 'Sei sicuro di volerlo eliminare?'; +$lang['Are you sure you want to install the plugin "%s"?'] = 'Sei sicuro di voler installare il plugin "%s"?'; +$lang['Are you sure you want to lock the gallery?'] = 'Sei sicuro di voler bloccare la galleria?'; +$lang['Delete album'] = 'Elimina l\'album'; $lang['Delete orphan tags ?'] = 'Rimuovere i tag orfani?'; $lang['Delete tag "%s"?'] = 'Rimuovere il tag "%s" ?'; $lang['Delete tags \{%s\}?'] = 'Rimuovere i tag \{%s\}?'; -$lang['Are you sure you want to restore this plugin?'] = 'Sei sicuro di ripristinare questo plugin ?'; -$lang['Are you sure you want to restore to default settings?'] = 'Sei sicuro di voler ripristinare le impostazioni predefinite ?'; -$lang['Are you sure you want to update all extensions?'] = 'Sei sicuro di volere aggiornare tutte le estensioni ?'; +$lang['Are you sure you want to restore this plugin?'] = 'Sei sicuro di ripristinare questo plugin?'; +$lang['Are you sure you want to restore to default settings?'] = 'Sei sicuro di voler ripristinare le impostazioni predefinite?'; +$lang['Are you sure you want to update all extensions?'] = 'Sei sicuro di volere aggiornare tutte le estensioni?'; $lang['Associate User'] = 'Associare l\'utente'; $lang['At least 2 selected tags are needed to merge'] = 'È necessario selezionare almeno 2 tag per la fusione'; $lang['Average last 12 months'] = 'Media degli ultimi 12 mesi'; @@ -1053,13 +1053,13 @@ $lang['Clear Selection'] = 'Cancella selezione'; $lang['Compare mode'] = 'Modalità di confronto'; $lang['Created on %s'] = 'Creato il %s'; $lang['Delete them'] = 'Eliminali'; -$lang['Display'] = 'Visualizzare'; -$lang['Displays a banner to install or open the official Piwigo app'] = 'Visualizza un banner per installare e/o aprire l\'applicazione mobile ufficiale di Piwigo'; -$lang['Are you sure you want to restore the plugin "%s"?'] = 'Sei sicuro di voler ripristinare il plugin "%s" ?'; +$lang['Display'] = 'Visualizza'; +$lang['Displays a banner to install or open the official Piwigo app'] = 'Visualizza un banner per installare e/o aprire l\'App ufficiale di Piwigo'; +$lang['Are you sure you want to restore the plugin "%s"?'] = 'Sei sicuro di voler ripristinare il plugin "%s"?'; $lang['Set as default'] = 'Definisci impostazione predefinita'; $lang['Videos'] = 'Video'; $lang['Yes, I am sure'] = 'Sì, sono sicuro'; -$lang['Yes, delete'] = 'Sì, voglio eliminare'; +$lang['Yes, delete'] = 'Sì, elimina'; $lang['in gallery'] = 'nella galleria'; $lang['no photo'] = 'nessuna immagine'; $lang['Dissociate user from this group'] = 'Dissocia l\'utente da questo gruppo'; @@ -1072,7 +1072,7 @@ $lang['Group renamed'] = 'Gruppo rinomato'; $lang['Group(s) \{%s1\} succesfully merged into "%s2"'] = 'Il/I gruppi \{%s1\} sono stati fusi nel gruppo "%s2"'; $lang['Groups \{%s\} succesfully deleted'] = 'I gruppi \{%s\} sono stati cancellati'; $lang['Keep them'] = 'Mantenergli'; -$lang['Manage album photos'] = 'Gestisci le foto del album'; +$lang['Manage album photos'] = 'Gestisci le foto dell\'album'; $lang['Manage sub-albums'] = 'Gestisci album secondari'; $lang['Manage users with user manager'] = 'Gestisci i membri nel gestore utenti'; $lang['Merge'] = 'Unisci'; @@ -1085,20 +1085,20 @@ $lang['Open in gallery'] = 'Apri in galleria'; $lang['Other'] = 'Altro'; $lang['Page Visited'] = 'Pagine viste'; $lang['Page Visited in %s'] = 'Pagine visualizzate in %s'; -$lang['Please upgrade your PHP version before any update.'] = 'Dovrai aggiornare il tuo PHP prima di poter aggiornare Piwigo.'; +$lang['Please upgrade your PHP version before any update.'] = 'Dovrai aggiornare PHP prima di poter aggiornare Piwigo.'; $lang['Portraits'] = 'Ritratti'; $lang['Posted %s'] = 'Pubblicata %s'; $lang['Promote mobile app on mobile devices'] = 'Promuovi l\'applicazione mobile su smartphone e tablet'; $lang['Refresh thumbnail'] = 'Cambia miniatura'; $lang['User "%s" dissociated from this group'] = 'L\'utente "%s" si è dissociato da questo gruppo'; $lang['Select all %d tags'] = 'Seleziona tutti i %d tag'; -$lang['Select an album... or type it!'] = 'Seleziona un album ... o scrivilo!'; +$lang['Select an album... or type it!'] = 'Seleziona un album... o scrivilo!'; $lang['Selection mode'] = 'Modalità di selezione'; $lang['Set as group for new users'] = 'Associa automaticamente ai futuri utenti'; $lang['Show inactive plugins'] = 'Mostra plugin disabilitati'; $lang['Show sub-albums'] = 'Mostra album secondari'; $lang['Showing %s users out of %s'] = 'Mostra %s utenti tra %s'; -$lang['Storage'] = 'Conservazione'; +$lang['Storage'] = 'Memoria'; $lang['Tag "%s" created'] = 'Il tag \"%s\" è stato creato'; $lang['Tag "%s" succesfully deleted'] = 'Il tag \"%s\" è stato eliminato'; $lang['Tag "%s1" renamed in "%s2"'] = 'Il tag \"%s1\" è stato rinominato \"%s2\"'; @@ -1118,11 +1118,11 @@ $lang['You have %s1 orphan : %s2'] = 'Hai %s1 orfano(i) : /%s2'; $lang['and %s others'] = 'e %s altri'; $lang['in administration'] = 'nell\'amministrazione'; $lang['Requires PHP %s'] = 'Richiede PHP %s'; -$lang['Review'] = 'Esaminare'; +$lang['Review'] = 'Esamina'; $lang['Root'] = 'Radice'; $lang['Search albums'] = 'Trova album'; $lang['Search tips'] = 'Suggerimenti per la ricerca'; -$lang['Select'] = 'Selezionare'; +$lang['Select'] = 'Seleziona'; $lang['%d+ albums found, try to refine the search'] = '%d+ album trovati! Affina la tua ricerca.'; $lang['Add Album'] = 'Aggiungi un album'; $lang['Apply an automatic order to root albums'] = 'Applica un ordinamento automatico agli album principali'; @@ -1140,10 +1140,10 @@ $lang['%s lines'] = '%s righe'; $lang['%d user edited'] = '%d utente editato'; $lang['%d user logged in'] = '%d utente connesso'; $lang['%d user logged out'] = '%d utente disconnesso'; -$lang['%d users added'] = '%d utente aggiunto'; -$lang['%d users edited'] = '%d utente editati'; -$lang['%d users logged in'] = '%d utente connessi'; -$lang['%d users logged out'] = '%d utente disconnessi'; +$lang['%d users added'] = '%d utenti aggiunti'; +$lang['%d users edited'] = '%d utenti editati'; +$lang['%d users logged in'] = '%d utenti connessi'; +$lang['%d users logged out'] = '%d utenti disconnessi'; $lang['%d user added'] = '%d utente aggiunto'; $lang['%d tag edited'] = '%d tag editato'; $lang['%d tag moved'] = '%d tag spostato'; @@ -1183,7 +1183,7 @@ $lang['and %d more'] = 'e %d altro(i)'; $lang['months ago'] = 'mesi'; $lang['since the beginning'] = 'da capo'; $lang['Close'] = 'Chiudere'; -$lang['Deactivated'] = 'Desattivato'; +$lang['Deactivated'] = 'Disattivato'; $lang['Discover'] = 'Scoprire'; $lang['Apr'] = 'Apr'; $lang['Aug'] = 'Ago'; @@ -1223,7 +1223,7 @@ $lang['Email'] = 'E-mail'; $lang['Edit photo #%s'] = 'Modifica foto #%s'; $lang['Edit guest user'] = 'Modifica utente ospite'; $lang['Edit'] = 'Modificare'; -$lang['Downloaded'] = 'Caricato'; +$lang['Downloaded'] = 'Scaricato'; $lang['Download all activities'] = 'Scarica tutte le attività'; $lang['Delete user'] = 'Elimina utente'; $lang['Delete these sizes'] = 'Elimina taglie'; @@ -1236,15 +1236,15 @@ $lang['Change Password'] = 'cambia la password'; $lang['Certification higher or equal to'] = 'Certificazione maggiore o uguale a'; $lang['Can be shared by several individuals without conflict (they cannot change the password).'] = 'Può essere condiviso tra più persone senza entrare in conflitto (password non modificabile).'; $lang['Cache size'] = 'Dimensione della cache'; -$lang['Are you sure you want to unlock the gallery?'] = 'Sei sicuro di voler sbloccare la galleria ?'; -$lang['Are you sure you want to uninstall the plugin "%s"?'] = 'Sei sicuro di voler disinstallare il plugin "%s" ?'; +$lang['Are you sure you want to unlock the gallery?'] = 'Sei sicuro di voler sbloccare la galleria?'; +$lang['Are you sure you want to uninstall the plugin "%s"?'] = 'Sei sicuro di voler disinstallare il plugin "%s"?'; $lang['Advanced filters'] = 'Filtri avanzati'; $lang['Additional filters'] = 'Filtri aggiuntivi'; $lang['Version %s'] = 'Versione %s'; -$lang['Users not logged in will have these settings applied, these settings are used by default for new users'] = 'Gli utenti non connessi avranno queste impostazioni applicate, queste impostazioni sono utilizzate per predefinizione per i nuovi utenti'; -$lang['Upload Formats'] = 'Scaricare formati'; +$lang['Users not logged in will have these settings applied, these settings are used by default for new users'] = 'Gli utenti non connessi avranno queste impostazioni applicate, queste impostazioni sono utilizzate per default per i nuovi utenti'; +$lang['Upload Formats'] = 'Formati caricamento'; $lang['User updated'] = 'Utente modificato'; -$lang['Update'] = 'Aggiornare'; +$lang['Update'] = 'Aggiorna'; $lang['Understood, do not show again'] = 'Capito, non mostrarti più'; $lang['Try now !'] = 'Vieni a provare subito!'; $lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'Questa foto è fisicamente collegata a quest\'album, non puoi scollegarli.'; @@ -1255,12 +1255,12 @@ $lang['There is multiple image in the database with the following names : %s.'] $lang['The original picture will be detected with the filename (without extension).'] = 'La foto originale verrà rilevata confrontando i nomi dei file (senza estensione).'; $lang['This plugin is incompatible with your version'] = 'Questo plugin non è compatibile con la tua versione'; $lang['This plugin was updated less than 6 months ago'] = 'Questo plugin ha ricevuto un aggiornamento meno di 6 mesi fa'; -$lang['This plugin have no update since 3 years ! It may be outdated'] = 'Questo plugin non ha avuto un aggiornamento da 3 anni ! Potrebbe essere obsoleto'; +$lang['This plugin have no update since 3 years ! It may be outdated'] = 'Questo plugin non ha avuto un aggiornamento da 3 anni! Potrebbe essere obsoleto'; $lang['This plugin have been updated recently'] = 'Questo plugin è stato aggiornato da poco'; $lang['This plugin has no recent update'] = 'Questo plugin non ha un aggiornamento recente'; $lang['Show plugins compatible with previous version of Piwigo'] = 'Mostra i plugin compatibili con la versione precedente di Piwigo'; $lang['Show beta test plugins'] = 'Mostra i plugin in beta test'; -$lang['Show'] = 'Mostrare'; +$lang['Show'] = 'Mostra'; $lang['Select groups or type them'] = 'Seleziona gruppi o scrivili'; $lang['Synchronization'] = 'Sincronizzazione'; $lang['Tag name'] = 'Nome del tag'; @@ -1269,16 +1269,16 @@ $lang['Sep'] = 'Set'; $lang['Theme'] = 'Tema'; $lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'Ripristinando questo plugin, tornerà alle sue impostazioni originali e i dati associati verranno ripristinati'; $lang['Restored'] = 'Ripristinato'; -$lang['Rename "%s"'] = 'Rinominare "%s"'; +$lang['Rename "%s"'] = 'Rinomina "%s"'; $lang['Registered'] = 'Registrato'; $lang['Rating greater than'] = 'Voto superiore a'; -$lang['Purge Cache'] = 'Eliminare la cache'; +$lang['Purge Cache'] = 'Svuota cache'; $lang['Purge Actions'] = 'Azioni di eliminazione'; $lang['Properties of abums'] = 'Proprietà degli album'; -$lang['Plugin "%s" has been activated!'] = 'Il plugin "%s" è stato attivato !'; -$lang['Plugin "%s" deleted!'] = 'Plugin "%s" cancellato !'; -$lang['Place last'] = 'Mettere alla fine'; -$lang['Place first'] = 'Mettere all\'inizio'; +$lang['Plugin "%s" has been activated!'] = 'Il plugin "%s" è stato attivato!'; +$lang['Plugin "%s" deleted!'] = 'Plugin "%s" cancellato!'; +$lang['Place last'] = 'Metti alla fine'; +$lang['Place first'] = 'Metti all\'inizio'; $lang['Piwigo is also on mobile.'] = 'Piwigo è anche sul cellulare'; $lang['Piwigo core'] = 'Kernel di Piwigo'; $lang['Picture to associate formats with'] = 'Foto da associare ai formati'; @@ -1294,9 +1294,9 @@ $lang['No access to administration, can see private content with appropriate per $lang['New user added'] = 'Nuovo utente aggiunto'; $lang['More information'] = 'Più informazioni'; $lang['Memories'] = 'Ricordi'; -$lang['Manage users'] = 'Gestire gli utenti'; +$lang['Manage users'] = 'Gestisci utenti'; $lang['Last revision date is newer than'] = 'Ultima revisione recente di almeno'; -$lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Gli album bloccati sono disabilitati per la manutenzione. Solo gli amministratori possono vederli nella galleria. Il blocco di questo album bloccherà anche i sub-album'; +$lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Gli album si possono bloccare per la manutenzione. Solo gli amministratori possono vederli nella galleria. Il blocco di questo album bloccherà anche i sub-album.'; $lang['Latest Piwigo news'] = 'Ultima notizia di Piwigo'; $lang['Mar'] = 'Mar'; $lang['May'] = 'Mag'; @@ -1322,7 +1322,7 @@ $lang['If anything bad happens during the update, you would be able to restore a $lang['The best is to have them made automatically on a regular basis.'] = 'La cosa migliore sarebbe di eseguire tale procedura automaticamente su base regolare.'; $lang['Apply to root albums'] = 'Applica agli album principali'; $lang['Album name must not be empty'] = 'Il nome dell\'album non deve essere vuoto.'; -$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'Alcune fotografie sono scomparse dal tuo file System. Dettagli dal plugin Controlla caricamenti.'; +$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'Alcune fotografie sono scomparse dal tuo file System. Dettagli forniti dal plugin Controlla Caricamenti.'; $lang['Visit history'] = 'Cronologia visitatori.'; $lang['%d pictures in sub-albums'] = '%d immagini nei sotto album'; $lang['%d filtered user'] = '%d utente filtrato'; @@ -1333,11 +1333,11 @@ $lang['Activate button "%s"'] = 'Attiva pulsante "%s"'; $lang['All admins'] = 'Tutti gli amministratori'; $lang['Allow comments for sub-albums'] = 'Permetti commenti per sotto album.'; $lang['Authorize comments'] = 'Autorizza commenti.'; -$lang['Comments allowed for sub-albums'] = 'Commenti abilitati per sotto album.'; -$lang['Comments disallowed for sub-albums'] = 'Commenti disabilitati per sotto album.'; -$lang['Created'] = 'Creato.'; +$lang['Comments allowed for sub-albums'] = 'Commenti consentiti per sotto-album.'; +$lang['Comments disallowed for sub-albums'] = 'Commenti non permessi per sotto-album.'; +$lang['Created'] = 'Creato'; $lang['Detect and avoid duplicates during upload'] = 'Individua ed evita duplicati nel corso del caricamento.'; -$lang['Disallow comments for sub-albums'] = 'Disabilita commenti per sotto album.'; +$lang['Disallow comments for sub-albums'] = 'Non permettere commenti per sotto-album.'; $lang['During upload, if Piwigo detects the photo already exists, associate the existing photo to the destination album, without duplicating file'] = 'Durante il caricamento, se Piwigo rileva che la fotografia già esiste, associa tale foto all\'album di destinazione, senza duplicarla.'; $lang['Locked album'] = 'Album bloccato'; $lang['Modified'] = 'Modificato'; @@ -1348,7 +1348,7 @@ $lang['This album is currently locked, visible only to administrators.'] = 'L\'a $lang['Unlock it'] = 'Sbloccalo.'; $lang['Unlocked album'] = 'Album sbloccato.'; $lang['%d files'] = '%d file'; -$lang['Expand'] = 'Espandi.'; +$lang['Expand'] = 'Espandi'; $lang['Shrink'] = 'Riduci.'; $lang['Core'] = 'nucleo'; $lang['Create and select'] = 'Crea e seleziona'; @@ -1373,4 +1373,49 @@ $lang['An error has occured'] = 'È accaduto un errore'; $lang['Auto-update'] = 'Aggiornamento automatico'; $lang['Changes saved'] = 'Cambiamenti salvati'; $lang['Create a root album'] = 'Crea album radice'; -$lang['Activate create mode to create and select an album'] = 'Attiva modalità creazione per creare e selezionare un album'; \ No newline at end of file +$lang['Activate create mode to create and select an album'] = 'Attiva modalità creazione per creare e selezionare un album'; +$lang['Copy the password link'] = 'Copia il collegamento della password'; +$lang['Main user'] = 'Utente principale'; +$lang['Ok, got it!'] = 'Ok, ho capito!'; +$lang['Password copied'] = 'Password copiata'; +$lang['Please complete all fields'] = 'Prego completare tutti i campi'; +$lang['Read the release note'] = 'Leggi le note di rilascio'; +$lang['Resend password link'] = 'Invia nuovamente il link della password'; +$lang['Set as main user'] = 'Imposta come utente principale'; +$lang['The passwords do not match'] = 'Le password non coincidono'; +$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Questo utente deve prima essere impostato come webmaster prima che possa essere promosso ad utente principale'; +$lang['To be sure, please rewrite the word “%s” below'] = 'Per essere sicuro, prego riscrivi la parola sottostante "%s" '; +$lang['Username successfully modified'] = 'Nome utente modificato con successo'; +$lang['What\'s new in version %s'] = 'Cosa c\'è di nuovo nella versione %s?'; +$lang['Yes, let\'s proceed'] = 'Sì, procediamo!'; +$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Stai per impostare %s come utente principale al posto di %s, vuoi procedere?'; +$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Non sei autorizzato a cambiare l\'utente principale, per favore chiedi al tuo webmaster.'; +$lang['You can now change the main user from %s to %s.'] = 'Ora puoi cambiare l\'utente principale da %s a %s.'; +$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Non puoi copiare la password se la connessione al sito non è sicura.'; +$lang['%s is the new main user'] = '%s è il nuovo utente principale'; +$lang['Copied link'] = 'Link copiato'; +$lang['Copy password'] = 'Copia password'; +$lang['Copy the link below and send it to the user so the password can be set.'] = 'Copia il collegamento sottostante ed invialo all\'utente in modo che possa impostare la password.'; +$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Non posso inviare un\'email a questo utente in quanto non '; +$lang['Changing the main user'] = 'Cambiare l\'utente principale'; +$lang['A photo library administrator has created the following account for you:'] = 'Un amministratore della galleria fotografica ha creato per te il seguente account:'; +$lang['An activation link valid for %s has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'È stato inviato a "%s" un link d\'attivazione valido per %s. Qualora l\'utente non ricevesse il link, puoi generarne e poi copiarne uno nuovo modificando l\'utente e gestendone la password.'; +$lang['An activation link valid for %s was created but could not be sent. You can now copy the link below and send it to the user.'] = 'È stato creato un link d\'attivazione valido per %s, ma non è stato possibile inviarlo. Ora puoi copiare il link sottostante ed inviarlo all\'utente.'; +$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'Il link è valido per %s. trascorso tale intervallo, dovrai richiedere un nuovo link.'; +$lang['To set your password, visit the following address:'] = 'Per impostare la password, visita il seguente indirizzo:'; +$lang['Welcome to %s'] = 'Benvenuto su %s'; +$lang['We have found %d duplicate paths. Details provided by plugin Check Uploads'] = 'Abbiamo trovato %d percorsi duplicati in modo anomalo. Verifica con il plugin Check Uploads.'; +$lang['If a photo in this album has the same filename, update the file without changing the photo\'s properties'] = 'Se una foto in questo album ha lo stesso nome file, aggiorna il file senza modificarne le proprietà.'; +$lang['Use standard Piwigo template for common pages.'] = 'Usa il template standard Piwigo per le pagine comuni.'; +$lang['When enabled, a common template is used for the login, registration and forgotten password pages, regardless of the theme. Some themes might use these templates even if you uncheck this option'] = 'Quando attivata, un template comune viene usato per le pagine di login, registrazione e password dimenticata, indipendentemente dal tema. Alcuni temi potrebbero usare questi template anche se disattivi questa opzione.'; +$lang['user_status_normal'] = 'Base'; +$lang['There is currently %d photos in the lounge (upload buffer)'] = 'Ci sono attualmente %d foto nel lounge (buffer di upload)'; +$lang['The comments have been validated.'] = 'I commenti sono stati validati.'; +$lang['The comment has been validated.'] = 'Il commento è stato validato.'; +$lang['Empty lounge'] = 'Svuota lounge'; +$lang['%d photos were moved from the upload lounge to their albums'] = '%d foto sono state trasferite dall\'upload lounge ai loro album'; +$lang['Save all photos'] = 'Salva tutte le foto'; +$lang['No comments selected, no actions possible.'] = 'Nessun commento selezionato, nessuna azione possibile.'; +$lang['Are you sure you want to delete comment #%s?'] = 'Sei sicuro di voler eliminare il commento #%s?'; +$lang['Are you sure you want to delete "%d" comments?'] = 'Sei sicuro di voler eliminare "%d" commenti?'; +$lang['Admins only'] = 'Solo amministratori'; \ No newline at end of file diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php index 03c097090..83d204844 100644 --- a/language/it_IT/common.lang.php +++ b/language/it_IT/common.lang.php @@ -100,8 +100,8 @@ $lang['created on %s'] = 'creata il %s'; $lang['Created on'] = 'Creato il'; $lang['Creation date'] = 'Data di creazione'; $lang['Current password is wrong'] = 'La password non è corretta'; -$lang['customize the appareance of the gallery'] = 'personalizzare l\'aspetto della galleria'; -$lang['Customize'] = 'Personalizza'; + + $lang['Date'] = 'Data'; $lang['day'][0] = 'Domenica'; $lang['day'][1] = 'Lunedì'; @@ -297,7 +297,7 @@ $lang['Sort by'] = 'Ordina per'; $lang['Sort order'] = 'Ordinamento'; $lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Registrazione riuscita, riceverai presto una email con le tue impostazioni di connessione.. Benvenuto!'; $lang['Specials'] = 'Speciale'; -$lang['SQL queries in'] = 'Queries SQL in'; +$lang['SQL queries in'] = 'Query SQL in'; $lang['stop the slideshow'] = 'fermare le diapositive'; $lang['Submit'] = 'Confermare'; $lang['Tag results for'] = 'Risultato dei tag per'; @@ -449,4 +449,88 @@ $lang['Only the first %d albums are displayed, out of %d.'] = 'Solo i primi %d a $lang['Pages'] = 'Pagine'; $lang['The PDF you requested is too large to display on this page.'] = 'Il PDF che hai richiesto è troppo largo per essere mostrato in questa pagina'; $lang['Custom dates'] = 'Date personalizzate'; -$lang['last 12 months'] = 'Ultimi 12 mesi'; \ No newline at end of file +$lang['last 12 months'] = 'Ultimi 12 mesi'; +$lang['There are no authors available for the photos currently filtered'] = 'Non ci sono autori disponibili per le fotografie al momento filtrate'; +$lang['There are no creation dates available for the photos currently filtered'] = 'Non vi sono date di creazione disponibili per le fotografie al momento filtrate'; +$lang['There are no tags available for the photos currently filtered'] = 'Non ci sono etichette disponibili per le fotografie al momento filtrate'; +$lang['Set your password below.'] = 'Imposta la tua password qui sotto.'; +$lang['must not be empty'] = 'non può essere vuota'; +$lang['Your changes have been applied.'] = 'Le tue modifiche sono state applicate.'; +$lang['Your password was successfully reset'] = 'La tua password è stata reimpostata con successo.'; +$lang['Your password was successfully set'] = 'La tua password è stata impostata.'; +$lang['you must choose a date'] = 'devi scegliere una data'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Quando questa opzione è abilitata, per le pagine di accesso e registrazione viene utilizzato un tema comune, indipendentemente dal tema.'; +$lang['You can manage your API keys in your account settings.'] = 'Puoi gestire le tue chiavi API nelle impostazioni del tuo account.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Non hai impostato un indirizzo email, quindi non riceverai alcuna notifica quando la tua chiave API sta per scadere.'; +$lang['Your API key will expire in %d day.'] = 'La tua chiave API scadrà tra %d giorni.'; +$lang['Your API key will expire in %d days.'] = 'La tua chiave API scadrà tra %d ore.'; +$lang['Your API key will expire soon'] = 'La tua chiave API è in scadenza.'; +$lang['The api key has been successfully created.'] = 'La chiave API è stata creata con successo.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'L\'email %s verrà utilizzata per avvisarti quando la tua chiave API sta per scadere.'; +$lang['The secret key can no longer be displayed.'] = 'La chiave segreta non può più essere mostrata.'; +$lang['This API key was manually revoked on %s'] = 'La chiave API è stata revocata manualmente il %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Per continuare ad utilizzare le API, prego rinnova la tua chiave prima della scadenza.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Per gestire le tue chiavi API, prego collegarsi con il proprio nome utente e password.'; +$lang['Options'] = 'Opzioni'; +$lang['Return to Sign in'] = 'Ritorna a Registrazione'; +$lang['Return to the gallery'] = 'Ritorna alla galleria'; +$lang['Revoke'] = 'Revoca'; +$lang['Revoked'] = 'Revocata'; +$lang['Set my password'] = 'Imposta la mia password'; +$lang['Show expired keys'] = 'Mostra le chiavi scadute'; +$lang['Custom date'] = 'Data personalizzata'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Vuoi veramente revocare la chiave API "%s"?'; +$lang['Don\'t have an account yet ?'] = 'Non hai ancora un account?'; +$lang['Done'] = 'Fatto'; +$lang['Duration'] = 'Durata'; +$lang['Edit API Key'] = 'Modifica chiave API'; +$lang['Expert mode'] = 'Modalità esperto'; +$lang['Expired'] = 'Scaduta'; +$lang['Expired on'] = 'Scaduta il'; +$lang['Expires in'] = 'Scade in'; +$lang['Generate API Key'] = 'Genera chiave API'; +$lang['Generate key'] = 'Genera chiave'; +$lang['Hello %s, enter your new password below.'] = 'Salve, %s, inserisci la tua nuova password qui sotto'; +$lang['Hide expired keys'] = 'Nascondi le chiavi scadute'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Impossibile copiare automaticamente. Prego copiare manualmente'; +$lang['Last use'] = 'Ultimo utilizzo'; +$lang['Manage your account'] = 'Gestisci il tuo account'; +$lang['Never'] = 'Mai'; +$lang['New API Key'] = 'Nuova chiave API'; +$lang['No expiration'] = 'Nessuna scadenza'; +$lang['3xlarge'] = '3XL - extra grande'; +$lang['4xlarge'] = '4XL - gigante'; +$lang['API Key has been successfully edited.'] = 'La chiave API è stata correttamente modificata.'; +$lang['API Key has been successfully revoked.'] = 'La chiave API è stata correttamente revocata.'; +$lang['API Key name'] = 'Nome chiave API'; +$lang['API Key not found'] = 'Chiave API non trovata'; +$lang['API Keys'] = 'Chiavi API'; +$lang['Account'] = 'Account'; +$lang['Already have an account ?'] = 'Hai già un account?'; +$lang['An email has been sent with a link to reset your password'] = 'È stata inviata un\'e-mail con un collegamento per reimpostare la password'; +$lang['An error has occured please got back to Sign in or Register'] = 'Si è verificato un errore. Torna su Accedi o Registrati'; +$lang['Change your password'] = 'Cambia la tua password'; +$lang['Check your inbox'] = 'Controlla la tua posta in arrivo'; +$lang['Choose how you want to see your gallery'] = 'Scegli come visualizzare la tua galleria'; +$lang['Confirm my new password'] = 'Conferma la mia nuova password'; +$lang['Confirm new password'] = 'Conferma nuova password'; +$lang['Create API Keys to secure your acount'] = 'Crea una chiave API per mettere in sicurezza il tuo account'; +$lang['Create a new API key to secure your account.'] = 'Crea una nuova chiave API per mettere in sicurezza il tuo account'; +$lang['Create an account'] = 'Crea un account'; +$lang['Created at'] = 'Creato a'; +$lang['An email has been sent with a verification code'] = 'Inviata email con codice di verifica'; +$lang['ID copied.'] = 'ID copiato'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Se non hai ricevuto l\'email, prego contattare il tuo webmaster'; +$lang['Invalid verification code'] = 'Codice di verifica errato'; +$lang['Save your ID and secret'] = 'Salva il tuo ID e chiave segreta'; +$lang['Secret copied. Keep it in a safe place.'] = 'Chiave segreta copiata. Conservala in un luogo sicuro.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'La chiave segreta non verrà più mostrata. Devi copiartela per poter continuare'; +$lang['Verification code'] = 'Codice di verifica'; +$lang['Verify'] = 'Verifica'; +$lang['edit user preferences'] = 'modifica preferenze utente'; +$lang['Your verification code'] = 'Il tuo codice di verifica'; +$lang['Verification successful! You can now choose a new password.'] = 'Verifica avvenuta con successo. Ora puoi scegliere la tua nuova password.'; +$lang['Too many attempts, please try later..'] = 'Troppi tentativi, riprova piu tardi...'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Se hai cambiato la tua password perchè pensi che sia stata rubata, ti raccomandiamo di revocare le tue %d API keys presenti nel tuo profilo.'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Se non sei stato tu, per favore cambia immediatamente la tua password o contatta il tuo webmaster.'; +$lang['Here is your verification code:'] = 'Questo è il tuo codice di verifica:'; \ No newline at end of file diff --git a/language/it_IT/help_quick_search.lang.php b/language/it_IT/help_quick_search.lang.php new file mode 100644 index 000000000..0837409d2 --- /dev/null +++ b/language/it_IT/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Tools>Maintenance] if you encounter any problem.'] = 'Se riscontrate dei problemi, effettuate una manutenzione in [Amministrazione>Tools>Manutenzione].'; $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'Per precauzione, i seguenti plugins sono stati disattivati. E\' necessario verificare se esistono degli aggiornamenti prima di riattivarli:'; -$lang['Only administrator can run upgrade: please sign in below.'] = 'Solo l\'amministratore può eseguire l\'aggiornamento: fare login.'; +$lang['Only administrator can run upgrade: please sign in below.'] = 'Solo l\'amministratore può eseguire l\'aggiornamento: eseguire il login.'; $lang['You do not have access rights to run upgrade'] = 'Non avete le autorizzazioni necessarie per effettuare l\'aggiornamento'; $lang['All sub-albums of private albums become private'] = 'Tutti i sub-album degli album privati diventano privati'; $lang['User permissions and group permissions have been erased'] = 'I permessi degli utenti e dei gruppi sono stati cancellati'; diff --git a/language/it_IT/whats_new_15.lang.php b/language/it_IT/whats_new_15.lang.php new file mode 100644 index 000000000..4757dca08 --- /dev/null +++ b/language/it_IT/whats_new_15.lang.php @@ -0,0 +1,11 @@ +Sign in'] = 'Gå tilbake til Logg inn'; +$lang['Return to the gallery'] = 'Gå tilbake til galleriet'; +$lang['Revoke'] = 'Tilbakekalling'; +$lang['Revoked'] = 'Tilbakekalt'; +$lang['Set my password'] = 'Angi passordet mitt'; +$lang['Show expired keys'] = 'Vis utløpte nøkler'; +$lang['The api key has been successfully created.'] = 'API-nøkkelen er opprettet.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'E-postadressen %s vil bli brukt til å varsle deg når API-nøkkelen din snart utløper.'; +$lang['The secret key can no longer be displayed.'] = 'Den hemmelige nøkkelen kan ikke lenger vises.'; +$lang['This API key was manually revoked on %s'] = 'Denne API-nøkkelen ble manuelt tilbakekalt den %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'For å fortsette å bruke API, må du fornye nøkkelen din før den utløper.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'For å administrere API-nøklene dine, vennligst logg inn med brukernavn/passord.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Når dette er aktivert, brukes en felles mal for innloggings- og registreringssidene, uavhengig av tema.'; +$lang['You can manage your API keys in your account settings.'] = 'Du kan administrere API-nøklene dine i kontoinnstillingene dine.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Du har ingen e-postadresse, så du vil ikke bli varslet når API-nøkkelen din snart utløper.'; +$lang['Custom date'] = 'Tilpasset dato'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Vil du virkelig tilbakekalle API-nøkkelen «%s»?'; +$lang['Don\'t have an account yet ?'] = 'Har du ikke en konto ennå?'; +$lang['Done'] = 'Ferdig'; +$lang['Duration'] = 'Varighet'; +$lang['Edit API Key'] = 'Rediger API-nøkkel'; +$lang['Expert mode'] = 'Ekspertmodus'; +$lang['Expired'] = 'Utløpt'; +$lang['Expired on'] = 'Utløpt den'; +$lang['Expires in'] = 'Utløper om'; +$lang['Generate API Key'] = 'Generer API-nøkkel'; +$lang['Generate key'] = 'Generer nøkkel'; +$lang['Hello %s, enter your new password below.'] = 'Hallo %s, skriv inn det nye passordet ditt nedenfor.'; +$lang['Hide expired keys'] = 'Skjul utløpte nøkler'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Umulig å kopiere automatisk. Vennligst kopier manuelt.'; +$lang['Last use'] = 'Sist brukt'; +$lang['Manage your account'] = 'Administrer kontoen din'; +$lang['Never'] = 'Aldri'; +$lang['New API Key'] = 'Ny API-nøkkel'; +$lang['No expiration'] = 'Ingen utløpsdato'; +$lang['3xlarge'] = '3XL - ekstra stor'; +$lang['4xlarge'] = '4XL - gigantisk'; +$lang['API Key has been successfully edited.'] = 'API-nøkkelen er redigert.'; +$lang['API Key has been successfully revoked.'] = 'API-nøkkelen er tilbakekalt.'; +$lang['API Key name'] = 'API-nøkkelnavn'; +$lang['API Key not found'] = 'API-nøkkel ikke funnet'; +$lang['API Keys'] = 'API-nøkkel'; +$lang['Account'] = 'Konto'; +$lang['Already have an account ?'] = 'Har du allerede en konto?'; +$lang['An email has been sent with a link to reset your password'] = 'En e-post er sendt med en lenke for å tilbakestille passordet ditt'; +$lang['An error has occured please got back to Sign in or Register'] = 'Det har oppstått en feil. Gå tilbake til Logg inn eller Registrer.'; +$lang['Change your password'] = 'Endre passordet ditt'; +$lang['Check your inbox'] = 'Sjekk innboksen din'; +$lang['Choose how you want to see your gallery'] = 'Velg hvordan du vil se galleriet ditt'; +$lang['Confirm my new password'] = 'Bekreft mitt nye passord'; +$lang['Confirm new password'] = 'Bekreft nytt passord'; +$lang['Create API Keys to secure your acount'] = 'Opprett API-nøkler for å sikre kontoen din'; +$lang['Create a new API key to secure your account.'] = 'Opprett en ny API-nøkkel for å sikre kontoen din.'; +$lang['Create an account'] = 'Opprett en konto'; +$lang['Created at'] = 'Opprettet kl.'; +$lang['An email has been sent with a verification code'] = 'En e-post med en bekreftelseskode er sendt'; +$lang['ID copied.'] = 'ID kopiert.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Hvis du ikke mottar e-posten, kan du kontakte nettansvarlig.'; +$lang['Invalid verification code'] = 'Ugyldig bekreftelseskode'; +$lang['Save your ID and secret'] = 'Lagre ID-en og din privat info.'; +$lang['Secret copied. Keep it in a safe place.'] = 'Din private info er kopiert. Oppbevar den på et trygt sted.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Din private info vil ikke lenger vises. Du må kopiere den for å fortsette.'; +$lang['Verification code'] = 'Verifiseringskode'; +$lang['Verify'] = 'Verifisere'; +$lang['Here is your verification code:'] = 'Her er bekreftelseskoden din:'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Hvis dette ikke var deg, må du endre passordet ditt umiddelbart eller kontakte nettansvarlig.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Hvis du endret passordet ditt fordi du tror det ble stjålet, anbefaler vi at du tilbakekaller %d API-nøkler i profilen din.'; +$lang['Too many attempts, please try later..'] = 'For mange forsøk, prøv senere.'; +$lang['Verification successful! You can now choose a new password.'] = 'Verifiseringen er vellykket! Du kan nå velge et nytt passord.'; +$lang['Your verification code'] = 'Bekreftelseskoden din'; +$lang['edit user preferences'] = 'rediger brukerpreferanser'; \ No newline at end of file diff --git a/language/nb_NO/help_quick_search.lang.php b/language/nb_NO/help_quick_search.lang.php new file mode 100644 index 000000000..cb95b3bc3 --- /dev/null +++ b/language/nb_NO/help_quick_search.lang.php @@ -0,0 +1,57 @@ +account settings.'] = 'U kunt uw API-key\'s beheren in uw accountinstellingen.'; +$lang['Return to Sign in'] = 'Ga terug naarLog in'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'De email %s zal worden gebruikt om je te waarschuwen wanneer je API key gaat verlopen.'; +$lang['Set my password'] = 'Stel mijn wachtwoord in'; +$lang['This API key was manually revoked on %s'] = 'Deze API key is handmatig ingetrokken op %s'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Om je API key\'s te beheren, log in met je gebruikersnaam/wachtwoord'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Je hebt geen emailadres, dan wordt je niet gewaarschuwd wanneer je API key verloopt. '; +$lang['Your API key will expire in %d day.'] = 'Je API key verloopt in %d dag.'; +$lang['Your API key will expire in %d days.'] = 'Je API key verloopt in %d dagen.'; +$lang['Your API key will expire soon'] = 'Je API key verloopt snel.'; +$lang['Your password was successfully reset'] = 'Je wachtwoord is met success gereset'; +$lang['Return to the gallery'] = 'Ga terug naar de galerij'; +$lang['The api key has been successfully created.'] = 'De API key is met succes gemaakt.'; +$lang['The secret key can no longer be displayed.'] = 'De geheime key kan niet langer worden getoond. '; +$lang['To continue using the API, please renew your key before it expires.'] = 'Om de API te gebruiken, '; +$lang['Your changes have been applied.'] = 'je wijzigingen zijn doorgevoerd'; +$lang['Your password was successfully set'] = 'Je wachtwoord is met succes gewijzigd'; +$lang['must not be empty'] = 'mag niet leeg zijn'; +$lang['you must choose a date'] = 'je moet een datum kiezen'; +$lang['Options'] = 'Opties'; +$lang['Revoke'] = 'Intrekken'; +$lang['Revoked'] = 'Ingetrokken'; +$lang['Show expired keys'] = 'Toon verlopen Keys'; +$lang['Custom date'] = 'Aangepaste datum'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Wil je echt de "%s" API key intrekken?'; +$lang['Don\'t have an account yet ?'] = 'Heb je nog geen account?'; +$lang['Done'] = 'Klaar'; +$lang['Duration'] = 'Duur'; +$lang['Edit API Key'] = 'bewerk API key'; +$lang['Expert mode'] = 'Expert modus'; +$lang['Expired'] = 'Verlopen'; +$lang['Expired on'] = 'Verlopen'; +$lang['Expires in'] = 'Verloopt over'; +$lang['Generate API Key'] = 'Genereer API sleutel'; +$lang['Generate key'] = 'Genereer key'; +$lang['Hello %s, enter your new password below.'] = 'Hallo %s, voer hieronder een nieuw wachtwoord in.'; +$lang['Hide expired keys'] = 'Verberg verlopen keys'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Onmogelijk om automatisch te kopieren. Alsjeblieft handmatig kopieren.'; +$lang['Last use'] = 'Laatste gebruik'; +$lang['Manage your account'] = 'Beheer mijn account'; +$lang['Never'] = 'Nooit'; +$lang['New API Key'] = 'Nieuwe API key'; +$lang['No expiration'] = 'Geen verloopdatum'; +$lang['3xlarge'] = '3XL - extra groot'; +$lang['4xlarge'] = '4XL - gigantisch'; +$lang['API Key has been successfully edited.'] = 'API Key is met succes bewerkt.'; +$lang['API Key has been successfully revoked.'] = 'API Key is ingetrokken.'; +$lang['API Key name'] = 'API Key naam'; +$lang['API Key not found'] = 'API Key niet gevonden'; +$lang['API Keys'] = 'API Keys'; +$lang['Account'] = 'Account'; +$lang['Already have an account ?'] = 'Heb je al een account?'; +$lang['An email has been sent with a link to reset your password'] = 'Een email is verstuurd met een link om je wachtwoord te herstellen.'; +$lang['An error has occured please got back to Sign in or Register'] = 'Er is een fout opgetreden, ga terug naar Log in or Registreer'; +$lang['Change your password'] = 'Wijzig je wachtwoord'; +$lang['Check your inbox'] = 'Controleer je inbox'; +$lang['Choose how you want to see your gallery'] = 'Kies hoe je je galerij wil zien'; +$lang['Confirm my new password'] = 'bevestig mijn nieuwe wachtwoord'; +$lang['Confirm new password'] = 'Bevestig nieuw wachtwoord'; +$lang['Create API Keys to secure your acount'] = 'Maak API key\'s om je account te beveiligen'; +$lang['Create a new API key to secure your account.'] = 'Maak een nieuwe API key om je account te beveiligen'; +$lang['Create an account'] = 'Maak een account'; +$lang['Created at'] = 'Gemaakt op'; +$lang['An email has been sent with a verification code'] = 'Er is een e-mail verzonden met een verificatiecode'; +$lang['ID copied.'] = 'ID gekopieerd.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Als u de e-mail niet ontvangt, neem dan contact op met uw webmaster.'; +$lang['Invalid verification code'] = 'Ongeldige verificatiecode'; +$lang['Save your ID and secret'] = 'Bewaar uw ID en geheime code'; +$lang['Secret copied. Keep it in a safe place.'] = 'Geheime code gekopieerd. Bewaar het op een veilige plaats.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'De geheime code wordt niet meer weergegeven. U moet het kopiëren om verder te gaan.'; +$lang['Verification code'] = 'Verificatie code'; +$lang['Verify'] = 'Verifieer'; +$lang['Here is your verification code:'] = 'Hier is uw verificatiecode:'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Als u het niet wass, wijzig dan onmiddellijk uw wachtwoord of neem contact op met uw webmaster.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Als u uw wachtwoord heeft gewijzigd omdat u denkt dat het is gestolen, raden wij u aan uw %d API-sleutels in uw profiel in te trekken.'; +$lang['Too many attempts, please try later..'] = 'Teveel pogingen, probeer het later.'; +$lang['Verification successful! You can now choose a new password.'] = 'Verificatie succesvol! U kunt nu een nieuw wachtwoord kiezen.'; +$lang['Your verification code'] = 'Uw verificatiecode'; +$lang['edit user preferences'] = 'Bewerk gebruiker voorkeuren'; \ No newline at end of file diff --git a/language/nl_NL/help_quick_search.lang.php b/language/nl_NL/help_quick_search.lang.php new file mode 100644 index 000000000..bab8980fb --- /dev/null +++ b/language/nl_NL/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Sign in'] = 'Wróć do Zaloguj się'; +$lang['You can manage your API keys in your account settings.'] = 'Możesz zarządzać swoimi kluczami API w ustawieniach konta.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Nie masz adresu e-mail, więc nie zostaniesz powiadomiony, gdy Twój klucz API wygaśnie.'; +$lang['Your API key will expire in %d day.'] = 'Twój klucz API wygaśnie za %d dzień.'; +$lang['Your API key will expire in %d days.'] = 'Twój klucz API wygaśnie za %d dni.'; +$lang['Your API key will expire soon'] = 'Twój klucz API wkrótce wygaśnie'; +$lang['Your changes have been applied.'] = 'Twoje zmiany zostały zastosowane.'; +$lang['Your password was successfully reset'] = 'Twoje hasło zostało pomyślnie zresetowane'; +$lang['Your password was successfully set'] = 'Twoje hasło zostało pomyślnie ustawione'; +$lang['must not be empty'] = 'nie może być pusta'; +$lang['Return to the gallery'] = 'Powrót do galerii'; +$lang['Set my password'] = 'Ustaw moje hasło'; +$lang['Show expired keys'] = 'Pokaż wygasłe klucze'; +$lang['The api key has been successfully created.'] = 'Klucz API został pomyślnie utworzony.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'Adres e-mail %s zostanie użyty do powiadomienia Cię, gdy Twój klucz API będzie bliski wygaśnięcia.'; +$lang['The secret key can no longer be displayed.'] = 'Tajny klucz nie może być już wyświetlany.'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Aby kontynuować korzystanie z API, odnów klucz, zanim wygaśnie.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Aby zarządzać kluczami API, zaloguj się za pomocą nazwy użytkownika/hasła.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Po włączeniu, wspólny szablon jest używany dla stron logowania i rejestracji, niezależnie od motywu.'; +$lang['Don\'t have an account yet ?'] = 'Nie masz jeszcze konta?'; +$lang['Done'] = 'Gotowe'; +$lang['Duration'] = 'Okres'; +$lang['Edit API Key'] = 'Edytuj klucz API'; +$lang['Expert mode'] = 'Tryb ekspercki'; +$lang['Expired'] = 'Wygasł'; +$lang['Expired on'] = 'Wygasł'; +$lang['Expires in'] = 'Wygasa za'; +$lang['Generate API Key'] = 'Wygeneruj klucz API'; +$lang['Generate key'] = 'Wygeneruj klucz'; +$lang['Hello %s, enter your new password below.'] = 'Witaj %s, wprowadź swoje nowe hasło poniżej.'; +$lang['Hide expired keys'] = 'Ukryj wygasłe klucze'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Niemożliwe do automatycznego skopiowania. Skopiuj ręcznie.'; +$lang['Last use'] = 'Ostatnie użycie'; +$lang['Manage your account'] = 'Zarządzaj swoim kontem'; +$lang['Never'] = 'Nigdy'; +$lang['New API Key'] = 'Nowy klucz API'; +$lang['No expiration'] = 'Nigdy nie wygasa'; +$lang['Options'] = 'Opcje'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Czy na pewno chcesz odwołać klucz API "%s"?'; +$lang['Revoke'] = 'Odwołaj'; +$lang['Revoked'] = 'Odwołany'; +$lang['This API key was manually revoked on %s'] = 'Ten klucz API został ręcznie odwołany %s'; +$lang['Choose how you want to see your gallery'] = 'Wybierz jak chcesz widzieć swoją galerię'; +$lang['Confirm my new password'] = 'Potwierdź moje nowe hasło'; +$lang['Confirm new password'] = 'Potwierdź nowe hasło'; +$lang['Create API Keys to secure your acount'] = 'Utwórz klucze API, aby zabezpieczyć swoje konto'; +$lang['Create a new API key to secure your account.'] = 'Utwórz nowy klucz API, aby zabezpieczyć swoje konto.'; +$lang['Create an account'] = 'Utwórz konto'; +$lang['Created at'] = 'Utworzone'; +$lang['Custom date'] = 'Niestandardowa data'; +$lang['Already have an account ?'] = 'Masz już konto?'; +$lang['An email has been sent with a link to reset your password'] = 'Wiadomość e-mail z linkiem do zresetowania hasła została wysłana'; +$lang['An error has occured please got back to Sign in or Register'] = 'Wystąpił błąd, proszę wrócić do Zaloguj się lub Zarejestruj się'; +$lang['Change your password'] = 'Zmień swoje hasło'; +$lang['Check your inbox'] = 'Sprawdź swoją skrzynkę odbiorczą'; +$lang['3xlarge'] = '3XL - ogromne'; +$lang['4xlarge'] = '4XL - gigantyczne'; +$lang['API Key has been successfully edited.'] = 'Klucz API został pomyślnie edytowany.'; +$lang['API Key has been successfully revoked.'] = 'Klucz API został pomyślnie odwołany.'; +$lang['API Key name'] = 'Nazwa klucza API'; +$lang['API Key not found'] = 'Nie znaleziono klucza API'; +$lang['API Keys'] = 'Klucze API'; +$lang['Account'] = 'Konto'; +$lang['Save your ID and secret'] = 'Zapisz swój identyfikator i tajny klucz'; +$lang['Secret copied. Keep it in a safe place.'] = 'Tajny klucz skopiowany. Przechowuj go w bezpiecznym miejscu.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Tajny klucz nie będzie już wyświetlany. Musisz go skopiować, aby kontynuować.'; +$lang['Too many attempts, please try later..'] = 'Zbyt wiele prób, spróbuj później..'; +$lang['Verification code'] = 'Kod weryfikacyjny'; +$lang['Verification successful! You can now choose a new password.'] = 'Weryfikacja powiodła się! Możesz teraz wybrać nowe hasło.'; +$lang['Verify'] = 'Weryfikuj'; +$lang['Your verification code'] = 'Twój kod weryfikacyjny'; +$lang['edit user preferences'] = 'edytuj preferencje użytkownika'; +$lang['An email has been sent with a verification code'] = 'Wysłano wiadomość e-mail z kodem weryfikacyjnym'; +$lang['Here is your verification code:'] = 'Oto twój kod weryfikacyjny:'; +$lang['ID copied.'] = 'Identyfikator skopiowany.'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Jeśli to nie byłeś ty, natychmiast zmień swoje hasło lub skontaktuj się ze swoim webmasterem.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Jeśli zmieniłeś hasło, ponieważ uważasz, że zostało skradzione, zalecamy wycofanie kluczy %d API w swoim profilu.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Jeśli nie otrzymasz wiadomości e-mail, skontaktuj się ze swoim webmasterem.'; +$lang['Invalid verification code'] = 'Nieprawidłowy kod weryfikacyjny'; \ No newline at end of file diff --git a/language/pl_PL/help_quick_search.lang.php b/language/pl_PL/help_quick_search.lang.php new file mode 100644 index 000000000..6d986a990 --- /dev/null +++ b/language/pl_PL/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Sign in'] = 'Voltar para Entrar'; +$lang['Return to the gallery'] = 'Voltar para a galeria'; +$lang['Revoke'] = 'Revogar'; +$lang['Revoked'] = 'Revogado'; +$lang['Set my password'] = 'Definir minha senha'; +$lang['Show expired keys'] = 'Mostrar chaves expiradas'; +$lang['The api key has been successfully created.'] = 'A chave de API foi criada com sucesso.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'O e-mail %s será usado para notificá-lo quando sua chave de API estiver prestes a expirar.'; +$lang['The secret key can no longer be displayed.'] = 'A chave secreta não pode mais ser exibida.'; +$lang['This API key was manually revoked on %s'] = 'Esta chave de API foi revogada manualmente em %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Para continuar usando a API, renove sua chave antes que ela expire.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Para gerenciar suas chaves de API, faça login com seu nome de usuário/senha.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Quando ativado, um modelo comum é usado para as páginas de login e registro, independentemente do tema.'; +$lang['You can manage your API keys in your account settings.'] = 'Você pode gerenciar suas chaves de API nas configurações da sua conta.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Você não tem endereço de e-mail, então não será notificado quando sua chave de API estiver prestes a expirar.'; +$lang['Custom date'] = 'Data personalizada'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Você realmente deseja revogar a chave de API "%s"?'; +$lang['Don\'t have an account yet ?'] = 'Ainda não tem uma conta?'; +$lang['Duration'] = 'Duração'; +$lang['Edit API Key'] = 'Editar chave de API'; +$lang['Expert mode'] = 'Modo especialista'; +$lang['Expired'] = 'Expirado'; +$lang['Expired on'] = 'Expirado em'; +$lang['Expires in'] = 'Expira em'; +$lang['Generate API Key'] = 'Gerar chave de API'; +$lang['Generate key'] = 'Gerar chave'; +$lang['Hello %s, enter your new password below.'] = 'Olá %s, digite sua nova senha abaixo.'; +$lang['Hide expired keys'] = 'Ocultar chaves expiradas'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Impossível copiar automaticamente. Copie manualmente.'; +$lang['Last use'] = 'Último uso'; +$lang['Manage your account'] = 'Gerencie sua conta'; +$lang['Never'] = 'Nunca'; +$lang['New API Key'] = 'Nova chave de API'; +$lang['No expiration'] = 'Não vencida'; +$lang['Done'] = 'Feito'; +$lang['3xlarge'] = '3XL - extra grande'; +$lang['4xlarge'] = '4XL - gigantesco'; +$lang['API Key has been successfully edited.'] = 'A chave de API foi editada com sucesso.'; +$lang['API Key has been successfully revoked.'] = 'A chave de API foi revogada com sucesso.'; +$lang['API Key name'] = 'Nome da chave da API'; +$lang['API Key not found'] = 'Chave API não encontrada'; +$lang['API Keys'] = 'Chaves de API'; +$lang['Account'] = 'Conta'; +$lang['Already have an account ?'] = 'Já tem uma conta?'; +$lang['An email has been sent with a link to reset your password'] = 'Um e-mail foi enviado com um link para redefinir sua senha'; +$lang['An error has occured please got back to Sign in or Register'] = 'Ocorreu um erro. Volte para Entrar ou Registrar'; +$lang['Change your password'] = 'Alterar sua senha'; +$lang['Check your inbox'] = 'Verifique sua caixa de entrada'; +$lang['Choose how you want to see your gallery'] = 'Escolha como você quer ver sua galeria'; +$lang['Confirm my new password'] = 'Confirmar minha nova senha'; +$lang['Confirm new password'] = 'Confirmar nova senha'; +$lang['Create API Keys to secure your acount'] = 'Crie chaves de API para proteger sua conta'; +$lang['Create a new API key to secure your account.'] = 'Crie uma nova chave de API para proteger sua conta.'; +$lang['Create an account'] = 'Criar uma conta'; +$lang['Created at'] = 'Criado em'; +$lang['An email has been sent with a verification code'] = 'Um e-mail com um código de verificação foi enviado.'; +$lang['Here is your verification code:'] = 'Aqui está seu código de verificação:'; +$lang['ID copied.'] = 'Documento de identidade copiado.'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Se não foi você, altere sua senha imediatamente ou entre em contato com o administrador do site.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Se você alterou sua senha porque acha que ela foi roubada, recomendamos revogar suas chaves de API %d em seu perfil.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Caso não receba o e-mail, entre em contato com o administrador do site.'; +$lang['Invalid verification code'] = 'Código de verificação inválido'; +$lang['Save your ID and secret'] = 'Guarde seu ID e segredo'; +$lang['Secret copied. Keep it in a safe place.'] = 'Segredo copiado. Guarde em local seguro.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'O segredo não será mais exibido. Você precisa copiá-lo para continuar.'; +$lang['Too many attempts, please try later..'] = 'Muitas tentativas foram feitas. Por favor, tente novamente mais tarde.'; +$lang['Verification code'] = 'Código de verificação'; +$lang['Verification successful! You can now choose a new password.'] = 'Verificação concluída com sucesso! Agora você pode escolher uma nova senha.'; +$lang['Verify'] = 'Verificar'; +$lang['Your verification code'] = 'Seu código de verificação'; +$lang['edit user preferences'] = 'editar preferências do usuário'; \ No newline at end of file diff --git a/language/pt_BR/help_quick_search.lang.php b/language/pt_BR/help_quick_search.lang.php new file mode 100644 index 000000000..150a43614 --- /dev/null +++ b/language/pt_BR/help_quick_search.lang.php @@ -0,0 +1,57 @@ +in your profile.'] = 'Se alterou a sua palavra-passe porque pensa que foi roubada, recomendamos que revogue as suas chaves %dAPI no seu perfil.'; +$lang['3xlarge'] = '3XL - extra grande'; +$lang['4xlarge'] = '4XL - gigantesco'; +$lang['API Key has been successfully edited.'] = 'A chave API foi editada com sucesso.'; +$lang['API Key has been successfully revoked.'] = 'A chave API foi revogada com sucesso.'; +$lang['API Key name'] = 'Nome da chave API'; +$lang['API Key not found'] = 'Chave API não encontrada'; +$lang['API Keys'] = 'Chaves da API'; +$lang['Account'] = 'Conta'; +$lang['Already have an account ?'] = 'Já possui uma conta?'; +$lang['An email has been sent with a link to reset your password'] = 'Foi enviado um e-mail com um link para redefinir a sua palavra-passe'; +$lang['An email has been sent with a verification code'] = 'Foi enviado um e-mail com um código de verificação'; +$lang['An error has occured please got back to Sign in or Register'] = 'Ocorreu um erro. Por favor, volte a Entrar ou Registar'; +$lang['Change your password'] = 'Alterar a sua palavra-passe'; +$lang['Check your inbox'] = 'Verificar a sua caixa de entrada'; +$lang['Choose how you want to see your gallery'] = 'Escolha como pretende visualizar a sua galeria'; +$lang['Confirm my new password'] = 'Confirmar a minha nova senha'; +$lang['Confirm new password'] = 'Confirmar nova senha'; +$lang['Create API Keys to secure your acount'] = 'Criar chaves API para proteger a sua conta'; +$lang['Create a new API key to secure your account.'] = 'Criar nova API para proteger a sua conta'; +$lang['Create an account'] = 'Criar uma conta'; +$lang['Created at'] = 'Criada em'; +$lang['Custom date'] = 'Data personalizada'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Tem a certeza de que pretende revogar a chave API "%s"?'; +$lang['Don\'t have an account yet ?'] = 'Ainda não tem conta?'; +$lang['Done'] = 'Concluído'; +$lang['Duration'] = 'Duração'; +$lang['Edit API Key'] = 'Editar chave API'; +$lang['Expert mode'] = 'Modo especialista'; +$lang['Expired'] = 'Expirada'; +$lang['Expired on'] = 'Expirada em'; +$lang['Expires in'] = 'Expira em'; +$lang['Generate API Key'] = 'Gerar chave API'; +$lang['Generate key'] = 'Gerar chave'; +$lang['Hello %s, enter your new password below.'] = 'Olá %s, introduza a sua nova password abaixo.'; +$lang['Here is your verification code:'] = 'Aqui está o seu código de verificação:'; +$lang['Hide expired keys'] = 'Ocultar chaves expiradas'; +$lang['ID copied.'] = 'ID copiado.'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Se não foi você, altere a sua palavra-passe imediatamente ou contacte o administrador do site.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Se não receber o e-mail, contacte o administrador do site.'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Impossível copiar automaticamente. Por favor, copie manualmente.'; +$lang['Invalid verification code'] = 'Código de verificação inválido'; +$lang['Last use'] = 'Último uso'; +$lang['Manage your account'] = 'Gerir a sua conta'; +$lang['Never'] = 'Nunca'; +$lang['New API Key'] = 'Nova chave API'; +$lang['No expiration'] = 'Sem prazo de validade'; +$lang['Options'] = 'Opções'; +$lang['Return to Sign in'] = 'Voltar para Entrar'; +$lang['Return to the gallery'] = 'Voltar à galeria'; +$lang['Revoke'] = 'Revogar'; +$lang['Revoked'] = 'Revogado'; +$lang['Save your ID and secret'] = 'Guarde o seu ID e segredo'; +$lang['Secret copied. Keep it in a safe place.'] = 'Segredo copiado. Guarde em local seguro.'; +$lang['Set my password'] = 'Definir a minha senha'; +$lang['Set your password below.'] = 'Defina a sua palavra-passe abaixo.'; +$lang['Show expired keys'] = 'Mostrar chaves expiradas'; +$lang['The api key has been successfully created.'] = 'A chave API foi criada com sucesso.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'O e-mail %s será utilizado para o notificar quando a sua chave API estiver prestes a expirar.'; +$lang['The secret key can no longer be displayed.'] = 'A chave secreta já não pode ser exibida.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'A chave secreta não será mais apresentada. Deve copiá-la para continuar.'; +$lang['This API key was manually revoked on %s'] = 'Esta chave API foi revogada manualmente em %s.'; +$lang['To continue using the API, please renew your key before it expires.'] = 'Para continuar a utilizar a API, renove a sua chave antes que esta expire.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'Para gerir as suas chaves API, inicie sessão com o seu nome de utilizador/palavra-passe.'; +$lang['Too many attempts, please try later..'] = 'Muitas tentativas. Tente novamente mais tarde.'; +$lang['Verification code'] = 'Código de verificação'; +$lang['Verification successful! You can now choose a new password.'] = 'Verificação concluída com sucesso! Agora pode escolher uma nova palavra-passe.'; +$lang['Verify'] = 'Verificar'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'Quando ativado, é utilizado um modelo comum para as páginas de início de sessão e de registo, independentemente do tema.'; +$lang['You can manage your API keys in your account settings.'] = 'Pode gerir as suas chaves API nas definições da sua conta.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Não tem um endereço de e-mail, pelo que não será notificado quando a sua chave API estiver prestes a expirar.'; +$lang['Your API key will expire in %d day.'] = 'A sua chave API expirará em %d dias.'; +$lang['Your API key will expire in %d days.'] = 'A sua chave API expirará em %d dias.'; +$lang['Your API key will expire soon'] = 'A sua chave API expirará em breve'; +$lang['Your changes have been applied.'] = 'As suas alterações foram aplicadas.'; +$lang['Your password was successfully reset'] = 'A sua senha foi redefinida com sucesso'; +$lang['Your password was successfully set'] = 'A sua senha foi definida com sucesso'; +$lang['Your verification code'] = 'O seu código de verificação'; +$lang['edit user preferences'] = 'editar preferências do utilizador'; +$lang['must not be empty'] = 'não pode estar vazio'; +$lang['you must choose a date'] = 'deve escolher uma data'; \ No newline at end of file diff --git a/language/pt_PT/help_quick_search.lang.php b/language/pt_PT/help_quick_search.lang.php new file mode 100644 index 000000000..568f8fc19 --- /dev/null +++ b/language/pt_PT/help_quick_search.lang.php @@ -0,0 +1,57 @@ +Sign in'] = 'Återgå till Logga in'; +$lang['Return to the gallery'] = 'Återgå till galleriet'; +$lang['Revoke'] = 'Återkalla'; +$lang['Revoked'] = 'Återkallad'; +$lang['Set my password'] = 'Ställ in mitt lösenord'; +$lang['Show expired keys'] = 'Visa nycklar som löpt ut'; +$lang['The api key has been successfully created.'] = 'API-nyckeln har skapats.'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'E-postadressen %s kommer att användas för att meddela dig när din API-nyckel snart löper ut.'; +$lang['The secret key can no longer be displayed.'] = 'Den hemliga nyckeln kan ej längre visas.'; +$lang['This API key was manually revoked on %s'] = 'Denna API-nyckel återkallades manuellt den %s'; +$lang['To continue using the API, please renew your key before it expires.'] = 'För att kunna fortsätta använda API\'et, var god förnya din nyckel innan den löper ut.'; +$lang['To manage your API keys, please log in with your username/password.'] = 'För att hantera dina API-nycklar, var god logga in med ditt användarnamn/lösenord.'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = 'När det är aktiverat används en gemensam mall för inloggnings- och registreringssidorna, oavsett tema.'; +$lang['You can manage your API keys in your account settings.'] = 'Du kan hantera dina API-nycklar i dina kontoinställningar.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'Du har ingen epostadress, så du kommer inte att bli meddelad när din API-nyckel är på väg att löpa ut.'; +$lang['Your API key will expire in %d day.'] = 'Din API-nyckel kommer att löpa ut om %d dag.'; +$lang['Your API key will expire in %d days.'] = 'Din API-nyckel kommer att löpa ut om %d dagar.'; +$lang['Don\'t have an account yet ?'] = 'Har du inget konto ännu ?'; +$lang['Done'] = 'Klar'; +$lang['Duration'] = 'Varaktighet'; +$lang['Edit API Key'] = 'Redigera API-nyckel'; +$lang['Expert mode'] = 'Expertläge'; +$lang['Expired'] = 'Löpt ut'; +$lang['Expired on'] = 'Löpte ut den'; +$lang['Expires in'] = 'Löper ut om'; +$lang['Generate API Key'] = 'Generera API-nyckel'; +$lang['Generate key'] = 'Generera nyckel'; +$lang['Hello %s, enter your new password below.'] = 'Hej %s, skriv in ditt lösenord nedan.'; +$lang['Hide expired keys'] = 'Göm nycklar som löpt ut'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Omöjligt att kopiera automatiskt. Var god kopiera manuellt.'; +$lang['Last use'] = 'Senast använd'; +$lang['Manage your account'] = 'Hantera ditt konto'; +$lang['Never'] = 'Aldrig'; +$lang['New API Key'] = 'Ny API-nyckel'; +$lang['No expiration'] = 'Inget utlöpsdatum'; +$lang['Options'] = 'Alternativ'; +$lang['API Key has been successfully edited.'] = 'API-nyckeln har redigerats.'; +$lang['API Key has been successfully revoked.'] = 'API-nyckeln har återkallats.'; +$lang['API Key name'] = 'API-nyckelnamn'; +$lang['API Key not found'] = 'API-nyckel hittades inte'; +$lang['API Keys'] = 'API-nycklar'; +$lang['Account'] = 'Konto'; +$lang['Already have an account ?'] = 'Har du redan ett konto ?'; +$lang['An email has been sent with a link to reset your password'] = 'Ett mail har skickats med en länk för att återställa lösenordet'; +$lang['An error has occured please got back to Sign in or Register'] = 'Ett fel har uppstått. Gå tillbaka till Logga in eller Registrera.'; +$lang['Change your password'] = 'Ändra ditt lösenord'; +$lang['Check your inbox'] = 'Kolla din inkorg'; +$lang['Choose how you want to see your gallery'] = 'Välj hur du vill se ditt galleri'; +$lang['Confirm my new password'] = 'Bekräfta mitt nya lösenord'; +$lang['Confirm new password'] = 'Bekräfta nytt lösenord'; +$lang['Create API Keys to secure your acount'] = 'Skapa API-nycklar för att säkra ditt konto'; +$lang['Create a new API key to secure your account.'] = 'Skapa en ny API-nyckel för att säkra ditt konto.'; +$lang['Create an account'] = 'Skapa ett konto'; +$lang['Created at'] = 'Skapad den'; +$lang['Custom date'] = 'Eget datum'; +$lang['Do you really want to revoke the "%s" API key?'] = 'Vill du verkligen återkalla API-nyckeln "%s"?'; +$lang['3xlarge'] = '3XL - extra jättestor'; +$lang['4xlarge'] = '4XL - gigantisk'; +$lang['An email has been sent with a verification code'] = 'Ett mejl har skickats med en verifieringskod'; +$lang['ID copied.'] = 'ID kopierat.'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'Om du inte får mejlet, var god kontakta din webbmaster.'; +$lang['Invalid verification code'] = 'Ogiltig verifieringskod'; +$lang['Save your ID and secret'] = 'Spara ditt ID och hemlighet'; +$lang['Secret copied. Keep it in a safe place.'] = 'Hemlighet kopierad. Spara den på ett säkert ställe.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Hemligheten kommer inte visas längre. Du måste kopiera den för att fortsätta.'; +$lang['Verification code'] = 'Verifieringskod'; +$lang['Verify'] = 'Verifiera'; +$lang['Here is your verification code:'] = 'Här är din verifieringskod:'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Om det här inte var du, var god ändra genast ditt lösenord eller kontakta din webbmaster.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Om du ändrade ditt lösenord för att du tror det blivit stulet, så rekommenderar vi att du återkallar dina %d API-nycklar i din profil.'; +$lang['Too many attempts, please try later..'] = 'För många försök, prova igen om en stund.'; +$lang['Verification successful! You can now choose a new password.'] = 'Verifiering lyckades! Du kan nu välja ett nytt lösenord.'; +$lang['Your verification code'] = 'Din verifieringskod'; +$lang['edit user preferences'] = 'redigera användarinställningar'; \ No newline at end of file diff --git a/language/sv_SE/help_quick_search.lang.php b/language/sv_SE/help_quick_search.lang.php new file mode 100644 index 000000000..51a54574d --- /dev/null +++ b/language/sv_SE/help_quick_search.lang.php @@ -0,0 +1,57 @@ +account settings.'] = 'API anahtarlarınızı hesap ayarlarınızdan yönetebilirsiniz.'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = 'E-posta adresiniz yok, bu nedenle API anahtarınızın süresi dolmak üzereyken bildirim almayacaksınız.'; +$lang['The secret key can no longer be displayed.'] = 'Gizli anahtar artık görüntülenemiyor.'; +$lang['This API key was manually revoked on %s'] = 'Bu API anahtarı %s tarihinde manuel olarak iptal edildi'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = 'API anahtarınızın süresi dolmak üzereyken sizi bilgilendirmek için %s e-posta adresi kullanılacaktır.'; +$lang['The api key has been successfully created.'] = 'API anahtarı başarıyla oluşturuldu.'; +$lang['Show expired keys'] = 'Süresi dolmuş anahtarları göster'; +$lang['Set my password'] = 'Şifremi ayarla'; +$lang['Revoked'] = 'İptal edildi'; +$lang['Revoke'] = 'İptal et'; +$lang['Return to the gallery'] = 'Galeriye geri dön'; +$lang['Return to Sign in'] = 'Oturum aç sayfasına geri dön'; +$lang['Options'] = 'Seçenekler'; +$lang['No expiration'] = 'Son kullanma tarihi yok'; +$lang['New API Key'] = 'Yeni API Anahtarı'; +$lang['Manage your account'] = 'Hesabınızı yönetin'; +$lang['Never'] = 'Asla'; +$lang['Last use'] = 'Son kullanım'; +$lang['Hide expired keys'] = 'Süresi dolmuş anahtarları gizle'; +$lang['Impossible to copy automatically. Please copy manually.'] = 'Otomatik olarak kopyalamak mümkün değil. Lütfen manuel olarak kopyalayın.'; +$lang['Hello %s, enter your new password below.'] = 'Merhaba %s, aşağıya yeni şifrenizi girin.'; +$lang['Generate API Key'] = 'API Anahtarı Oluştur'; +$lang['Generate key'] = 'Anahtar oluştur'; +$lang['Expires in'] = 'Şu zaman sonra sona erecek'; +$lang['Expired on'] = 'Sona erecek'; +$lang['Expired'] = 'Sona erdi'; +$lang['Expert mode'] = 'Uzman modu'; +$lang['Edit API Key'] = 'API Anahtarını Düzenle'; +$lang['Duration'] = 'Süre'; +$lang['Done'] = 'Tamamlandı'; +$lang['Don\'t have an account yet ?'] = 'Halen bir hesabınız yok mu?'; +$lang['Do you really want to revoke the "%s" API key?'] = '"%s" API anahtarını gerçekten iptal etmek istiyor musunuz?'; +$lang['Custom date'] = 'Özel tarih'; +$lang['Created at'] = 'Oluşturuldu:'; +$lang['Create a new API key to secure your account.'] = 'Hesabınızı güvence altına almak için yeni bir API anahtarı oluşturun.'; +$lang['Create API Keys to secure your acount'] = 'Hesabınızı güvence altına almak için API Anahtarları oluşturun'; +$lang['Create an account'] = 'Bir hesap açın'; +$lang['Change your password'] = 'Şifrenizi değiştirin'; +$lang['Check your inbox'] = 'Gelen kutunuzu kontrol edin'; +$lang['Choose how you want to see your gallery'] = 'Galerinizi nasıl görmek istediğinizi seçin'; +$lang['Confirm my new password'] = 'Yeni şifremi onayla'; +$lang['Confirm new password'] = 'Yeni şifreyi onayla'; +$lang['An email has been sent with a link to reset your password'] = 'Şifrenizi sıfırlamak için bir bağlantı içeren bir e-posta gönderildi'; +$lang['An error has occured please got back to Sign in or Register'] = 'Bir hata oluştu. Lütfen Oturum aç veya Kayıt ol adresine geri dönün.'; +$lang['Already have an account ?'] = 'Zaten bir hesabınız var mı?'; +$lang['Account'] = 'Hesap'; +$lang['3xlarge'] = '3XL - ekstra büyük'; +$lang['4xlarge'] = '4XL - devasa'; +$lang['API Key has been successfully edited.'] = 'API Anahtarı başarıyla düzenlendi.'; +$lang['API Key has been successfully revoked.'] = 'API Anahtarı başarıyla iptal edildi.'; +$lang['API Key name'] = 'API Anahtar adı'; +$lang['API Key not found'] = 'API Anahtarı bulunamadı'; +$lang['API Keys'] = 'API Anahtarları'; +$lang['Your API key will expire in %d day.'] = 'API anahtarınız %d gün içinde sona erecek.'; +$lang['Your API key will expire in %d days.'] = 'API anahtarınız %d gün içinde sona erecek.'; +$lang['Your API key will expire soon'] = 'API anahtarınız yakında sona erecek'; +$lang['Your changes have been applied.'] = 'Değişiklikleriniz uygulandı.'; +$lang['Your password was successfully reset'] = 'Şifreniz başarıyla sıfırlandı'; +$lang['Your password was successfully set'] = 'Şifreniz başarıyla ayarlandı'; +$lang['must not be empty'] = 'boş olmamalı'; +$lang['you must choose a date'] = 'bir tarih seçmelisiniz'; +$lang['If you do not receive the email, please contact your webmaster.'] = 'E-postayı almazsanız lütfen web yöneticinizle iletişime geçin.'; +$lang['An email has been sent with a verification code'] = 'Doğrulama kodu içeren bir e-posta gönderildi'; +$lang['Here is your verification code:'] = 'İşte doğrulama kodunuz:'; +$lang['ID copied.'] = 'ID kopyalandı.'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = 'Eğer bu siz değilseniz, lütfen hemen şifrenizi değiştirin veya web yöneticinizle iletişime geçin.'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = 'Şifrenizi çalındığını düşündüğünüz için değiştirdiyseniz, profilinizdeki %d API anahtarınızı iptal etmenizi öneririz '; +$lang['Invalid verification code'] = 'Geçersiz doğrulama kodu'; +$lang['Save your ID and secret'] = 'Kimliğinizi ve gizli bilginizi kaydedin'; +$lang['Secret copied. Keep it in a safe place.'] = 'Gizli bilgi kopyalandı. Güvenli bir yerde saklayın.'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = 'Gizli bilgi artık görüntülenmeyecek. Devam etmek için kopyalamanız gerekiyor.'; +$lang['Too many attempts, please try later..'] = 'Çok fazla deneme oldu, lütfen daha sonra tekrar deneyin.'; +$lang['Verification code'] = 'Doğrulama kodu'; +$lang['Verification successful! You can now choose a new password.'] = 'Doğrulama başarılı! Artık yeni bir şifre seçebilirsiniz.'; +$lang['Verify'] = 'Doğrula'; +$lang['Your verification code'] = 'Doğrulama kodunuz'; +$lang['edit user preferences'] = 'kullanıcı tercihlerini düzenle'; \ No newline at end of file diff --git a/language/tr_TR/help_quick_search.lang.php b/language/tr_TR/help_quick_search.lang.php new file mode 100644 index 000000000..4d729ec1a --- /dev/null +++ b/language/tr_TR/help_quick_search.lang.php @@ -0,0 +1,58 @@ +Sign in'] = '返回 登录页面'; +$lang['Return to the gallery'] = '返回相册'; +$lang['Revoke'] = '撤销'; +$lang['Revoked'] = '已撤销'; +$lang['Set my password'] = '设置我的密码'; +$lang['Show expired keys'] = '显示已过期密钥'; +$lang['The api key has been successfully created.'] = 'API密钥已成功创建。'; +$lang['The email %s will be used to notify you when your API key is about to expire.'] = '当您的API密钥即将过期时，系统将通过邮箱%s通知您。'; +$lang['The secret key can no longer be displayed.'] = '私钥将无法再次显示。'; +$lang['This API key was manually revoked on %s'] = '此API密钥已于%s被手动撤销'; +$lang['To continue using the API, please renew your key before it expires.'] = '如需继续使用API，请在密钥过期前进行续期。'; +$lang['To manage your API keys, please log in with your username/password.'] = '如需管理您的API密钥，请使用用户名/密码登录。'; +$lang['When enabled, a common template is used for the login and registration pages, regardless of the theme.'] = '启用后，无论使用何种主题，登录和注册页面都将使用通用模板。'; +$lang['You can manage your API keys in your account settings.'] = '您可以在 账户设置中管理您的API密钥。'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = '您未设置邮箱地址，因此当您的API密钥即将过期时，系统将无法通知您。'; +$lang['Custom date'] = '自定义日期'; +$lang['Do you really want to revoke the "%s" API key?'] = '您确定要撤销"%s" 这个API密钥吗？'; +$lang['Don\'t have an account yet ?'] = '还没有账户？'; +$lang['Done'] = '完成'; +$lang['Duration'] = '持续时间'; +$lang['Edit API Key'] = '编辑API密钥'; +$lang['Expert mode'] = '专家模式'; +$lang['Expired'] = '已过期'; +$lang['Expired on'] = '过期于'; +$lang['Expires in'] = '过期时间'; +$lang['Generate API Key'] = '生成API密钥'; +$lang['Generate key'] = '生成秘钥'; +$lang['Hello %s, enter your new password below.'] = '您好 %s, 请在下方输入您的新密码。'; +$lang['Hide expired keys'] = '隐藏已过期的密钥'; +$lang['Impossible to copy automatically. Please copy manually.'] = '无法自动复制，请手动复制。'; +$lang['Last use'] = '最后使用时间'; +$lang['Manage your account'] = '最后使用时间'; +$lang['Never'] = '永不'; +$lang['New API Key'] = '新API密钥'; +$lang['No expiration'] = '永不过期'; +$lang['3xlarge'] = '3XL - 超大'; +$lang['4xlarge'] = '4XL - 巨大'; +$lang['API Key has been successfully edited.'] = 'API密钥已成功编辑。'; +$lang['API Key has been successfully revoked.'] = 'API密钥已成功撤销。'; +$lang['API Key name'] = 'API密钥名称'; +$lang['API Key not found'] = '未找到API密钥'; +$lang['API Keys'] = 'API密钥'; +$lang['Account'] = '账户'; +$lang['Already have an account ?'] = '已有账户？'; +$lang['An email has been sent with a link to reset your password'] = '已发送一封包含重置密码链接的电子邮件'; +$lang['An error has occured please got back to Sign in or Register'] = '发生错误，请返回 登录 or 注册'; +$lang['Change your password'] = '更改密码'; +$lang['Check your inbox'] = '查看您的收件箱'; +$lang['Choose how you want to see your gallery'] = '选择您想要查看相册的方式'; +$lang['Confirm my new password'] = '确认我的新密码'; +$lang['Confirm new password'] = '确认新密码'; +$lang['Create API Keys to secure your acount'] = '创建API密钥以保护您的账户安全'; +$lang['Create a new API key to secure your account.'] = '创建一个新的API密钥以保护您的账户安全。'; +$lang['Create an account'] = '创建账户'; +$lang['Created at'] = '创建时间'; +$lang['An email has been sent with a verification code'] = '已发送一封包含验证码的电子邮件'; +$lang['ID copied.'] = 'ID已复制。'; +$lang['If you do not receive the email, please contact your webmaster.'] = '如果您未收到电子邮件，请联系您的网站管理员。'; +$lang['Invalid verification code'] = '验证码无效'; +$lang['Save your ID and secret'] = '保存您的ID和密钥'; +$lang['Secret copied. Keep it in a safe place.'] = '密钥已复制。请将其妥善保管。'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = '密钥将不再显示。您必须复制它才能继续操作。'; +$lang['Verification code'] = '验证码'; +$lang['Verify'] = '验证'; +$lang['If you changed your password because you think it was stolen, we recommend revoking your %d API keys in your profile.'] = '如果您因认为密码被盗而更改了密码，我们建议您在个人资料 中撤销您的%d个API 密钥。'; +$lang['Here is your verification code:'] = '这是您的验证码：'; +$lang['If this wasn\'t you, please change your password immediately or contact your webmaster.'] = '如果不是您本人操作，请立即更改密码或联系网站管理员。'; +$lang['Too many attempts, please try later..'] = '尝试次数过多，请稍后再试。'; +$lang['Verification successful! You can now choose a new password.'] = '验证成功！您现在可以选择一个新密码。'; +$lang['Your verification code'] = '您的验证码'; +$lang['edit user preferences'] = '编辑用户偏好设置'; \ No newline at end of file diff --git a/language/zh_CN/help_quick_search.lang.php b/language/zh_CN/help_quick_search.lang.php new file mode 100644 index 000000000..123750de2 --- /dev/null +++ b/language/zh_CN/help_quick_search.lang.php @@ -0,0 +1,57 @@ +account settings.'] = '您可以在帳戶設定中管理您的 API 金鑰。'; +$lang['You have no email address, so you will not be notified when your API key is about to expire.'] = '您沒有電子郵件地址，因此當您的 API 金鑰即將到期時，將不會收到通知。'; +$lang['Your API key will expire in %d day.'] = '您的 API 金鑰即將在 %d 天後到期。'; +$lang['Your API key will expire in %d days.'] = '您的 API 金鑰即將在 %d 天後到期。'; +$lang['Your API key will expire soon'] = '您的 API 金鑰即將到期。'; +$lang['Your changes have been applied.'] = '您的變更已套用。'; +$lang['Your password was successfully reset'] = '您已成功重置密碼'; +$lang['Your password was successfully set'] = '你已成功設置密碼'; +$lang['must not be empty'] = '不得為空'; +$lang['you must choose a date'] = '您必須選擇日期'; +$lang['Return to Sign in'] = '回到登入頁面'; +$lang['Return to the gallery'] = '回到畫廊'; +$lang['Revoke'] = '撤銷'; +$lang['Revoked'] = '已撤銷'; +$lang['Set my password'] = '設定我的密碼'; +$lang['Show expired keys'] = '顯示已過期的金鑰'; +$lang['The secret key can no longer be displayed.'] = '密鑰無法再顯示。'; +$lang['To continue using the API, please renew your key before it expires.'] = '要繼續使用這個 API，請在您的金鑰過期前更新。'; +$lang['Never'] = '永不'; +$lang['No expiration'] = '永不過期'; +$lang['Options'] = '選項'; +$lang['Last use'] = '最後一次使用'; +$lang['Hello %s, enter your new password below.'] = '%s 您好，請在下方輸入您的新密碼。'; +$lang['Impossible to copy automatically. Please copy manually.'] = '無法自動複製。請手動複製。'; +$lang['Expert mode'] = '專家模式'; +$lang['Expired'] = '已過期'; +$lang['Expired on'] = '過期日期'; +$lang['Expires in'] = '距過期尚餘時間'; +$lang['Don\'t have an account yet ?'] = '您有帳號嗎？'; +$lang['Done'] = '完成'; +$lang['Duration'] = '持續時間'; +$lang['Create an account'] = '建立帳號'; +$lang['Created at'] = '建立於'; +$lang['Custom date'] = '個人化日期'; +$lang['Choose how you want to see your gallery'] = '請選擇您想要的藝廊外觀'; +$lang['Confirm my new password'] = '確認我的新密碼'; +$lang['Confirm new password'] = '確認新密碼'; +$lang['An email has been sent with a link to reset your password'] = 'Email 已寄出，信件中有用來重置密碼的連結'; +$lang['An error has occured please got back to Sign in or Register'] = '系統發生問題，請回到登入或是註冊頁面'; +$lang['Change your password'] = '更改您的密碼'; +$lang['Check your inbox'] = '檢查您的電子郵件信箱'; +$lang['Account'] = '帳號'; +$lang['Already have an account ?'] = '已經有帳號了嗎？'; +$lang['3xlarge'] = '3XL - 極大'; +$lang['4xlarge'] = '4XL - 超巨大'; +$lang['An email has been sent with a verification code'] = '一封包含驗證碼的電子郵件已寄出'; +$lang['ID copied.'] = 'ID 已複製。'; +$lang['If you do not receive the email, please contact your webmaster.'] = '若您未收到電子郵件，請與您的網站管理員聯絡。'; +$lang['Invalid verification code'] = '驗證碼無效'; +$lang['Save your ID and secret'] = '請保存您的 ID 和密鑰'; +$lang['Secret copied. Keep it in a safe place.'] = '密鑰已複製。請妥善保管。'; +$lang['The secret will no longer be displayed. You must copy it to continue.'] = '該密鑰將無法再顯示。您必須將它複製下來才能繼續。'; +$lang['Verification code'] = '驗證碼'; +$lang['Verify'] = '驗證'; \ No newline at end of file diff --git a/language/zh_TW/help_quick_search.lang.php b/language/zh_TW/help_quick_search.lang.php new file mode 100644 index 000000000..1f819d75c --- /dev/null +++ b/language/zh_TW/help_quick_search.lang.php @@ -0,0 +1,57 @@ + time() + ) + { + $page['errors']['password_form_error'] = l10n('Too many attempts, please try later..'); + return false; + } + } + + // check if we want to skip email sending + // if user is guest, generic or doesn't have email + $skip_mail = !$is_user_found or empty($userdata['email']); + + // send mail with verification code to user + switch_lang_to($userdata['language']); + $user_code = generate_user_code(); + $template_mail = pwg_generate_code_verification_mail($user_code['code']); + if (!$skip_mail) + { + $mail_send = pwg_mail($userdata['email'], $template_mail); + } + switch_lang_back(); + + $_SESSION['reset_password_code'] = [ + 'secret' => $user_code['secret'], + 'attempts' => 0, + 'user_id' => $is_user_found ? $user_id : null, + 'created_at' => time(), + 'ttl' => min($conf['password_reset_code_duration'], 900) // max 15 min + ]; + + return true; +} + +/** + * checks the validity of input parameters, fills $page['errors'] and + * $page['infos'] + * + * @return bool (true if valid, false otherwise) + */ +function process_password_request() +{ + global $page, $user; + + $state = $_SESSION['reset_password_code'] ?? null; + if (!$state) + { + return true; + } + + // check expired + if (time() > $state['created_at'] + $state['ttl']) + { + unset($_SESSION['reset_password_code']); + $page['errors']['password_form_error'] = l10n('Code expired'); + return false; + } + + $_SESSION['reset_password_code']['attempts']++; + + $is_valid = true; + $user_code = trim($_POST['user_code'] ?? ''); + + if ( + empty($user_code) // empty user code + || !preg_match('/^\d{6}$/', $user_code) // check digit 6 + || !verify_user_code($state['secret'], $user_code)) // verify user code + { + $is_valid = false; + } + + if (!$is_valid) + { + if ($_SESSION['reset_password_code']['attempts'] >= 3) + { + unset($_SESSION['reset_password_code']); + // lockout account for 1hour + if (!empty($state['user_id'])) + { + $save_user = $user; + $user = build_user($state['user_id'], false); + userprefs_update_param('reset_password_forbidden_until', time() + 60 * 60); + $user = $save_user; + + pwg_activity('user', $state['user_id'], 'reset_password_failure_too_many'); + } + $page['errors']['login_page_error'] = l10n('Too many attempts, please try later..'); + return false; + } + + if (!empty($state['user_id'])) + { + pwg_activity('user', $state['user_id'], 'reset_password_failure_code'); + } + $page['errors']['password_form_error'] = l10n('Invalid verification code'); + return false; + } + + // verify code success + $user_id = $state['user_id']; + unset($_SESSION['reset_password_code']); + + if (empty($user_id)) + { + $page['errors']['password_form_error'] = l10n('Invalid verification code'); + return false; + } + + $save_user = $user; + $user = build_user($user_id, false); + userprefs_delete_param('reset_password_forbidden_until'); + + $_SESSION['valid_reset_password_code'] = array( + 'user_id' => $user_id, + 'username' => $user['username'], + 'email' => $user['email'], + 'language' => $user['language'], + ); + $status = $user['status'] ?? null; + $has_no_email = empty($user['email']); + $page['username'] = $user['username']; + $user = $save_user; + + // fallback check: don't send mail when user is guest, generic or doesn't have email + if (is_a_guest($status) || is_generic($status) || $has_no_email) { $page['errors']['password_form_error'] = l10n('Password reset is not allowed for this user'); return false; } - if (empty($userdata['email'])) - { - $page['errors']['password_form_error'] = l10n( - 'User "%s" has no email address, password reset is not possible', - $userdata['username'] - ); - return false; - } - - $generate_link = generate_password_link($user_id); - - // $userdata['activation_key'] = $generate_link['activation_key']; - - switch_lang_to($userdata['language']); - $email_params = pwg_generate_reset_password_mail($userdata['username'], $generate_link['password_link'], $conf['gallery_title'], $generate_link['time_validation']); - $send_email = pwg_mail($userdata['email'], $email_params); - switch_lang_back(); - - if ($send_email) - { - $page['infos'][] = l10n('Check your email for the confirmation link'); - return true; - } - else - { - $page['errors']['password_page_error'] = l10n('Error sending email'); - return false; - } + return true; } /** @@ -164,15 +284,11 @@ function reset_password() return false; } - if (!isset($_GET['key'])) - { - $page['errors']['password_page_error'] = l10n('Invalid key'); - } - - $user_id = check_password_reset_key($_GET['key']); + $user_id = reset_password_key() ?: reset_password_code(); if (!is_numeric($user_id)) { + $page['errors']['password_form_error'] = l10n('Invalid key or code'); return false; } @@ -182,8 +298,21 @@ function reset_password() array($conf['user_fields']['id'] => $user_id) ); - deactivate_password_reset_key($user_id); - deactivate_user_auth_keys($user_id); + if (isset($_SESSION['valid_reset_password_code']) and !empty($_SESSION['valid_reset_password_code']['email'])) + { + $reset_user = $_SESSION['valid_reset_password_code']; + switch_lang_to($reset_user['language']); + + $api_keys = get_available_api_key($reset_user['user_id']); + $nb_of_apikeys = $api_keys ? count($api_keys) : 0; + $template_mail = pwg_generate_success_reset_password_mail($reset_user['username'], $nb_of_apikeys); + pwg_mail($reset_user['email'], $template_mail); + + switch_lang_back(); + } + unset($_SESSION['valid_reset_password_code']); + + pwg_activity('user', $user_id, 'reset_password_success'); $page['infos'][] = l10n('Your password has been reset'); $page['infos'][] = ''.l10n('Login').''; @@ -191,6 +320,35 @@ function reset_password() return true; } +function reset_password_key() +{ + if (!isset($_GET['key'])) + { + return false; + } + + $user_id = check_password_reset_key($_GET['key']); + + if (!is_numeric($user_id)) + { + return false; + } + + deactivate_password_reset_key($user_id); + deactivate_user_auth_keys($user_id); + return $user_id; +} + +function reset_password_code() +{ + if (!isset($_SESSION['valid_reset_password_code'])) + { + return false; + } + + return $_SESSION['valid_reset_password_code']['user_id'] ?? false; +} + // +-----------------------------------------------------------------------+ // | Process form | // +-----------------------------------------------------------------------+ @@ -199,10 +357,20 @@ if (isset($_POST['submit'])) check_pwg_token(); if ('lost' == $_GET['action']) + { + if (process_verification_code()) + { + $page['infos'][] = l10n('If your account exists, a verification code has been sent to your email address.'); + $page['action'] = 'lost_code'; + } + } + + if ('lost_code' == $_GET['action']) { if (process_password_request()) { - $page['action'] = 'lost_end'; + $page['infos'][] = l10n('Verification successful! You can now choose a new password.'); + $page['action'] = 'reset'; } } @@ -253,15 +421,18 @@ if (!isset($page['action'])) { $page['action'] = 'lost'; } - elseif (in_array($_GET['action'], array('lost', 'reset', 'none'))) + elseif (in_array($_GET['action'], array('lost', 'lost_code', 'reset', 'none'))) { $page['action'] = $_GET['action']; } } -if ('reset' == $page['action'] and !isset($_GET['key']) and (is_a_guest() or is_generic())) +if ('reset' == $page['action']) { - redirect(get_gallery_home_url()); + if ( (!isset($_GET['key']) and (is_a_guest() or is_generic())) and !isset($_SESSION['valid_reset_password_code']) ) + { + redirect(get_gallery_home_url()); + } } if ('lost' == $page['action'] and !is_a_guest()) @@ -269,6 +440,16 @@ if ('lost' == $page['action'] and !is_a_guest()) redirect(get_gallery_home_url()); } +if ('lost_code' == $page['action'] and !isset($_SESSION['reset_password_code'])) +{ + redirect(get_gallery_home_url(). 'identification.php'); +} + +if ('lost' == $page['action'] and isset($_SESSION['reset_password_code'])) +{ + $page['action'] = 'lost_code'; +} + // +-----------------------------------------------------------------------+ // | template initialization | // +-----------------------------------------------------------------------+ diff --git a/picture.php b/picture.php index 115c72048..067ee6d48 100644 --- a/picture.php +++ b/picture.php @@ -11,6 +11,8 @@ include_once(PHPWG_ROOT_PATH.'include/common.inc.php'); include(PHPWG_ROOT_PATH.'include/section_init.inc.php'); include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php'); +save_edit_context(); + // Check Access and exit when user status is not ok check_status(ACCESS_GUEST); @@ -781,12 +783,7 @@ if (is_admin()) if ($conf['picture_edit_icon']) { - $url_admin = - get_root_url().'admin.php?page=photo-'.$page['image_id'] - .(isset($page['category']) ? '&cat_id='.$page['category']['id'] : '') - ; - - $template->assign('U_PHOTO_ADMIN', $url_admin); + $template->assign('U_PHOTO_ADMIN', get_root_url().'admin.php?page=photo-'.$page['image_id']); } if ($conf['picture_caddie_icon']) diff --git a/profile.php b/profile.php index f8e0d4a84..88a42cb9f 100644 --- a/profile.php +++ b/profile.php @@ -87,6 +87,16 @@ SELECT '.implode(',', $fields).' } $user['language'] = $_COOKIE['lang']; + single_update( + USER_INFOS_TABLE, + array( + 'language' => $_COOKIE['lang'] + ), + array( + 'user_id' => $user['id'] + ) + ); + load_language('common.lang', '', array('language'=>$user['language'])); } @@ -98,7 +108,7 @@ SELECT '.implode(',', $fields).' $template->assign(array( 'language_options' => $language_options, - 'current_language' => $user['language'] + 'language_selection' => $user['language'] )); //Get link to doc diff --git a/search.php b/search.php index 0b81d86f7..5ddafe471 100644 --- a/search.php +++ b/search.php @@ -28,9 +28,39 @@ $search = array( ); // list of filters in user preferences -// allwords, cat, tags, author, added_by, filetypes, date_posted -$default_fields = array('allwords', 'cat', 'tags', 'author'); -if (is_a_guest() or is_generic()) +$filters_views = safe_unserialize(conf_get_param('filters_views', $conf['default_filters_views'])); + +//change the name of the keys so that they can be used with this part of the program +$filter_rename_for = array( + 'words' => 'allwords', + 'post_date' => 'date_posted', + 'creation_date' => 'date_created', + 'album' => 'cat', + 'file_type' => 'filetypes', + 'ratio' => 'ratios', + 'rating' => 'ratings', + 'file_size' => 'filesize', +); + +$filters_conf = array(); +foreach ($filters_views as $filter_name => $filter_value) +{ + $key = isset($filter_rename_for[$filter_name]) ? $filter_rename_for[$filter_name] : $filter_name; + + $filters_conf[$key] = $filter_value; +} + +//get all default filters +$default_fields = array(); +foreach($filters_conf as $filt_name => $filt_conf){ + if(isset($filt_conf['default'])){ + if($filt_conf['default'] == true){ + $default_fields[] = $filt_name; + } + } +} + +if (is_a_guest() or is_generic() or $filters_conf['last_filters_conf']==false) { $fields = $default_fields; } @@ -131,7 +161,7 @@ SELECT } } -foreach (array('added_by', 'filetypes', 'date_posted') as $field) +foreach (array('added_by', 'filetypes', 'ratios', 'ratings') as $field) { if (in_array($field, $fields)) { @@ -139,6 +169,23 @@ foreach (array('added_by', 'filetypes', 'date_posted') as $field) } } +foreach (array('date_posted', 'date_created') as $field){ + if (in_array($field, $fields)) + { + $search['fields'][$field] = array( + 'preset' => '' + ); + } +} + +foreach (array('filesize_min', 'filesize_max', 'width_min', 'width_max', 'height_min', 'height_max') as $field) +{ + if (in_array($field, $fields)) + { + $search['fields'][$field] = ''; + } +} + list($search_uuid, $search_url) = save_search($search); redirect($search_url); ?> diff --git a/themes/default/css/clear-search.css b/themes/default/css/clear-search.css index 624d0b1b0..535cc0b8a 100644 --- a/themes/default/css/clear-search.css +++ b/themes/default/css/clear-search.css @@ -23,7 +23,8 @@ .filter-manager-popin .mcs-popin-title, .tags-found-popin .mcs-popin-title, -.albums-found-popin .mcs-popin-title { +.albums-found-popin .mcs-popin-title, +.quick-search-headers .mcs-popin-title { color: #ff7700; } @@ -78,7 +79,7 @@ .filter-form { background: white; - box-shadow: 0px 5px 10px 0px rgba(0,0,0,0.6); + box-shadow: 0px 5px 10px 0px rgba(0,0,0,0.2); color: black; } @@ -109,6 +110,11 @@ color: #444; } +#expert-search { + background: #eee; + color: #444; +} + .date_posted-option label{ background-color:white; border-bottom:1px solid #f3f3f3; diff --git a/themes/default/css/dark-search.css b/themes/default/css/dark-search.css index 207bef721..7e323770c 100644 --- a/themes/default/css/dark-search.css +++ b/themes/default/css/dark-search.css @@ -23,7 +23,8 @@ .filter-manager-popin .mcs-popin-title, .tags-found-popin .mcs-popin-title, -.albums-found-popin .mcs-popin-title { +.albums-found-popin .mcs-popin-title, +.quick-search-headers .mcs-popin-title { color: #ff7700bb; } @@ -79,7 +80,7 @@ .filter-form { background: #333; - box-shadow: 0px 5px 10px 0px rgba(0,0,0,0.6); + box-shadow: 0px 5px 10px 0px rgba(0,0,0,0.2); color: #bbb; } @@ -105,6 +106,14 @@ color: #888; } +.help-popin-search { + color:#ccc; +} + +.help-popin-search:hover { + color:#fff; +} + #word-search { background: #777; color: #eee; @@ -304,6 +313,10 @@ color: #777 } +.modal-content { + background-color: #444; +} + @media (max-width: 600px) { .filter-form { width: 100vw; diff --git a/themes/default/css/help/quick_search.css b/themes/default/css/help/quick_search.css new file mode 100644 index 000000000..e53dc16e3 --- /dev/null +++ b/themes/default/css/help/quick_search.css @@ -0,0 +1,68 @@ +.quick-search-headers { + font-size: 19px; + font-weight: bold; + margin-bottom: 10px; +} + +.quick-search-infos p { + text-align: start; +} + +.quick-search-items p { + margin: 0; + color: #3C3C3C; +} + +.quick-search-items { + display: flex; + flex-direction: column; + gap: 30px; +} + +.quick-search-item { + display: flex; + flex-direction: column; + gap: 5px; + border-left: 4px solid #D9D9D9; + padding-left: 10px; +} + +.quick-search-item-info { + display: grid; + grid-template-columns: 110px 1fr; +} + +.quick-search-item-type p, +.quick-search-item-tip p, +.quick-search-item-example p, +.quick-search-section { + text-align: start; +} + +.quick-search-item-example { + padding: 4px 10px; + background-color: #F0F0F0; + height: fit-content; + width: fit-content; +} + +.quick-search-item-tip p { + color: #868686 !important; +} + +.quick-search-section { + font-weight: bold; + margin: 10px 0 !important; + font-size: 16px; +} + +.dark.quick-search-items p { + color: #cccccc; +} +.dark .quick-search-item-example{ + background-color: #333; +} + +.dark .quick-search-item { + border-left: 4px solid #333; +} \ No newline at end of file diff --git a/themes/default/css/search.css b/themes/default/css/search.css index 012ea8a1a..aae14d66f 100644 --- a/themes/default/css/search.css +++ b/themes/default/css/search.css @@ -56,7 +56,8 @@ .filter-manager-popin .mcs-popin-title, .tags-found-popin .mcs-popin-title, -.albums-found-popin .mcs-popin-title { +.albums-found-popin .mcs-popin-title, +.quick-search-headers .mcs-popin-title{ width: 100%; font-size: 19px; font-weight: 700; @@ -534,6 +535,10 @@ position:absolute; } +#expert-search { + width:350px; +} + /*_____________________________*/ .head-button-2 { @@ -992,4 +997,74 @@ .mcs_hide{ display:none!important; -} \ No newline at end of file +} + +/* expert mode : search tips modal */ +.bg-modal { + display: none; + position: fixed; + z-index: 999; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgba(0,0,0,0.7); +} + +.close-modal { + color: white; + position: absolute; + right: -40px; + top: -40px; + font-size: 30px; + cursor: pointer; +} + +.close-modal:hover { + color: white; + text-decoration: none; +} + +.modal-content { + display: flex; + flex-direction: column; + background-color: white; + position: absolute; + border-radius: 10px; + left: 50%; + top: 50%; + transform: translate(-50%, -48%); + text-align: left; + padding: 30px; + width: 400px; +} + +.help-popin-search { + cursor: pointer; + font-weight: normal !important; +} + +.help-popin-search:hover span, +.help-popin-search:hover .icon-help-circled::before { + color: #3C3C3C !important; +} + +#modalQuickSearch p { + margin: 0; +} + +#modalQuickSearch .modal-content { + max-height: 400px; + height: 100%; + width: 500px; + gap:20px; +} + +.quick-search-content { + height: 100%; + overflow-y: scroll; + display: flex; + flex-direction: column; + gap: 20px; +} diff --git a/themes/default/js/mcs.js b/themes/default/js/mcs.js index ec20466ee..8e7c176fd 100644 --- a/themes/default/js/mcs.js +++ b/themes/default/js/mcs.js @@ -33,6 +33,8 @@ $(document).ready(function () { PS_params.search_id = search_id; empty_filters_list = []; + filters_to_remove = []; + // Setup word filter if (global_params.fields.allwords) { $(".filter-word").css("display", "flex"); @@ -76,6 +78,7 @@ $(document).ready(function () { empty_filters_list.push(PS_params.allwords); } + //Hide filter spinner $(".filter-spinner").hide(); @@ -87,7 +90,7 @@ $(document).ready(function () { items: global_params.fields.tags ? global_params.fields.tags.words : null, }); }); - + if (global_params.fields.tags) { $(".filter-tag").css("display", "flex"); $(".filter-manager-controller.tags").prop("checked", true); @@ -569,17 +572,13 @@ $(document).ready(function () { empty_filters_list.push(PS_params.ratings); } - else if (!show_filter_ratings) - { - updateFilters('ratings', 'add'); - } // Setup filesize filter if (global_params.fields.filesize_min != null && global_params.fields.filesize_max != null) { $(".filter-filesize").css("display", "flex"); $(".filter-manager-controller.filesize").prop("checked", true); - $(".filter.filter-filesize .slider-info").html(sprintf(sliders.filesizes.text,sliders.filesizes.selected.min,sliders.filesizes.selected.max,)); + $(".filter.filter-filesize .slider-info").html(sprintf(sliders.filesizes.text,sliders.filesizes.selected.min,sliders.filesizes.selected.max)); $('[data-slider=filesizes]').pwgDoubleSlider(sliders.filesizes); @@ -594,7 +593,7 @@ $(document).ready(function () { if( global_params.fields.filesize_min != null && global_params.fields.filesize_max > 0) { $(".filter-filesize").addClass("filter-filled"); - $(".filter.filter-filesize .search-words").html(sprintf(sliders.filesizes.text,sliders.filesizes.selected.min,sliders.filesizes.selected.max,)); + $(".filter.filter-filesize .search-words").html(sprintf(sliders.filesizes.text,sliders.filesizes.selected.min,sliders.filesizes.selected.max)); } else { @@ -622,13 +621,13 @@ $(document).ready(function () { if (global_params.fields.height_min != null && global_params.fields.height_max != null) { $(".filter-height").css("display", "flex"); $(".filter-manager-controller.height").prop("checked", true); - $(".filter.filter-height .slider-info").html(sprintf(sliders.heights.text,sliders.heights.selected.min,sliders.heights.selected.max,)); + $(".filter.filter-height .slider-info").html(sprintf(sliders.heights.text,sliders.heights.selected.min,sliders.heights.selected.max)); $('[data-slider=heights]').pwgDoubleSlider(sliders.heights); if( global_params.fields.height_min > 0 && global_params.fields.height_max > 0) { $(".filter-height").addClass("filter-filled"); - $(".filter.filter-height .search-words").html(sprintf(sliders.heights.text,sliders.heights.selected.min,sliders.heights.selected.max,)); + $(".filter.filter-height .search-words").html(sprintf(sliders.heights.text,sliders.heights.selected.min,sliders.heights.selected.max)); } else { @@ -656,13 +655,13 @@ $(document).ready(function () { if (global_params.fields.width_min != null && global_params.fields.width_max != null) { $(".filter-width").css("display", "flex"); $(".filter-manager-controller.width").prop("checked", true); - $(".filter.filter-width .slider-info").html(sprintf(sliders.widths.text,sliders.widths.selected.min,sliders.widths.selected.max,)); + $(".filter.filter-width .slider-info").html(sprintf(sliders.widths.text,sliders.widths.selected.min,sliders.widths.selected.max)); $('[data-slider=widths]').pwgDoubleSlider(sliders.widths); if( global_params.fields.width_min > 0 && global_params.fields.width_max > 0) { $(".filter-width").addClass("filter-filled"); - $(".filter.filter-width .search-words").html(sprintf(sliders.widths.text,sliders.widths.selected.min,sliders.widths.selected.max,)); + $(".filter.filter-width .search-words").html(sprintf(sliders.widths.text,sliders.widths.selected.min,sliders.widths.selected.max)); } else { @@ -686,6 +685,34 @@ $(document).ready(function () { empty_filters_list.push(PS_params.width_max); } + // Setup Expert filter + if (global_params.fields.expert) { + $(".filter-expert").css("display", "flex"); + $(".filter-manager-controller.expert").prop("checked", true); + + expert_search_str = global_params.fields.expert.string; + $("#expert-search").val(expert_search_str); + + if (global_params.fields.expert.string && global_params.fields.expert.string.length > 0) { + $(".filter-expert").addClass("filter-filled"); + $(".filter.filter-expert .search-words").text(expert_search_str); + } else { + $(".filter.filter-expert .search-words").text(str_expert_widget_label); + } + + $(".filter-expert .filter-actions .clear").on('click', function () { + $(".filter-expert #expert-search").val(''); + }); + + PS_params.expert = global_params.fields.expert.string.length > 0 ? global_params.fields.expert.string : ''; + + empty_filters_list.push(PS_params.expert); + } + + if(filters_to_remove.length > 0){ + filters_to_remove = []; + performSearch(PS_params, true); + } // Adapt no result message if ($(".filter-filled").length === 0) { @@ -693,7 +720,7 @@ $(document).ready(function () { $(".mcs-no-result .text .bot").html(str_empty_search_bot_alt); } - if (!empty_filters_list.every(param => param === "" || param === null)) { + if (!empty_filters_list.every(param => param === "" || param === null || (typeof param == 'undefined'))) { $(".clear-all").addClass("clickable"); $(".clear-all.clickable").on('click', function () { exclude_params = ['search_id', 'allwords_mode', 'allwords_fields', 'tags_mode', 'categories_withsubs']; @@ -724,6 +751,7 @@ $(document).ready(function () { // 27 is 'Escape' if(e.keyCode === 27) { $(".filter-manager-popin .filter-manager-close").trigger('click'); + $('#closeModalQuickSearch').trigger('click'); } // 13 is 'Enter' if (e.keyCode === 13) { @@ -1355,6 +1383,40 @@ $(document).ready(function () { $(".filter-manager-controller.width").prop("checked", false); } }); + + /** + * Expert widget + */ + $(".filter-expert").on('click', function (e) { + if ($(".filter-form").has(e.target).length != 0 || + $(e.target).hasClass("filter-form") || + $(e.target).hasClass("remove")) { + return; + } + $(".filter-expert-form").toggle(0, function () { + if ($(this).is(':visible')) { + $(".filter-expert").addClass("show-filter-dropdown"); + } else { + $(".filter-expert").removeClass("show-filter-dropdown"); + + global_params.fields.expert = $("#expert-search").val(); + PS_params.expert = $("#expert-search").val(); + } + }); + }); + + $(".filter-expert .filter-validate").on("click", function () { + $(".filter-expert").trigger("click"); + performSearch(PS_params, true); + }); + $(".filter-expert .filter-actions .delete").on("click", function () { + updateFilters('expert', 'del'); + performSearch(PS_params, true); + if (!$(".filter-expert").hasClass("filter-filled")) { + $(".filter-expert").hide(); + $(".filter-manager-controller.expert").prop("checked", false); + } + }); }) function performSearch(params, reload = false) { @@ -1655,4 +1717,12 @@ $(window).on('load', function() { }); $(window).on('resize', function() { resize_filter_form(); +}); + +$('.help-popin-search').on('click', function() { + $('#modalQuickSearch').fadeIn(); +}); + +$('#closeModalQuickSearch').on('click', function() { + $('#modalQuickSearch').fadeOut(); }); \ No newline at end of file diff --git a/themes/default/template/help/quick_search.tpl b/themes/default/template/help/quick_search.tpl new file mode 100644 index 000000000..e19803121 --- /dev/null +++ b/themes/default/template/help/quick_search.tpl @@ -0,0 +1,306 @@ +{combine_css path="themes/default/css/help/quick_search.css"} + +
    + {"Search using extended syntax"|translate} +
    +
    +

    + {"The quick search engine allows you to use boolean operators to refine your search. By default, the search applies to all keywords. Searches are not case sensitive."|translate} +

    +

    {"Here is a list of actions you can perform:"|translate}

    +
    + +

    {"With keywords"|translate}

    + +
    + {* quoted keyword / phrase *} +
    +
    +
    +

    {"Exact search"|translate}

    +
    +
    +

    "george washington"

    +
    +
    +
    +

    {"Use quotes to search for an exact keyword or phrase."|translate}

    +
    +
    + + {* OR inclusive *} +
    +
    +
    +

    {"OR inclusive"|translate}

    +
    +
    +

    john OR bill

    +
    +
    +
    +

    {"Add an OR between words."|translate}

    +
    +
    + + {* exclude *} +
    +
    +
    +

    {"Exclude"|translate}

    +
    +
    +

    george washington NOT bush

    +

    -george

    +
    +
    +
    + {"Add a dash (-) or NOT before a word to exclude from search. Note that NOT acts as a filtering operator so you cannot have a search containing only NOT operators. You cannot combine OR with NOT (john OR NOT bill is not valid)"|translate} +
    +
    + + {* OR inclusive *} +
    +
    +
    +

    {"Grouping"|translate} ()

    +
    +
    +

    (mother OR father) AND (daugther OR son)

    +
    +
    +
    +
    + +

    {"Others"|translate}

    +
    +
    +
    +
    +

    {"Supported numeric operators"|translate}

    +
    +
    +

    =100 {"equals 100"|translate}

    +

    >100 {"greater than 100"|translate}

    +

    <100 {"less than 100"|translate}

    +

    10..100 {"between 10 and 100 (inclusive)"|translate}

    +

    ..100 {"up to 100 (inclusive)"|translate}

    +

    100.. {"from 100 and above"|translate}

    +
    +
    +
    + {"These operators can be used with numeric fields such as"|translate} created:, posted:, width:, height:, size:, ratio:, hits:, score:, filesize:, id:. +
    +
    + + {* tags: *} +
    +
    +
    +

    tag:

    +

    tags:

    +
    +
    +

    tag:(john OR bill)

    +
    +
    +
    + {"Searches only in tag names without looking at photo titles or descriptions."|translate} +
    +
    + + {* photos: *} +
    +
    +
    +

    photo:

    +

    photos:

    +
    +
    +

    photo:Tiger

    +
    +
    +
    + {"Searches only for photos with the given words in title or description."|translate} +
    +
    + + {* files: *} +
    +
    +
    +

    file:

    +
    +
    +

    file:DSC_

    +

    file:*.webp

    +
    +
    +
    + {"Searches by file name."|translate} +
    +
    + + {* author: *} +
    +
    +
    +

    author:

    +
    +
    +

    author:John

    +
    +
    +
    + {"Searches by author."|translate} +
    +
    + + {* created: taken: shot: *} +
    +
    +
    +

    created:

    +

    taken:

    +

    shot:

    +
    +
    +

    taken:2003 {"photos taken in 2003"|translate}

    +

    taken:20035, taken:2003-5, taken:2003-05 {"photos from may 2003"|translate}

    +

    taken:2003..2008 {"photos from 2003 to 2008"|translate}

    +

    taken:>2008, taken:2008*, taken:2008.. {"photos after Jan 1st 2008"|translate}

    +
    +
    +
    + {"Searches photos by taken date."|translate} +
    +
    + + {* posted: *} +
    +
    +
    +

    posted:

    +
    +
    +

    posted:2003 {"photos posted in 2003"|translate}

    +
    +
    +
    + {"Searches photos by posted date."|translate} {"Same principle as for"|translate} created:. +
    +
    + + {* width: height: *} +
    +
    +
    +

    width:

    +

    height:

    +
    +
    +

    width:>500 {"return photos wider than 500px"|translate}

    +

    height:<700 {"return photos less than 700px high"|translate}

    +
    +
    +
    + {"Searches photos with a given width or height."|translate} +
    +
    + + {* size: *} +
    +
    +
    +

    size:

    +
    +
    +

    size:5m {"returns photos of 5 megapixels"|translate}

    +

    size:>12m {"returns photos of 12 megapixels or more"|translate}

    +
    +
    +
    + {"Searches photos by size in pixels."|translate} +
    +
    + + {* ratio: *} +
    +
    +
    +

    ratio:

    +
    +
    +

    ratio:3/4 OR ratio:4/3 + {"finds photos from compact cameras in portrait or landscape modes"|translate}

    +

    ratio:>16/9 {"finds panoramas"|translate}

    +
    +
    +
    + {"Searches photos by width/height ratio."|translate} +
    +
    + + {* hits: *} +
    +
    +
    +

    hits:

    +
    +
    +

    hits:>1000 {"return photos with at least 1,000 views"|translate}

    +
    +
    +
    +

    {"Searches for photos by number of views."|translate}

    +
    +
    + + {* score: rating:*} +
    +
    +
    +

    score:

    +

    rating:

    +
    +
    +

    score:* {"will give you all photos with at least one note."|translate}

    +

    score: {"will give you photos without notes."|translate}

    +
    +
    +
    +

    {"Searches photos by rating."|translate}

    +
    +
    + + {* filesize: *} +
    +
    +
    +

    filesize:

    +
    +
    +

    filesize:1m..10m {"finds files between 1MB and 10MB."|translate}

    +
    +
    +
    + {"Searches photos by file size."|translate} +
    +
    + + {* id: *} +
    +
    +
    +

    id:

    +
    +
    +

    id:123..126 + {"finds photo 123 to 126 (it may find between 0 and 4 photos, because photos can be deleted)"|translate}

    +
    +
    +
    + {"Searches photos by its numeric identifier in Piwigo."|translate} +
    +
    +
    \ No newline at end of file diff --git a/themes/default/template/include/related_tags.inc.tpl b/themes/default/template/include/related_tags.inc.tpl new file mode 100644 index 000000000..568e2c6fb --- /dev/null +++ b/themes/default/template/include/related_tags.inc.tpl @@ -0,0 +1,12 @@ +

    {'Related tags'|translate}

    + +{foreach from=$COMBINABLE_TAGS item=tag} +{strip} + + {else} + "{$tag.URL}" title="{'display photos linked to this tag'|@translate}"> + {/if} + + {$tag.name}
    {$tag.counter}
    {/strip} +{/foreach} \ No newline at end of file diff --git a/themes/default/template/include/search_filters.inc.tpl b/themes/default/template/include/search_filters.inc.tpl index c1a5ff012..2b9091d69 100644 --- a/themes/default/template/include/search_filters.inc.tpl +++ b/themes/default/template/include/search_filters.inc.tpl @@ -23,6 +23,14 @@ fullname_of_cat = {$fullname_of}; search_id = '{$SEARCH_ID}'; {/if} +{if is_admin()} +user_rank = "admin"; +{elseif is_classic_user()} +user_rank = "user"; +{else} +user_rank = "none"; +{/if} + str_word_widget_label = "{'Search for words'|@translate|escape:javascript}"; str_tags_widget_label = "{'Tag'|@translate|escape:javascript}"; str_album_widget_label = "{'Album'|@translate|escape:javascript}"; @@ -42,6 +50,7 @@ str_ratios_label['Portrait'] ="{'Portrait'|@translate|escape:javascript}"; str_ratios_label['square'] = "{'square'|@translate|escape:javascript}"; str_ratios_label['Landscape'] = "{'Landscape'|@translate|escape:javascript}"; str_ratios_label['Panorama'] = "{'Panorama'|@translate|escape:javascript}"; +str_expert_widget_label = "{'Expert mode'|@translate|escape:javascript}"; str_empty_search_top_alt = "{'Fill in the filters to start a search'|@translate|escape:javascript}"; str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'|@translate|escape:javascript}"; @@ -101,60 +110,93 @@ const prefix_icon = 'gallery-icon-';
    {'Choose filters'|@translate}
    + {if $display_filter.words.access == 'everybody' or ($display_filter.words.access == 'admins-only' and is_admin()) or ($display_filter.words.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.tags.access == 'everybody' or ($display_filter.tags.access == 'admins-only' and is_admin()) or ($display_filter.tags.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.post_date.access == 'everybody' or ($display_filter.post_date.access == 'admins-only' and is_admin()) or ($display_filter.post_date.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.creation_date.access == 'everybody' or ($display_filter.creation_date.access == 'admins-only' and is_admin()) or ($display_filter.creation_date.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.album.access == 'everybody' or ($display_filter.album.access == 'admins-only' and is_admin()) or ($display_filter.album.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.author.access == 'everybody' or ($display_filter.author.access == 'admins-only' and is_admin()) or ($display_filter.author.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.added_by.access == 'everybody' or ($display_filter.added_by.access == 'admins-only' and is_admin()) or ($display_filter.added_by.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.file_type.access == 'everybody' or ($display_filter.file_type.access == 'admins-only' and is_admin()) or ($display_filter.file_type.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.ratio.access == 'everybody' or ($display_filter.ratio.access == 'admins-only' and is_admin()) or ($display_filter.ratio.access == 'registered-users' and is_classic_user())} + {/if} {if $SHOW_FILTER_RATINGS and isset($SHOW_FILTER_RATINGS)} + {if $display_filter.rating.access == 'everybody' or ($display_filter.rating.access == 'admins-only' and is_admin()) or ($display_filter.rating.access == 'registered-users' and is_classic_user())} + {/if} {/if} + {if $display_filter.file_size.access == 'everybody' or ($display_filter.file_size.access == 'admins-only' and is_admin()) or ($display_filter.file_size.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.height.access == 'everybody' or ($display_filter.height.access == 'admins-only' and is_admin()) or ($display_filter.height.access == 'registered-users' and is_classic_user())} + {/if} + {if $display_filter.width.access == 'everybody' or ($display_filter.width.access == 'admins-only' and is_admin()) or ($display_filter.width.access == 'registered-users' and is_classic_user())} + {/if} + +{if $display_filter.expert.access == 'everybody' or ($display_filter.expert.access == 'admins-only' and is_admin()) or ($display_filter.expert.access == 'registered-users' and is_classic_user())} + +{/if}
    @@ -795,12 +837,51 @@ const prefix_icon = 'gallery-icon-';
    {/if} +
    + + + + +
    +
    {'Expert mode'|@translate}
    +
    + {'Delete'|@translate} + {'Clear'|@translate} +
    + + + +

    + + {'Search tips'|translate} +

    + +
    + + {'Validate'|@translate} +
    +
    +
    +
    {'Empty filters'|@translate}
    +
    +
    + + +
    +
    + {assign var=is_dark_mode value=$themeconf.colorscheme == 'dark'} + {include file='themes/default/template/help/quick_search.tpl' dark_mode=$is_dark_mode} +
    +
    +
    +
    + {if isset($TAGS_FOUND) or isset($ALBUMS_FOUND)}
    {if isset($TAGS_FOUND)} diff --git a/themes/default/template/include/selected_tags.inc.tpl b/themes/default/template/include/selected_tags.inc.tpl new file mode 100644 index 000000000..5fb0c46f4 --- /dev/null +++ b/themes/default/template/include/selected_tags.inc.tpl @@ -0,0 +1,16 @@ + + +{foreach $SELECT_RELATED_TAGS as $TAG} + + + {$TAG.tag_name} + + {if count($SELECT_RELATED_TAGS) > 1} + + + + {/if} + +{/foreach} + + diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index e767e05e0..9a4d1be6e 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -1,4 +1,5 @@ {combine_script id='core.switchbox' load='async' require='jquery' path='themes/default/js/switchbox.js'} +{combine_css path="themes/default/vendor/fontello/css/gallery-icon.css" order=-10} {$MENUBAR} @@ -13,11 +14,29 @@
    -

    {$TITLE} {if $NB_ITEMS > 0}{$NB_ITEMS}{/if}

    + {if isset($chronology_views)}
    {'View'|@translate}: @@ -157,14 +182,21 @@ {include file=$FILE_CHRONOLOGY_VIEW} {/if} +
    + {if isset($SEARCH_IN_SET_BUTTON) and $SEARCH_IN_SET_BUTTON} -
    - {/if} +{if isset($COMBINABLE_TAGS)} +{include file='include/related_tags.inc.tpl'} +{/if} +
    + {if !empty($CONTENT_DESCRIPTION)}
    {$CONTENT_DESCRIPTION} diff --git a/themes/default/template/mail/text/html/cat_group_info.tpl b/themes/default/template/mail/text/html/cat_group_info.tpl index 6a136c63c..5ef24d412 100644 --- a/themes/default/template/mail/text/html/cat_group_info.tpl +++ b/themes/default/template/mail/text/html/cat_group_info.tpl @@ -1,6 +1,8 @@

    {'Informations'|@translate}

    +{if isset($IMG) && isset($IMG.link) && isset($IMG.src)}

    +{/if}

    {'Hello,'|@translate}

    {'Discover album:'|@translate} {$CAT_NAME}

    {$CPL_CONTENT}

    diff --git a/themes/default/template/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl index 736078c34..57aa483e3 100644 --- a/themes/default/template/menubar_identification.tpl +++ b/themes/default/template/menubar_identification.tpl @@ -15,7 +15,7 @@
  • {'Logout'|@translate}
    • {/if} {if isset($U_PROFILE)} -
  • {'Customize'|@translate}
    • +
  • {'Profile'|@translate}
    • {/if} {if isset($U_ADMIN)}
  • {'Administration'|@translate}
    • diff --git a/themes/default/template/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl index 2ef7daf16..b19cb543d 100644 --- a/themes/default/template/menubar_tags.tpl +++ b/themes/default/template/menubar_tags.tpl @@ -1,4 +1,4 @@ -
    {if $IS_RELATED}{'Related tags'|@translate}{else}{'Tags'|@translate}{/if}
    +
    {'Tags'|@translate}