From 9b6663f87a7e679ffba691cf516191fc840cf978 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 24 Nov 2009 19:20:36 -0800
Subject: Update to Kohana r4684 which is now Kohana 2.4 and has substantial
 changes.

---
 application/Bootstrap.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 application/Bootstrap.php

(limited to 'application/Bootstrap.php')

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
new file mode 100644
index 00000000..b15cbfce
--- /dev/null
+++ b/application/Bootstrap.php
@@ -0,0 +1,59 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Kohana process control file, loaded by the front controller.
+ *
+ * $Id: Bootstrap.php 4679 2009-11-10 01:45:52Z isaiah $
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+// Kohana benchmarks are prefixed to prevent collisions
+define('SYSTEM_BENCHMARK', 'system_benchmark');
+
+// Load benchmarking support
+require SYSPATH.'core/Benchmark'.EXT;
+
+// Start total_execution
+Benchmark::start(SYSTEM_BENCHMARK.'_total_execution');
+
+// Start kohana_loading
+Benchmark::start(SYSTEM_BENCHMARK.'_kohana_loading');
+
+// Load core files
+require SYSPATH.'core/Event'.EXT;
+final class Event extends Event_Core {}
+
+require SYSPATH.'core/Kohana'.EXT;
+final class Kohana extends Kohana_Core {}
+
+require SYSPATH.'core/Kohana_Exception'.EXT;
+class Kohana_Exception extends Kohana_Exception_Core {}
+
+require SYSPATH.'core/Kohana_Config'.EXT;
+require SYSPATH.'libraries/drivers/Config'.EXT;
+require SYSPATH.'libraries/drivers/Config/Array'.EXT;
+final class Kohana_Config extends Kohana_Config_Core {}
+
+// Prepare the environment
+Kohana::setup();
+
+// End kohana_loading
+Benchmark::stop(SYSTEM_BENCHMARK.'_kohana_loading');
+
+// Start system_initialization
+Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
+
+// Prepare the system
+Event::run('system.ready');
+
+// Determine routing
+Event::run('system.routing');
+
+// End system_initialization
+Benchmark::stop(SYSTEM_BENCHMARK.'_system_initialization');
+
+// Make the magic happen!
+Event::run('system.execute');
\ No newline at end of file
-- 
cgit v1.2.3


From 2be72bb1c3c5790e0ce68c2609de141bf9756614 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 6 Dec 2009 20:42:38 -0800
Subject: Overload Kohana_Exception::text() to dump out the complete stack
 trace so that we have useful data in the logs.

---
 application/Bootstrap.php                         |  2 +-
 modules/gallery/libraries/MY_Kohana_Exception.php | 29 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 modules/gallery/libraries/MY_Kohana_Exception.php

(limited to 'application/Bootstrap.php')

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index b15cbfce..f36fac14 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -30,7 +30,7 @@ require SYSPATH.'core/Kohana'.EXT;
 final class Kohana extends Kohana_Core {}
 
 require SYSPATH.'core/Kohana_Exception'.EXT;
-class Kohana_Exception extends Kohana_Exception_Core {}
+require MODPATH.'gallery/libraries/MY_Kohana_Exception'.EXT;
 
 require SYSPATH.'core/Kohana_Config'.EXT;
 require SYSPATH.'libraries/drivers/Config'.EXT;
diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
new file mode 100644
index 00000000..32b4ab93
--- /dev/null
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -0,0 +1,29 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Kohana_Exception extends Kohana_Exception_Core {
+  /**
+   * Dump out the full stack trace as part of the text representation of the exception.
+   */
+  public static function text($e) {
+    return sprintf(
+      "%s [ %s ]: %s\n%s",
+      get_class($e), $e->getCode(), strip_tags($e->getMessage()), $e->getTraceAsString());
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9c5df1d31bd214fab051b71d092c751a1da20ecc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 21 Dec 2009 19:59:44 -0800
Subject: Fix preambles, and fix the File_Structure_Test to be more lenient
 because of preamble variation in K24.

---
 application/Bootstrap.php                        | 22 +++++++++----
 modules/gallery/config/log_file.php              | 20 ++++++++++-
 modules/gallery/tests/File_Structure_Test.php    | 16 ++++++---
 modules/kohana23_compat/config/pagination.php    | 42 +++++++++++++-----------
 modules/kohana23_compat/libraries/Pagination.php | 20 ++++++++++-
 5 files changed, 87 insertions(+), 33 deletions(-)

(limited to 'application/Bootstrap.php')

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index f36fac14..95f7b8d2 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,13 +1,21 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined("SYSPATH") or die("No direct script access.");
 /**
- * Kohana process control file, loaded by the front controller.
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
  *
- * $Id: Bootstrap.php 4679 2009-11-10 01:45:52Z isaiah $
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
  *
- * @package    Core
- * @author     Kohana Team
- * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 // Kohana benchmarks are prefixed to prevent collisions
diff --git a/modules/gallery/config/log_file.php b/modules/gallery/config/log_file.php
index 3d3f8edd..827a5d80 100644
--- a/modules/gallery/config/log_file.php
+++ b/modules/gallery/config/log_file.php
@@ -1,4 +1,22 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 
 /**
  * Message logging directory.
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 36342fda..a046b4dd 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -57,10 +57,12 @@ class File_Structure_Test extends Unit_Test_Case {
   }
 
   private function _check_view_preamble($path, &$errors) {
+    $expected_2 = null;
     // The preamble for views is a single line that prevents direct script access
     if (strpos($path, SYSPATH) === 0) {
       // Kohana preamble
       $expected = "<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>\n";
+      $expected_2 = "<?php defined('SYSPATH') OR die('No direct access allowed.');\n";  // error.php
     } else {
       // Gallery preamble
       // @todo use the same preamble for both!
@@ -71,26 +73,32 @@ class File_Structure_Test extends Unit_Test_Case {
     $actual = fgets($fp);
     fclose($fp);
 
-    if ($expected != $actual) {
+    if ($expected != $actual && $expected_2 != $actual) {
       $errors[] = "$path:1\n  expected:\n\t$expected\n  actual:\n\t$actual";
     }
   }
 
   private function _check_php_preamble($path, &$errors) {
+    $expected_2 = null; $expected_3 = null; $expected_4 = null;
     if (strpos($path, SYSPATH) === 0 ||
         strpos($path, MODPATH . "unit_test") === 0) {
       // Kohana: we only care about the first line
       $fp = fopen($path, "r");
       $actual = array(fgets($fp));
       fclose($fp);
-      $expected = array("<?php defined('SYSPATH') OR die('No direct access allowed.');\n");
+      $expected = array("<?php defined('SYSPATH') OR die('No direct script access.');\n");
+      $expected_2 = array("<?php defined('SYSPATH') OR die('No direct access allowed.');\n");
+      $expected_3 = array("<?php defined('SYSPATH') or die('No direct access allowed.');\n");
+      $expected_4 = array("<?php defined('SYSPATH') or die('No direct script access.');\n");
     } else if (strpos($path, MODPATH . "forge") === 0 ||
                strpos($path, MODPATH . "exif/lib") === 0 ||
                strpos($path, MODPATH . "gallery/lib/HTMLPurifier") === 0 ||
                $path == MODPATH . "user/lib/PasswordHash.php" ||
                $path == DOCROOT . "var/database.php") {
       // 3rd party module security-only preambles, similar to Gallery's
-      $expected = array("<?php defined(\"SYSPATH\") or die(\"No direct script access.\");\n");
+      $expected = array("<?php defined(\"SYSPATH\") or die(\"No direct access allowed.\");\n");
+      $expected_2 = array("<?php defined('SYSPATH') OR die('No direct access allowed.');\n");
+      $expected_3 = array("<?php defined(\"SYSPATH\") or die(\"No direct script access.\");\n");
       $fp = fopen($path, "r");
       $actual = array(fgets($fp));
       fclose($fp);
@@ -131,7 +139,7 @@ class File_Structure_Test extends Unit_Test_Case {
         " */",
       );
     }
-    if ($expected != $actual) {
+    if ($expected != $actual && $expected_2 != $actual && $expected_3 != $actual && $expected_4 != $actual) {
       $errors[] = "$path:1\n  expected\n\t" . join("\n\t", $expected) .
         "\n  actual:\n\t" . join("\n\t", $actual);
     }
diff --git a/modules/kohana23_compat/config/pagination.php b/modules/kohana23_compat/config/pagination.php
index 808fc315..d2fcd2b1 100644
--- a/modules/kohana23_compat/config/pagination.php
+++ b/modules/kohana23_compat/config/pagination.php
@@ -1,25 +1,27 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined("SYSPATH") or die("No direct script access.");
 /**
- * @package  Pagination
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
  *
- * Pagination configuration is defined in groups which allows you to easily switch
- * between different pagination settings for different website sections.
- * Note: all groups inherit and overwrite the default group.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
  *
- * Group Options:
- *  directory      - Views folder in which your pagination style templates reside
- *  style          - Pagination style template (matches view filename)
- *  uri_segment    - URI segment (int or 'label') in which the current page number can be found
- *  query_string   - Alternative to uri_segment: query string key that contains the page number
- *  items_per_page - Number of items to display per page
- *  auto_hide      - Automatically hides pagination for single pages
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-$config['default'] = array
-(
-	'directory'      => 'pagination',
-	'style'          => 'classic',
-	'uri_segment'    => 3,
-	'query_string'   => '',
-	'items_per_page' => 20,
-	'auto_hide'      => FALSE,
+$config["default"] = array(
+  "directory"      => "pagination",
+  "style"          => "classic",
+  "uri_segment"    => 3,
+  "query_string"   => "",
+  "items_per_page" => 20,
+  "auto_hide"      => FALSE
 );
diff --git a/modules/kohana23_compat/libraries/Pagination.php b/modules/kohana23_compat/libraries/Pagination.php
index 8ff8bf94..012bc484 100644
--- a/modules/kohana23_compat/libraries/Pagination.php
+++ b/modules/kohana23_compat/libraries/Pagination.php
@@ -1,4 +1,22 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 /**
  * Pagination library.
  *
-- 
cgit v1.2.3