From 01666c5579b3de40981d9a06a627166e3bddedf6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 11 Jan 2009 02:27:00 +0000 Subject: Fix all file structure issues (tabs, bad preambles, etc). Note: installer/install.php is now on the "direct access" list. --- core/tests/File_Structure_Test.php | 5 +- core/views/admin_themes_preview.html.php | 1 + installer/install.php | 3 +- installer/views/installer.html.php | 14 ++--- installer/views/installer.txt.php | 7 ++- modules/comment/views/admin_comments.html.php | 85 +++++++++++++-------------- 6 files changed, 58 insertions(+), 57 deletions(-) diff --git a/core/tests/File_Structure_Test.php b/core/tests/File_Structure_Test.php index 0779dea7..c1160b57 100644 --- a/core/tests/File_Structure_Test.php +++ b/core/tests/File_Structure_Test.php @@ -71,8 +71,9 @@ class File_Structure_Test extends Unit_Test_Case { "in file: {$file->getPathname()}"); } else if (preg_match("|\.php$|", $file->getPathname())) { $actual = $this->_get_preamble($file->getPathname()); - if (strtr($file->getPathName(), DIRECTORY_SEPARATOR, '/') == DOCROOT . "index.php") { - // index.php allows direct access, so modify our expectations for the first line + if (strtr($file->getPathName(), DIRECTORY_SEPARATOR, '/') == DOCROOT . "index.php" || + strtr($file->getPathName(), DIRECTORY_SEPARATOR, '/') == DOCROOT . "installer/install.php") { + // index.php and installer.php allow direct access, so modify our expectations for them $index_expected = $expected; $index_expected[0] = "assert_equal($index_expected, $actual, "in file: {$file->getPathname()}"); diff --git a/core/views/admin_themes_preview.html.php b/core/views/admin_themes_preview.html.php index c31d4118..b29c2a48 100644 --- a/core/views/admin_themes_preview.html.php +++ b/core/views/admin_themes_preview.html.php @@ -1,3 +1,4 @@ +

$info->name)) ?>

diff --git a/installer/install.php b/installer/install.php index eaf73b6f..a644b1c9 100644 --- a/installer/install.php +++ b/installer/install.php @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ - /** * Batch Install program this is to only be run from the command line. The web interface uses * a different approach to invoking the installer @@ -36,7 +35,7 @@ if (PHP_SAPI != 'cli') { $redirect = str_replace("install.php", "index.php", $_SERVER["REQUEST_URI"]); - + header("Location: $redirect"); return; } diff --git a/installer/views/installer.html.php b/installer/views/installer.html.php index 34bcb56c..ed372600 100644 --- a/installer/views/installer.html.php +++ b/installer/views/installer.html.php @@ -1,15 +1,15 @@ - + - + - + Gallery3 Requirements Verification - +