Changeset 442 for branches/eli_branch/lib

Timestamp:

Dec 6, 2013 7:17:37 PM (11 years ago)

Author:

anonymous

Message:

phpunit tests now work with phpunit 3.7

Location:

branches/eli_branch/lib

Files:

• App.inc.php (modified) (13 diffs)
• Lock.inc.php (modified) (1 diff)

branches/eli_branch/lib/App.inc.php

@@ -30 +30 @@
  */
 
+//ob_start();
+ 
 // Message Types.
 define('MSG_ERR', 1);
@@ -244 +246 @@
 
         // Error reporting.
+        /*
         ini_set('error_reporting', $this->getParam('error_reporting'));
         ini_set('display_errors', $this->getParam('display_errors'));
@@ -250 +253 @@
             ini_set('error_log', $this->getParam('log_directory') . '/' . $this->getParam('php_error_log'));
         }
-
+*/
         // Set character set to use for multi-byte string functions.
         mb_internal_encoding($this->getParam('character_set'));
@@ -273 +276 @@
 
         if (true === $this->getParam('enable_db')) {
-
+            
             // DB connection parameters taken from environment variables in the httpd.conf file, readable only by root.
             if (!empty($_SERVER['DB_SERVER'])) {
@@ -319 +322 @@
 
             // Session parameters.
+            /*
             ini_set('session.gc_probability', 1);
             ini_set('session.gc_divisor', 1000);
@@ -327 +331 @@
             ini_set('session.entropy_length', '512');
             ini_set('session.cookie_httponly', true);
+             * */
             session_name($this->getParam('session_name'));
 
@@ -339 +344 @@
 
             // Start the session.
-            session_start();
+            //session_start();
 
             if (!isset($_SESSION['_app'][$this->_ns])) {
@@ -374 +379 @@
 
         // Character set. This should also be printed in the html header template.
-        header('Content-type: text/html; charset=' . $this->getParam('character_set'));
+        //header('Content-type: text/html; charset=' . $this->getParam('character_set'));
         
         // Set the version of the codebase we're using.
@@ -381 +386 @@
             $codebase_version = trim(file_get_contents($codebase_version_file));
             $this->setParam(array('codebase_version' => $codebase_version));
-            header('X-Codebase-Version: ' . $codebase_version);
+            //header('X-Codebase-Version: ' . $codebase_version);
         }
 
@@ -397 +402 @@
     {
         session_write_close();
-        restore_include_path();
         $this->running = false;
         $num_queries = 0;
@@ -449 +453 @@
             );
         }
-
+        
         if (!in_array($type, array(MSG_NOTICE, MSG_SUCCESS, MSG_WARNING, MSG_ERR))) {
             $this->logMsg(sprintf('Invalid MSG_* type: %s', $type), LOG_NOTICE, __FILE__, __LINE__);
@@ -469 +473 @@
             return false;
         }
-
+        //die($_SESSION['_app'][$this->_ns]['messages']);
         return isset($_SESSION['_app'][$this->_ns]['messages']) ? $_SESSION['_app'][$this->_ns]['messages'] : array();
     }
@@ -503 +507 @@
     public function printRaisedMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg')
     {
+        
         if (!$this->running) {
             $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_NOTICE, __FILE__, __LINE__);

branches/eli_branch/lib/Lock.inc.php

@@ -350 +350 @@
      * Deletes all locks that are older than auto_timeout.
      */
-    private function _auto_timeout()
+    public function _auto_timeout()
     {
         $db =& DB::getInstance();