Changeset 1155

Timestamp:

12/25/06 14:34:54 (6 years ago)

Author:

benoitg

Message:

• Fix all PHP 5.2 compatibility issues I could find. This needs further testing by someone running it in

production

Location:

trunk/wifidog-auth/wifidog/classes

Files:

• Content.php (modified) (2 diffs)
• ContentTypeFilter.php (modified) (1 diff)
• Utils.php (modified) (1 diff)

trunk/wifidog-auth/wifidog/classes/Content.php

@@ -382 +382 @@
             $candidate_reflector = new ReflectionClass($candidate);
             //echo"classname: $classname, candidate: $candidate<br>";
-            if ($classname_reflector->isSubclassOf($candidate_reflector)) {
+            if ($candidate == $classname || $classname_reflector->isSubclassOf($candidate_reflector)) {
+                //As of PHP5.2, it would apear that isSubclass means a strict sublclass, so the first check was added.
                 //The content meets the criteria
                 //echo "TRUE<br>";
@@ -466 +467 @@
             $content_type_filter = ContentTypeFilter :: getObject(array ());
         }
-
+//pretty_print_r($content_type_filter);
         $i = 0;
         $tab = array ();

trunk/wifidog-auth/wifidog/classes/ContentTypeFilter.php

@@ -104 +104 @@
         {
             foreach ($this->criteria_array as $criteria) {
-                //echo "call_user_func_array called with: ";
+                //echo "call_user_func_array called on $classname with: ";
                 //pretty_print_r($criteria);
 

trunk/wifidog-auth/wifidog/classes/Utils.php

@@ -132 +132 @@
             if($debug)
             print "$command";
-            exec($command.'  2>&1', & $output, & $retval);
+            $retval = null;
+            exec($command.'  2>&1', $output, $retval);
             if($debug){
                 if ($retval != 0)