diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-01-01 00:23:29 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-01-01 00:23:29 +0000 |
| commit | cd1d02375400972f2a719852d44c094ab500e8b6 (patch) | |
| tree | 611f0c01f91b8d0aa1d160f64c7cf170d90c57fb | |
| parent | 7c82691e0057188e07601c30069385c3f17cbff1 (diff) | |
Change the preamble for views in two ways:
1) drop unnecessary semicolon
2) start with <?php for extra security in the case that the server itself doesn't
have short_tags enabled (the app won't work, but we need to make sure that we're
still secure)
42 files changed, 42 insertions, 42 deletions
diff --git a/core/tests/File_Structure_Test.php b/core/tests/File_Structure_Test.php index 8b328993..34baa1cb 100644 --- a/core/tests/File_Structure_Test.php +++ b/core/tests/File_Structure_Test.php @@ -66,7 +66,7 @@ class File_Structure_Test extends Unit_Test_Case { // The preamble for views is a single line that prevents direct script access $lines = file($file->getPathname()); $this->assert_equal( - "<? defined(\"SYSPATH\") or die(\"No direct script access.\"); ?>\n", + "<?php defined(\"SYSPATH\") or die(\"No direct script access.\") ?>\n", $lines[0], "in file: {$file->getPathname()}"); } else if (preg_match("|\.php$|", $file->getPathname())) { diff --git a/core/views/admin_block_log_entries.html.php b/core/views/admin_block_log_entries.html.php index c0d9729d..db6313e1 100644 --- a/core/views/admin_block_log_entries.html.php +++ b/core/views/admin_block_log_entries.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <? foreach ($entries as $entry): ?> <li class="<?= log::severity_class($entry->severity) ?>"> diff --git a/core/views/admin_block_news.html.php b/core/views/admin_block_news.html.php index e75a40b4..cb276ae5 100644 --- a/core/views/admin_block_news.html.php +++ b/core/views/admin_block_news.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <? foreach ($feed as $entry): ?> <li> diff --git a/core/views/admin_block_photo_stream.html.php b/core/views/admin_block_photo_stream.html.php index 6f961b29..a837151b 100644 --- a/core/views/admin_block_photo_stream.html.php +++ b/core/views/admin_block_photo_stream.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <p> Recent photos added to your Gallery </p> diff --git a/core/views/admin_block_platform.html.php b/core/views/admin_block_platform.html.php index f9ac6db2..79bf85ed 100644 --- a/core/views/admin_block_platform.html.php +++ b/core/views/admin_block_platform.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <li> <? printf(_("Operating System: %s"), PHP_OS) ?> diff --git a/core/views/admin_block_stats.html.php b/core/views/admin_block_stats.html.php index 2b38c060..b83add10 100644 --- a/core/views/admin_block_stats.html.php +++ b/core/views/admin_block_stats.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <li> <? printf(_("Version: %s"), "3.0") ?> diff --git a/core/views/admin_block_welcome.html.php b/core/views/admin_block_welcome.html.php index c75ec097..a221c9bd 100644 --- a/core/views/admin_block_welcome.html.php +++ b/core/views/admin_block_welcome.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <p> <?= _("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?> </p> diff --git a/core/views/admin_graphics.html.php b/core/views/admin_graphics.html.php index 9d1f49a8..7fb05040 100644 --- a/core/views/admin_graphics.html.php +++ b/core/views/admin_graphics.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gGraphics"> <h1> <?= _("Graphics Settings") ?> </h1> <p> diff --git a/core/views/admin_maintenance.html.php b/core/views/admin_maintenance.html.php index 263fea10..1f9809ac 100644 --- a/core/views/admin_maintenance.html.php +++ b/core/views/admin_maintenance.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gMaintenance"> <h1> <?= _("Maintenance Tasks") ?> </h1> <p> diff --git a/core/views/admin_maintenance_task.html.php b/core/views/admin_maintenance_task.html.php index c31de876..56fba537 100644 --- a/core/views/admin_maintenance_task.html.php +++ b/core/views/admin_maintenance_task.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script> <script type="text/javascript"> update = function() { diff --git a/core/views/admin_modules.html.php b/core/views/admin_modules.html.php index 2d52c31d..4aa36a96 100644 --- a/core/views/admin_modules.html.php +++ b/core/views/admin_modules.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gModules"> <h1> <?= _("Gallery Modules") ?> </h1> <p> diff --git a/core/views/form.html.php b/core/views/form.html.php index 5b00adb8..8c0e31e0 100644 --- a/core/views/form.html.php +++ b/core/views/form.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <? print($open); diff --git a/core/views/kohana_profiler.php b/core/views/kohana_profiler.php index fd28f1ae..4e33ff26 100644 --- a/core/views/kohana_profiler.php +++ b/core/views/kohana_profiler.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<? defined("SYSPATH") or die("No direct script access.") ?> <style type="text/css"> #kohana-profiler { font-family: Monaco, 'Courier New'; diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index 09a3744a..e354db76 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <html> <head> <title>Gallery3 Scaffold</title> diff --git a/core/views/welcome_syscheck.html.php b/core/views/welcome_syscheck.html.php index 2908f8bd..51f87db5 100644 --- a/core/views/welcome_syscheck.html.php +++ b/core/views/welcome_syscheck.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <? foreach ($errors as $error): ?> <div class="block"> <p class="error"> diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index 76414300..6829d74b 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <? foreach ($comments as $comment): ?> <li> diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php index 19886d28..25cd2caa 100644 --- a/modules/comment/views/comment.html.php +++ b/modules/comment/views/comment.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <li id="gComment-<?= $comment->id; ?>"> <p> <a href="#" class="gAuthor"><?= $comment->author ?></a> diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index f4b3d6dc..b436fd98 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <? foreach ($comments as $comment): ?> <li id="gComment-<?= $comment->id; ?>"> diff --git a/modules/gallery_unit_test/views/kohana_unit_test.php b/modules/gallery_unit_test/views/kohana_unit_test.php index a276235b..29990785 100644 --- a/modules/gallery_unit_test/views/kohana_unit_test.php +++ b/modules/gallery_unit_test/views/kohana_unit_test.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<? defined("SYSPATH") or die("No direct script access.") ?> <?php function green_start() { diff --git a/modules/gmaps/views/gmaps_block.html.php b/modules/gmaps/views/gmaps_block.html.php index a49b900d..48b37600 100644 --- a/modules/gmaps/views/gmaps_block.html.php +++ b/modules/gmaps/views/gmaps_block.html.php @@ -1,2 +1,2 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <iframe width="214" height="214" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps/ms?hl=en&geocode=&ie=UTF8&t=h&ei=-ropSbi8KpXIjAOiibmHDQ&view=map&attrid=&s=AARTsJoEm4ODiRa9-yt6-lndtYMlWHPR4w&msa=0&msid=106914852640486882019.000452143d9aa600cc0d6&ll=52.369835,4.886341&spn=0.022429,0.036736&z=13&output=embed"></iframe><br /><small><a href="http://maps.google.com/maps/ms?hl=en&geocode=&ie=UTF8&t=h&ei=-ropSbi8KpXIjAOiibmHDQ&view=map&attrid=&msa=0&msid=106914852640486882019.000452143d9aa600cc0d6&ll=52.369835,4.886341&spn=0.022429,0.036736&z=13&source=embed" style="color:#0000FF;text-align:left">View Larger Map</a></small>
\ No newline at end of file diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 05228ec1..f2c30395 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <table class="gMetadata"> <tbody> <tr> diff --git a/modules/media_rss/views/feed.mrss.php b/modules/media_rss/views/feed.mrss.php index 25505f0d..c4a04604 100644 --- a/modules/media_rss/views/feed.mrss.php +++ b/modules/media_rss/views/feed.mrss.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <? echo "<?xml version=\"1.0\" ?>" ?> <rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/" xmlns:atom="http://www.w3.org/2005/Atom" diff --git a/modules/rearrange/views/rearrange.html.php b/modules/rearrange/views/rearrange.html.php index c9e03023..29a7cb77 100644 --- a/modules/rearrange/views/rearrange.html.php +++ b/modules/rearrange/views/rearrange.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <script type="text/javascript"> $(document).ready( function() { $('#gRearrangeTree').RearrangeTree({ diff --git a/modules/rearrange/views/rearrange_item_list.html.php b/modules/rearrange/views/rearrange_item_list.html.php index 1c5a39c1..31f3e80f 100644 --- a/modules/rearrange/views/rearrange_item_list.html.php +++ b/modules/rearrange/views/rearrange_item_list.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul class="jqueryFileTree" style="display: none"> <? foreach ($children as $item): ?> <? if ($item->type == "album"): ?> diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php index 2aa2d83b..5451638e 100644 --- a/modules/search/views/search_link.html.php +++ b/modules/search/views/search_link.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <form id="gSearchForm"> <ul> <li> diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php index e6f3f35b..9c8f3de5 100644 --- a/modules/tag/views/tag_block.html.php +++ b/modules/tag/views/tag_block.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gTagCloud" src="<?= url::site("tags") ?>"> <?= $cloud ?> </div> diff --git a/modules/tag/views/tag_cloud.html.php b/modules/tag/views/tag_cloud.html.php index 6abaf953..9deedb20 100644 --- a/modules/tag/views/tag_cloud.html.php +++ b/modules/tag/views/tag_cloud.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <? foreach ($tags as $tag): ?> <li class="size<?=(int)(($tag->count / $max_count) * 7) ?>"> diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php index 1d1e37e6..5b5066dc 100644 --- a/modules/user/views/admin_groups.html.php +++ b/modules/user/views/admin_groups.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div class="gBlock"> <h2><?= _("Group Administration") ?></h2> <div class="gBlockContent"> diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 2c6f694a..eef7a1e5 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div class="gBlock"> <h2><?= _("User Administration") ?></h2> <div class="gBlockContent"> diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index 8b024815..951341c9 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul id="gLoginMenu"> <? if ($user->guest): ?> <li><a href="<?= url::site("login") ?>" diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index 8473f620..77ce5d98 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="#gWatermarks"> <h1> <?= _("Watermarks") ?> </h1> <p> diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 541d4e35..1fa70d5b 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> diff --git a/themes/admin_default/views/block.html.php b/themes/admin_default/views/block.html.php index 56565758..42d09196 100644 --- a/themes/admin_default/views/block.html.php +++ b/themes/admin_default/views/block.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="<?= $id ?>" class="gBlock"> <h2><?= $title ?></h2> <div class="gBlockContent"> diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index 7f4e2119..009160d3 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gAlbumHeader"> <?= $theme->album_top() ?> <h1><?= $item->title ?></h1> diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php index 56565758..42d09196 100644 --- a/themes/default/views/block.html.php +++ b/themes/default/views/block.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="<?= $id ?>" class="gBlock"> <h2><?= $title ?></h2> <div class="gBlockContent"> diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php index 830fa003..1944dbb0 100644 --- a/themes/default/views/footer.html.php +++ b/themes/default/views/footer.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <?= $theme->footer() ?> <ul id="gCredits"> <li class="first"> Powered by <a href="http://gallery.menalto.com">Gallery3</a> </li> diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php index e9d980a7..c94527e9 100644 --- a/themes/default/views/header.html.php +++ b/themes/default/views/header.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <?= $theme->site_status() ?> <?= $theme->header_top() ?> <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" /> diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index cab2df92..ed938486 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php index b9dbc2e8..1bc746eb 100644 --- a/themes/default/views/pager.html.php +++ b/themes/default/views/pager.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <? // See http://docs.kohanaphp.com/libraries/pagination ?> <ul id="gPager"> <li><?= sprintf(_("Photos %d - %d of %d"), $current_first_item, $current_last_item, $total_items) ?></li> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 9af66c35..41a1bf9e 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gItemHeader"> <?= $theme->photo_top() ?> <h1><?= $item->title ?></h1> diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php index d030a242..4209bf87 100644 --- a/themes/default/views/sidebar.html.php +++ b/themes/default/views/sidebar.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <ul id="gViewMenu" class="sf-menu"> <li><a href="#" id="gFullsizeLink" title="<?= _("View full size image") ?>"><?= _("View full size image") ?></a></li> <li><a href="#" id="gAlbumLink" title="<?= _("View album") ?>"><?= _("Album view") ?></a></li> diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php index 8c950e74..4e3934b0 100644 --- a/themes/default/views/tag.html.php +++ b/themes/default/views/tag.html.php @@ -1,4 +1,4 @@ -<? defined("SYSPATH") or die("No direct script access."); ?> +<?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gAlbumHeader"> <div id="gAlbumHeaderButtons"> <?= $theme->tag_top() ?> |