Changeset 1401 for trunk/wifidog-auth/wifidog/classes/Network.php

Timestamp:

07/03/09 12:21:22 (3 years ago)

Author:

benoitg

Message:

* Refactor signup.php. The code flow is still annoyingly unclear complex, but the file is shorter and hopefully easier to debug (and hopefully fixes #593)

Files:

• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (5 diffs)

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

@@ -243 +243 @@
      *                                    objects to select
      *  $userData['allowEmpty'] boolean Allow not selecting any object
+     *  $userData['onlyNetwoksAllowingSignup'] boolean Only list networks allowing user self-signup
      * @return string HTML markup
 
@@ -257 +258 @@
         !empty($userData['nullCaptionString'])?$nullCaptionString=$userData['nullCaptionString']:$nullCaptionString=null;
         !empty($userData['onChange'])?$onChangeString=$userData['onChange']:$onChangeString="";
+        !empty($userData['onlyNetwoksAllowingSignup'])?$onlyNetwoksAllowingSignup=$userData['onlyNetwoksAllowingSignup']:$onlyNetwoksAllowingSignup=false;
 
         $db = AbstractDb::getObject();
@@ -270 +272 @@
             $i = 0;
             foreach ($network_rows as $network_row) {
-                $tab[$i][0] = $network_row['network_id'];
-                $tab[$i][1] = $network_row['name'];
-                $i ++;
+                
+                if($onlyNetwoksAllowingSignup==false || (self::getObject($network_row['network_id'])->getAuthenticator()->isRegistrationPermitted())==true){
+                    $tab[$i][0] = $network_row['network_id'];
+                    $tab[$i][1] = $network_row['name'];
+                    $i ++;
+                }
             }
             $html .= _("Network:")." \n";
@@ -371 +376 @@
         $network_id_str = $db->escapeString($p_network_id);
         if ($network_id_str == "")
-            $network_id_str = $db->escapeString(self::getDefaultNetwork()->getId());
+        $network_id_str = $db->escapeString(self::getDefaultNetwork()->getId());
 
         $sql = "SELECT *, EXTRACT(EPOCH FROM validation_grace_time) as validation_grace_time_seconds FROM networks WHERE network_id='$network_id_str'";
@@ -1423 +1428 @@
     }
 
-      /** 
-      * Are nodes allowed to redirect users to the original requested web page instead of 
-      * the portal? 
-      * 
-      * @return bool True or false 
-      * 
-      * @access public 
-      */ 
-     public function getPortalOriginalUrlAllowed() 
-     { 
-         return (($this->_row['allow_original_url_redirect'] == 't') ? true : false); 
-     } 
-  
-     /** 
-      * Set if nodes are allowed to redirect users to the original requested web page 
-      * instead of the portal? 
-      * 
-      * @param bool $value The new value, true or false 
-      * 
-      * @return bool True on success, false on failure 
-      * 
-      * @access public 
-      */ 
-     public function setPortalOriginalUrlAllowed($value) 
-     { 
-         // Init values 
-         $retval = true; 
-  
-         if ($value != $this->getPortalOriginalUrlAllowed()) { 
-             $db = AbstractDb::getObject(); 
-             $value ? $value = 'TRUE' : $value = 'FALSE'; 
-             $retval = $db->execSqlUpdate("UPDATE networks SET allow_original_url_redirect = {$value} WHERE network_id = '{$this->getId()}'", false); 
-             $this->refresh(); 
-         } 
-  
-         return $retval; 
-     } 
+    /**
+     * Are nodes allowed to redirect users to the original requested web page instead of
+     * the portal?
+     *
+     * @return bool True or false
+     *
+     * @access public
+     */
+    public function getPortalOriginalUrlAllowed()
+    {
+        return (($this->_row['allow_original_url_redirect'] == 't') ? true : false);
+    }
+
+    /**
+     * Set if nodes are allowed to redirect users to the original requested web page
+     * instead of the portal?
+     *
+     * @param bool $value The new value, true or false
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setPortalOriginalUrlAllowed($value)
+    {
+        // Init values
+        $retval = true;
+
+        if ($value != $this->getPortalOriginalUrlAllowed()) {
+            $db = AbstractDb::getObject();
+            $value ? $value = 'TRUE' : $value = 'FALSE';
+            $retval = $db->execSqlUpdate("UPDATE networks SET allow_original_url_redirect = {$value} WHERE network_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+
+        return $retval;
+    }