Changeset 8

Timestamp:

Aug 30, 2005 9:32:53 PM (19 years ago)

Author:

scdev

Message:

checking isset($this) on self-instanciating function calls in App and DB.

Location:

trunk/lib

Files:

• App.inc.php (modified) (14 diffs)
• DB.inc.php (modified) (8 diffs)
• DBSessionHandler.inc.php (modified) (1 diff)
• Nav.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -162 +162 @@
     function setParam($param=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -181 +181 @@
     function &getParam($param=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -353 +353 @@
     function raiseMsg($message, $type=MSG_NOTICE, $file=null, $line=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -382 +382 @@
     function printRaisedMessages()
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -439 +439 @@
     function logMsg($message, $priority=LOG_INFO, $file=null, $line=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -561 +561 @@
     function oHREF($url='', $carry_args=null, $always_include_sid=false)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -683 +683 @@
     function printHiddenSession($carry_args=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -768 +768 @@
     function dieURL($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -806 +806 @@
     function dieBoomerangURL($id=null, $carry_args=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -849 +849 @@
     function setBoomerangURL($url=null, $id=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -890 +890 @@
     function getBoomerangURL($id=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -918 +918 @@
     function deleteBoomerangURL($id=null)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -941 +941 @@
     function validBoomerangURL($id=null, $use_nonspecificboomerang=false)
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }
@@ -990 +990 @@
     function sslOn()
     {
-        if (!is_a($this, 'App')) {
+        if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
         }

trunk/lib/DB.inc.php

@@ -85 +85 @@
     function setParam($params)
     {
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -108 +108 @@
     function getParam($param)
     {
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -129 +129 @@
     function connect()
     {
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -175 +175 @@
     function close()
     {
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -196 +196 @@
     function getDBH()
     {
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -231 +231 @@
         static $_query_count = 0;
         
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -277 +277 @@
     function tableExists($table, $use_cached_results=true)
     {   
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -311 +311 @@
     function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {   
-        if (!is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB')) {
             $this =& DB::getInstance();
         }

trunk/lib/DBSessionHandler.inc.php

@@ -62 +62 @@
         }
 
-        if (!is_a($this->db, 'DB') || !$this->db->isConnected()) {
+        if (!isset($this) || !is_a($this->db, 'DB') || !$this->db->isConnected()) {
             trigger_error('Invalid DB object or unable to connect to database.', E_USER_ERROR);
         }

trunk/lib/Nav.inc.php

@@ -109 +109 @@
      * @return bool true on success, false on failure
      */
-    function getFeature($feature, $page_id=null)
+    function getFeature($feature, $page_id=null, $default=null)
     {
         if (!isset($page_id)) {
@@ -126 +126 @@
                 return $this->pages[$page_id]['features'][$feature];
             }
+        } else {
+            return $default;
         }
     }