From cd1d02375400972f2a719852d44c094ab500e8b6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 1 Jan 2009 00:23:29 +0000
Subject: 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)

---
 core/tests/File_Structure_Test.php           | 2 +-
 core/views/admin_block_log_entries.html.php  | 2 +-
 core/views/admin_block_news.html.php         | 2 +-
 core/views/admin_block_photo_stream.html.php | 2 +-
 core/views/admin_block_platform.html.php     | 2 +-
 core/views/admin_block_stats.html.php        | 2 +-
 core/views/admin_block_welcome.html.php      | 2 +-
 core/views/admin_graphics.html.php           | 2 +-
 core/views/admin_maintenance.html.php        | 2 +-
 core/views/admin_maintenance_task.html.php   | 2 +-
 core/views/admin_modules.html.php            | 2 +-
 core/views/form.html.php                     | 2 +-
 core/views/kohana_profiler.php               | 2 +-
 core/views/welcome.html.php                  | 2 +-
 core/views/welcome_syscheck.html.php         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'core')

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">
-- 
cgit v1.2.3