From 6746792bdfa58b113ce0e3032570b729e30c49dd Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 28 Jan 2018 12:43:27 +0100 Subject: [PATCH 1/2] Drop short_tags --- index.php | 3 - modules/akismet/views/admin_akismet.html.php | 4 +- .../admin_block_recent_comments.html.php | 10 +-- .../admin_manage_comments_queue.html.php | 54 +++++++------- modules/comment/views/comment.html.php | 10 +-- modules/comment/views/comment.mrss.php | 14 ++-- modules/comment/views/comments.html.php | 32 ++++----- .../views/user_profile_comments.html.php | 4 +- modules/exif/views/exif_dialog.html.php | 10 +-- .../g2_import/views/admin_g2_import.html.php | 28 ++++---- .../views/admin_advanced_settings.html.php | 10 +-- .../views/admin_block_log_entries.html.php | 10 +-- .../gallery/views/admin_block_news.html.php | 4 +- .../views/admin_block_photo_stream.html.php | 4 +- .../gallery/views/admin_dashboard.html.php | 4 +- modules/gallery/views/admin_graphics.html.php | 14 ++-- .../gallery/views/admin_graphics_gd.html.php | 14 ++-- .../admin_graphics_graphicsmagick.html.php | 8 +-- .../views/admin_graphics_imagemagick.html.php | 8 +-- .../gallery/views/admin_languages.html.php | 18 ++--- .../gallery/views/admin_maintenance.html.php | 64 ++++++++--------- modules/gallery/views/admin_modules.html.php | 40 +++++------ .../views/admin_modules_confirm.html.php | 12 ++-- modules/gallery/views/admin_movies.html.php | 14 ++-- .../views/admin_sidebar_blocks.html.php | 4 +- modules/gallery/views/admin_themes.html.php | 40 +++++------ .../views/admin_themes_buttonset.html.php | 26 +++---- modules/gallery/views/error_404.html.php | 6 +- modules/gallery/views/error_admin.html.php | 72 +++++++++---------- modules/gallery/views/error_cli.txt.php | 2 +- modules/gallery/views/error_user.html.php | 2 +- modules/gallery/views/form.html.php | 2 +- modules/gallery/views/form_uploadify.html.php | 20 +++--- modules/gallery/views/in_place_edit.html.php | 6 +- modules/gallery/views/kohana/error.php | 2 +- modules/gallery/views/kohana_profiler.php | 6 +- modules/gallery/views/l10n_client.html.php | 14 ++-- modules/gallery/views/login_ajax.html.php | 4 +- .../gallery/views/login_current_user.html.php | 4 +- modules/gallery/views/menu.html.php | 18 ++--- .../gallery/views/permissions_browse.html.php | 20 +++--- .../gallery/views/permissions_form.html.php | 50 ++++++------- .../views/quick_delete_confirm.html.php | 6 +- .../views/upgrade_checker_block.html.php | 30 ++++---- modules/gallery/views/upgrader.html.php | 50 ++++++------- modules/gallery/views/user_profile.html.php | 12 ++-- .../gallery/views/user_profile_info.html.php | 4 +- .../gallery_unit_test/views/kohana/error.php | 2 +- .../views/kohana_unit_test_cli.php | 2 +- .../views/image_block_block.html.php | 4 +- modules/info/views/info_block.html.php | 4 +- .../notification/views/item_added.html.php | 4 +- .../notification/views/item_updated.html.php | 12 ++-- .../views/user_profile_notification.html.php | 4 +- .../organize/views/organize_frame.html.php | 10 +-- .../recaptcha/views/admin_recaptcha.html.php | 4 +- modules/rest/views/error_rest.json.php | 2 +- modules/rss/views/feed.mrss.php | 38 +++++----- modules/rss/views/rss_block.html.php | 4 +- modules/search/views/search.html.php | 26 +++---- modules/search/views/search_link.html.php | 16 ++--- .../views/admin_server_add.html.php | 8 +-- .../server_add/views/server_add_tree.html.php | 16 ++--- .../views/server_add_tree_dialog.html.php | 10 +-- modules/tag/views/admin_tags.html.php | 26 +++---- modules/tag/views/tag_cloud.html.php | 4 +- modules/user/views/admin_users.html.php | 16 ++--- modules/user/views/admin_users_group.html.php | 20 +++--- .../watermark/views/admin_watermarks.html.php | 6 +- themes/admin_wind/views/admin.html.php | 30 ++++---- themes/admin_wind/views/block.html.php | 8 +-- themes/admin_wind/views/paginator.html.php | 48 ++++++------- themes/wind/views/album.html.php | 38 +++++----- themes/wind/views/block.html.php | 4 +- themes/wind/views/dynamic.html.php | 4 +- themes/wind/views/no_sidebar.html.php | 6 +- themes/wind/views/page.html.php | 66 ++++++++--------- themes/wind/views/paginator.html.php | 46 ++++++------ themes/wind/views/photo.html.php | 12 ++-- themes/wind/views/sidebar.html.php | 10 +-- 80 files changed, 650 insertions(+), 653 deletions(-) diff --git a/index.php b/index.php index e6636cf1..bf8454b1 100644 --- a/index.php +++ b/index.php @@ -35,9 +35,6 @@ if (!ini_get("date.timezone")) { ini_set("date.timezone", "UTC"); } -// Gallery requires short_tags to be on -!ini_get("short_open_tag") and exit("Gallery requires short_open_tag to be on."); - // Suppress errors. For information on how to debug Gallery 3, see: // http://codex.galleryproject.org/Gallery3:FAQ#How_do_I_see_debug_information.3F error_reporting(0); diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php index 399053d8..0c50900c 100644 --- a/modules/akismet/views/admin_akismet.html.php +++ b/modules/akismet/views/admin_akismet.html.php @@ -7,11 +7,11 @@ "akismet_url" => "http://akismet.com")) ?>

- +
- +
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index 4017e4f9..83b98b8b 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -1,6 +1,6 @@ diff --git a/modules/comment/views/admin_manage_comments_queue.html.php b/modules/comment/views/admin_manage_comments_queue.html.php index d847d729..325a1b45 100644 --- a/modules/comment/views/admin_manage_comments_queue.html.php +++ b/modules/comment/views/admin_manage_comments_queue.html.php @@ -1,17 +1,17 @@
- +
- - 0): ?> + + 0): ?>

- +

- spam): ?> + spam): ?> spam) ?> @@ -21,20 +21,20 @@ href=""> - + - +

- + - +

- +
paginator() ?> @@ -51,7 +51,7 @@ - + "> @@ -70,17 +70,17 @@
- item() ?> + item() ?>
- has_thumb()): ?> + has_thumb()): ?> <?= html::purify($item->title)->for_html_attr() ?>thumb_width, $item->thumb_height, 75) ?> /> - + - +
@@ -89,7 +89,7 @@ - +
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php index 505bfb2f..9a8344bf 100644 --- a/modules/comment/views/comment.html.php +++ b/modules/comment/views/comment.html.php @@ -8,21 +8,21 @@ width="40" height="40" /> - author()->guest): ?> + author()->guest): ?> gallery::date_time($comment->created), "name" => html::clean($comment->author_name()))) ?> - + %name said", array("date_time" => gallery::date_time($comment->created), "url" => user_profile::url($comment->author_id), "name" => html::clean($comment->author_name()))) ?> - +

text)) ?>
- state == "unpublished"): ?> + state == "unpublished"): ?> - + diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php index 809e7890..b5144e8d 100644 --- a/modules/comment/views/comment.mrss.php +++ b/modules/comment/views/comment.mrss.php @@ -1,5 +1,5 @@ -" ?> +" ?> en-us - previous_page_uri)): ?> + previous_page_uri)): ?> - - next_page_uri)): ?> + + next_page_uri)): ?> diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index 80072a33..8e08140d 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -1,30 +1,30 @@ - + id}") ?>#comment-form" id="g-add-comment" class="g-button ui-corner-all ui-icon-left ui-state-default"> - +
- count()): ?> + count()): ?>

- + comment!", array("attrs" => html::mark_clean("href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?> - + - +

  •  
- + - count()): ?> + count()): ?>
    - +

  • @@ -34,26 +34,26 @@ width="40" height="40" /> - author()->guest): ?> + author()->guest): ?> gallery::date_time($comment->created), "name" => html::clean($comment->author_name()))); ?> - + %name said', array("date" => gallery::date_time($comment->created), "url" => user_profile::url($comment->author_id), "name" => html::clean($comment->author_name()))); ?> - +

    text)) ?>
    - state == "unpublished"): ?> + state == "unpublished"): ?> - +
    • - +
- +
diff --git a/modules/comment/views/user_profile_comments.html.php b/modules/comment/views/user_profile_comments.html.php index 377b2d95..64bbd4e8 100644 --- a/modules/comment/views/user_profile_comments.html.php +++ b/modules/comment/views/user_profile_comments.html.php @@ -1,7 +1,7 @@
    - +

  • text)) ?>

- +
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php index 22744e2d..0eacadc2 100644 --- a/modules/exif/views/exif_dialog.html.php +++ b/modules/exif/views/exif_dialog.html.php @@ -8,7 +8,7 @@
- + - + - + - + - +
@@ -16,18 +16,18 @@
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index adde83ce..bcc7a521 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -16,14 +16,14 @@ $("document").ready(function() {
- +

- +
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php index 1f45bb14..a795157a 100644 --- a/modules/gallery/views/admin_graphics.html.php +++ b/modules/gallery/views/admin_graphics.html.php @@ -21,19 +21,19 @@

- + - + $tk->$active, "is_active" => true)) ?> - +

- - + + $tk->$id, "is_active" => false)) ?> - - + +
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php index 1cc9dc9e..e3e088ac 100644 --- a/modules/gallery/views/admin_graphics_gd.html.php +++ b/modules/gallery/views/admin_graphics_gd.html.php @@ -1,30 +1,30 @@
installed ? " g-installed-toolkit" : " g-unavailable" ?>"> - " alt="" /> + " alt="" />

GD website for more information.", array("url" => "http://www.boutell.com/gd")) ?>

- installed && $tk->rotate): ?> + installed && $tk->rotate): ?>
$tk->version)) ?>

- installed): ?> - error): ?> + installed): ?> + error): ?>

error ?>

- +

- +
- +
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php index 5dae1442..e9ec1dc8 100644 --- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php +++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php @@ -1,21 +1,21 @@
installed ? " g-installed-toolkit" : " g-unavailable" ?>"> - " alt="" /> + " alt="" />

GraphicsMagick website for more information.", array("url" => "http://www.graphicsmagick.org")) ?>

- installed): ?> + installed): ?>
$tk->version, "dir" => $tk->dir)) ?>

- +
error ?>
- +
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php index 9c1a9909..6e476076 100644 --- a/modules/gallery/views/admin_graphics_imagemagick.html.php +++ b/modules/gallery/views/admin_graphics_imagemagick.html.php @@ -1,21 +1,21 @@
installed ? " g-installed-toolkit" : " g-unavailable" ?>"> - " alt="" /> + " alt="" />

ImageMagick website for more information.", array("url" => "http://www.imagemagick.org")) ?>

- installed): ?> + installed): ?>
$tk->version, "dir" => $tk->dir)) ?>

- error): ?> + error): ?>
error ?>
- +
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php index d6a9c225..c21d41c3 100644 --- a/modules/gallery/views/admin_languages.html.php +++ b/modules/gallery/views/admin_languages.html.php @@ -47,9 +47,9 @@ - - $display_name): ?> - + + $display_name): ?> + @@ -57,7 +57,7 @@ - + "> @@ -65,8 +65,8 @@ - - + +
for_html_attr() ?>" /> @@ -99,11 +99,11 @@ - get("l10n_mode", false)): ?> + get("l10n_mode", false)): ?> - + - +

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 230e9353..936dde82 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -7,15 +7,15 @@ maintenance mode which prevents any non-admin from accessing your Gallery. Some of the tasks below will automatically put your Gallery in maintenance mode for you.") ?>

    - +
  • on. Non admins cannot access your Gallery. Turn off maintenance mode", array("enable_maintenance_mode_url" => url::site("admin/maintenance/maintenance_mode/0?csrf=$csrf"))) ?>
    • - +
  • Turn on maintenance mode", array("enable_maintenance_mode_url" => url::site("admin/maintenance/maintenance_mode/1?csrf=$csrf"))) ?>
    • - +
@@ -38,7 +38,7 @@ - + severity) ?>"> name ?> @@ -53,11 +53,11 @@ - + - count()): ?> + count()): ?>
" class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> @@ -84,7 +84,7 @@ - + state == "stalled" ? "g-warning" : "" ?>"> "> updated) ?> @@ -93,16 +93,16 @@ name ?> - done): ?> - state == "cancelled"): ?> + done): ?> + state == "cancelled"): ?> - + - state == "stalled"): ?> + state == "stalled"): ?> - + $task->percent_complete)) ?> - + status ?> @@ -111,29 +111,29 @@ owner()->name) ?> - state == "stalled"): ?> + state == "stalled"): ?> id?csrf=$csrf") ?>"> - - get_log()): ?> + + get_log()): ?> id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all"> - + id?csrf=$csrf") ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> - +
- + - count()): ?> + count()): ?>
" class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> @@ -160,7 +160,7 @@ - + state == "success" ? "g-success" : "g-error" ?>"> "> updated) ?> @@ -169,13 +169,13 @@ name ?> - state == "success"): ?> + state == "success"): ?> - state == "error"): ?> + state == "error"): ?> - state == "cancelled"): ?> + state == "cancelled"): ?> - + status ?> @@ -184,29 +184,29 @@ owner()->name) ?> - done): ?> + done): ?> id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> - get_log()): ?> + get_log()): ?> id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all"> - - + + id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all> id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> - + - +
- + diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php index 96576ae4..685451ec 100644 --- a/modules/gallery/views/admin_modules.html.php +++ b/modules/gallery/views/admin_modules.html.php @@ -6,7 +6,7 @@ dataType: "json", success: function(data) { if (data.reload) { - window.location = ""; + window.location = ""; } else { $("body").append('
' + data.dialog + '
'); $("#g-dialog").dialog({ @@ -46,11 +46,11 @@ adding more modules! Each module provides new cool features.", array("url" => "http://codex.galleryproject.org/Category:Gallery_3:Modules")) ?>

- +

- +
"> @@ -63,10 +63,10 @@ - $module_info): ?> + $module_info): ?> "> - $module_name); ?> - locked) $data["disabled"] = 1; ?> + $module_name); ?> + locked) $data["disabled"] = 1; ?> name) ?> version ?> @@ -75,45 +75,45 @@ - + for_html_attr() ?>" />
diff --git a/modules/gallery/views/admin_modules_confirm.html.php b/modules/gallery/views/admin_modules_confirm.html.php index 8c4cb2bd..b5f6b7e4 100644 --- a/modules/gallery/views/admin_modules_confirm.html.php +++ b/modules/gallery/views/admin_modules_confirm.html.php @@ -6,17 +6,17 @@
    - "g-error", "warn" => "g-warning") as $type => $css_class): ?> - + "g-error", "warn" => "g-warning") as $type => $css_class): ?> +
    • - - + +
"> - + - +
diff --git a/modules/gallery/views/admin_movies.html.php b/modules/gallery/views/admin_movies.html.php index abf8fb29..11ed5a00 100644 --- a/modules/gallery/views/admin_movies.html.php +++ b/modules/gallery/views/admin_movies.html.php @@ -21,21 +21,21 @@

- " alt="" /> + " alt="" />


FFmpeg website for more information.", array("url" => "http://ffmpeg.org")) ?>

- - + +

$ffmpeg_version, "dir" => $ffmpeg_dir)) ?>

- +

$ffmpeg_dir)) ?>

- - + +

- +
diff --git a/modules/gallery/views/admin_sidebar_blocks.html.php b/modules/gallery/views/admin_sidebar_blocks.html.php index 48aa3f05..cee99d86 100644 --- a/modules/gallery/views/admin_sidebar_blocks.html.php +++ b/modules/gallery/views/admin_sidebar_blocks.html.php @@ -1,5 +1,5 @@ - $text): ?> + $text): ?>
    • - + diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index 547f27d2..ed6e816a 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -23,15 +23,15 @@

    description ?>

    - info = $themes[$site]; print $v; ?> + info = $themes[$site]; print $v; ?>

    - - $info): ?> - site) continue ?> - + + $info): ?> + site) continue ?> +
    " class="g-dialog-link" title=" $info->name))->for_html_attr() ?>"> " @@ -41,16 +41,16 @@ description ?>

    - info = $info; print $v; ?> + info = $info; print $v; ?>
    - - + + - +

    Download one now!", array("url" => "http://codex.galleryproject.org/Category:Gallery_3:Themes")) ?>

    - +
    @@ -63,15 +63,15 @@

    description ?>

    - info = $themes[$admin]; print $v; ?> + info = $themes[$admin]; print $v; ?>

    - - $info): ?> - admin) continue ?> - + + $info): ?> + admin) continue ?> +
    " class="g-dialog-link" title=" $info->name))->for_html_attr() ?>"> " @@ -81,16 +81,16 @@ description ?>

    - info = $info; print $v; ?> + info = $info; print $v; ?>
    - - + + - +

    Download one now!", array("url" => "http://codex.galleryproject.org/Category:Gallery_3:Themes")) ?>

    - +
    diff --git a/modules/gallery/views/admin_themes_buttonset.html.php b/modules/gallery/views/admin_themes_buttonset.html.php index bf474a26..5390d5ff 100644 --- a/modules/gallery/views/admin_themes_buttonset.html.php +++ b/modules/gallery/views/admin_themes_buttonset.html.php @@ -2,45 +2,45 @@ diff --git a/modules/gallery/views/login_current_user.html.php b/modules/gallery/views/login_current_user.html.php index 94525576..a57eb146 100644 --- a/modules/gallery/views/login_current_user.html.php +++ b/modules/gallery/views/login_current_user.html.php @@ -1,7 +1,7 @@
  • - label->for_html() ?> - for_html_attr() ?> + label->for_html() ?> + for_html_attr() ?> html::mark_clean( "{$name}"))) ?>
    • diff --git a/modules/gallery/views/menu.html.php b/modules/gallery/views/menu.html.php index 17a249dd..bdaed6b3 100644 --- a/modules/gallery/views/menu.html.php +++ b/modules/gallery/views/menu.html.php @@ -1,24 +1,24 @@ -is_empty()): // Don't show the menu if it has no choices ?> -is_root): ?> +is_empty()): // Don't show the menu if it has no choices ?> +is_root): ?> - +
  • label->for_html() ?>
    • - - + + diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php index 0b27336e..26036036 100644 --- a/modules/gallery/views/permissions_browse.html.php +++ b/modules/gallery/views/permissions_browse.html.php @@ -25,7 +25,7 @@ }
    - + - +

    diff --git a/modules/rest/views/error_rest.json.php b/modules/rest/views/error_rest.json.php index 8c99ef45..947530f1 100644 --- a/modules/rest/views/error_rest.json.php +++ b/modules/rest/views/error_rest.json.php @@ -1,5 +1,5 @@ -response, 1)); ?> diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php index b609a541..b232cd2c 100644 --- a/modules/rss/views/feed.mrss.php +++ b/modules/rss/views/feed.mrss.php @@ -1,5 +1,5 @@ -' ?> +' ?> en-us - previous_page_uri)): ?> + previous_page_uri)): ?> - - next_page_uri)): ?> + + next_page_uri)): ?> diff --git a/modules/rss/views/rss_block.html.php b/modules/rss/views/rss_block.html.php index 210c72a5..5dd205f1 100644 --- a/modules/rss/views/rss_block.html.php +++ b/modules/rss/views/rss_block.html.php @@ -1,6 +1,6 @@ diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php index a42c31dd..4bfc9aaf 100644 --- a/modules/search/views/search.html.php +++ b/modules/search/views/search.html.php @@ -1,5 +1,5 @@ - +
    " id="g-search-form" class="g-short-form">
    @@ -7,11 +7,11 @@ paginator() ?> - +

    %term", array("term" => $q)) ?>

    - + diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php index 4f9abc1a..6915ba0a 100644 --- a/modules/search/views/search_link.html.php +++ b/modules/search/views/search_link.html.php @@ -1,17 +1,17 @@ " id="g-quick-search-form" class="g-short-form"> - - is_album() ? $item->id : $item->parent_id; ?> - - id; ?> - + + is_album() ? $item->id : $item->parent_id; ?> + + id; ?> +
    • - id): ?> + id): ?> - + - +
      • diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index f7e596b4..6039eb87 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -14,11 +14,11 @@ $("document").ready(function() {

        - +
        • - + - $path): ?> + $path): ?>
        • - +
      diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php index 91354329..b09f8b70 100644 --- a/modules/server_add/views/server_add_tree.html.php +++ b/modules/server_add/views/server_add_tree.html.php @@ -6,16 +6,16 @@
        - +
        • - + - +
        • "> " @@ -23,15 +23,15 @@
          • - - + +
          • - + - +
        • - +
      diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php index 824a86a6..22aa6dc3 100644 --- a/modules/server_add/views/server_add_tree_dialog.html.php +++ b/modules/server_add/views/server_add_tree_dialog.html.php @@ -9,11 +9,11 @@

        - - parents() as $parent): ?> - > title) ?> - - + + parents() as $parent): ?> + > title) ?> + +
      • title) ?>
      diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index e1db387b..887c9a98 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -12,8 +12,8 @@ }); -count()/5 ?> - +count()/5 ?> +

      @@ -25,22 +25,22 @@ - $tag): ?> - name, 0, 1)) ?> + $tag): ?> + name, 0, 1)) ?> - +
        - +
      - $tags_per_column): /* new column */ ?> - + $tags_per_column): /* new column */ ?> + - +
        - +
      • name) ?> (count ?>) @@ -48,9 +48,9 @@ class="g-dialog-link g-delete-link g-button">
        • - - - + + +
      diff --git a/modules/tag/views/tag_cloud.html.php b/modules/tag/views/tag_cloud.html.php index de12bb49..4a6b4b5e 100644 --- a/modules/tag/views/tag_cloud.html.php +++ b/modules/tag/views/tag_cloud.html.php @@ -1,9 +1,9 @@
        - +
      • count ?> photos are tagged with name) ?>
        • - +
      diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index e4336f7f..4ea85c19 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -68,7 +68,7 @@ - $user): ?> + $user): ?> g-user admin ? "g-admin" : "" ?>"> " @@ -95,18 +95,18 @@ data-open-text="for_html_attr() ?>" class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> - id != $user->id && !$user->guest): ?> + id != $user->id && !$user->guest): ?> id") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left"> - + for_html_attr() ?>" class="g-button ui-state-disabled ui-corner-all ui-icon-left"> - + - +
      @@ -128,12 +128,12 @@
        - $group): ?> + $group): ?>
      • "> - group = $group; ?> + group = $group; ?>
        • - +
      diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php index 31b91351..ef3090d1 100644 --- a/modules/user/views/admin_users_group.html.php +++ b/modules/user/views/admin_users_group.html.php @@ -3,38 +3,38 @@ id") ?>" title=" $group->name))->for_html_attr() ?>" class="g-dialog-link">name) ?> - special): ?> + special): ?> id") ?>" title=" $group->name))->for_html_attr() ?>" class="g-dialog-link g-button g-right"> - + for_html_attr() ?>" class="g-button g-right ui-state-disabled ui-icon-left"> - + -users->count_all() > 0): ?> +users->count_all() > 0): ?> - +

      - + diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index fc634b82..ce644211 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -6,11 +6,11 @@

      - + " title="for_html_attr() ?>" class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - +

      @@ -34,6 +34,6 @@ class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">

      - + diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index ea7542f2..63b9f7d3 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -4,13 +4,13 @@ html_attributes() ?> xml:lang="en" lang="en"> - start_combining("script,css") ?> + start_combining("script,css") ?> - <? if ($page_title): ?> + <?php if ($page_title): ?> <?= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?> - <? else: ?> + <?php else: ?> <?= t("Admin dashboard") ?> - <? endif ?> + <?php endif ?> " @@ -22,7 +22,7 @@ script("jquery.form.js") ?> script("jquery-ui.js") ?> script("gallery.common.js") ?> - + @@ -33,15 +33,15 @@ admin_head() ?> - + script("ui.init.js") ?> css("yui/reset-fonts-grids.css") ?> css("themeroller/ui.base.css") ?> css("superfish/css/superfish.css") ?> css("screen.css") ?> - + css("screen-rtl.css") ?> - + - +
      photo_top() ?> @@ -32,13 +32,13 @@ diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php index 086d1359..928ef8ef 100644 --- a/themes/wind/views/sidebar.html.php +++ b/themes/wind/views/sidebar.html.php @@ -1,15 +1,15 @@ sidebar_top() ?>
      - + album_menu() ?> - + photo_menu() ?> - + movie_menu() ?> - + tag_menu() ?> - +
      sidebar_blocks() ?> From 5ee4d2f99b557a89714c2e50abf3e1a93b8412ce Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 19 May 2018 10:09:10 +0200 Subject: [PATCH 2/2] Fix htaccess and installer --- .htaccess | 1 - installer/installer.php | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.htaccess b/.htaccess index d255efaa..5e86145b 100644 --- a/.htaccess +++ b/.htaccess @@ -4,7 +4,6 @@ # mirrored in php.ini # - php_flag short_open_tag On php_flag magic_quotes_gpc Off php_flag magic_quotes_sybase Off php_flag magic_quotes_runtime Off diff --git a/installer/installer.php b/installer/installer.php index eeaa5f68..7b6fb210 100644 --- a/installer/installer.php +++ b/installer/installer.php @@ -237,10 +237,6 @@ class installer { $errors[] = "PHP is missing the JavaScript Object Notation (JSON) extension. Please install it."; } - if (!ini_get("short_open_tag")) { - $errors[] = "Gallery requires short_open_tag to be on. Please enable it in your php.ini."; - } - if (!function_exists("ctype_alpha")) { $errors[] = "Gallery requires the PHP Ctype extension. Please install it."; }