Changeset 53 for trunk/lib/App.inc.php

Timestamp:

Jan 26, 2006 8:19:32 PM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/App.inc.php (modified) (22 diffs)

trunk/lib/App.inc.php

@@ -162 +162 @@
     function setParam($param=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -181 +181 @@
     function &getParam($param=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -356 +356 @@
     function raiseMsg($message, $type=MSG_NOTICE, $file=null, $line=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -391 +391 @@
     function getRaisedMessages()
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -415 +415 @@
     function clearRaisedMessages()
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -435 +435 @@
     function printRaisedMessages()
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -493 +493 @@
         static $previous_events = array();
 
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -537 +537 @@
             'type'      => $this->logPriorityToString($priority),
             'file:line' => "$file : $line",
+            'url'       => (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : ''),
             'message'   => $message
         );
@@ -611 +612 @@
     function carryQuery($query_key)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -643 +644 @@
     function url($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -738 +739 @@
     function oHREF($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -762 +763 @@
     function printHiddenSession($carry_args=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -824 +825 @@
     function dieURL($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -863 +864 @@
     function dieBoomerangURL($id=null, $carry_args=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -908 +909 @@
     function setBoomerangURL($url=null, $id=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -949 +950 @@
     function getBoomerangURL($id=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -977 +978 @@
     function deleteBoomerangURL($id=null)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -1002 +1003 @@
     function validBoomerangURL($id=null, $use_nonspecificboomerang=false)
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -1030 +1031 @@
 
         if ('' == $url) {
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, empty!', $id), LOG_NOTICE, __FILE__, __LINE__);
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, empty!', $id), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
         if ($url == absoluteMe()) {
             // The URL we are directing to is the current page.
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, same as absoluteMe: %s', $id, $url), LOG_NOTICE, __FILE__, __LINE__);
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, same as absoluteMe: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
         if ($boomerang_time >= (time() - 2)) {
             // Last boomerang direction was more than 2 seconds ago.
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s', $id, time() - $boomerang_time), LOG_NOTICE, __FILE__, __LINE__);
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s', $id, time() - $boomerang_time), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -1054 +1055 @@
     function sslOn()
     {
-        if (!isset($this) || !is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -1065 +1066 @@
         }
 
-        if ('on' != getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
+        if ('' == getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
             $this->raiseMsg(sprintf(_("Secure SSL connection made to %s"), $this->getParam('ssl_domain')), MSG_NOTICE, __FILE__, __LINE__);
             // Always append session because some browsers do not send cookie when crossing to SSL URL.
@@ -1079 +1080 @@
     function sslOff()
     {
-        if ('on' == getenv('HTTPS')) {
+        if ('' != getenv('HTTPS')) {
             $this->dieURL('http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI'), null, true);
         }