Changeset 1419

Timestamp:

09/18/09 17:51:29 (3 years ago)

Author:

gbastien

Message:

* Fixed #502 (for some cases)
* Some realignment of tabs for readability

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/auth/index.php (modified) (2 diffs)
• wifidog/classes/Authenticator.php (modified) (2 diffs)
• wifidog/classes/Authenticators/AuthenticatorLocalUser.php (modified) (1 diff)
• wifidog/classes/MainUI.php (modified) (4 diffs)
• wifidog/classes/Node.php (modified) (1 diff)
• wifidog/classes/Profile.php (modified) (2 diffs)
• wifidog/classes/ProfileTemplateField.php (modified) (3 diffs)
• wifidog/classes/StakeholderType.php (modified) (1 diff)
• wifidog/include/path_defines_url_content.php (modified) (2 diffs)
• wifidog/login/index.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
+
+2009-09-18 Geneviève Bastien <gbastien@versatic.net>
+  * Fixed #502 (Note: this fix works only if all gateways have config value SSLAvailable Yes, or else the server determines that even though the connection originated from HTTP by those gateways, it should use SSL and in this case, the port is not right.  Should need a way to specify port in Wifidog Virtual Hosts or get the apache port)
+  * Some realignment of tabs while documenting
+
+2009-08-20 Genevieve Bastien <gbastien@versatic.net>
+  * Updated dependencies  #599
+  * Now gets the temp dir of the OS instead of hardcoding the /tmp dir in the install script #588
 
 2009-07-26 Robin Jones

trunk/wifidog-auth/wifidog/auth/index.php

@@ -97 +97 @@
                     // Start accounting
                     if ($authenticator->acctStart($info['conn_id'], $auth_message))
-                    $auth_response = ACCOUNT_STATUS_ALLOWED;
+                        $auth_response = ACCOUNT_STATUS_ALLOWED;
                     else
-                    $auth_response = ACCOUNT_STATUS_DENIED;
-
-                }
-            }
-            else
-            if ($info['token_status'] == TOKEN_INUSE &&
-            $info['gw_id'] && isset($_REQUEST['gw_id']) && $info['gw_id'] == $_REQUEST['gw_id'] &&
-            $info['user_mac'] && isset($_REQUEST['mac']) && $info['user_mac'] == $_REQUEST['mac'] &&
-            $info['user_ip'] && isset($_REQUEST['ip']) && $info['user_ip'] == $_REQUEST['ip'])
+                        $auth_response = ACCOUNT_STATUS_DENIED;
+
+                }
+            }
+            else if ($info['token_status'] == TOKEN_INUSE &&
+                $info['gw_id'] && isset($_REQUEST['gw_id']) && $info['gw_id'] == $_REQUEST['gw_id'] &&
+                $info['user_mac'] && isset($_REQUEST['mac']) && $info['user_mac'] == $_REQUEST['mac'] &&
+                $info['user_ip'] && isset($_REQUEST['ip']) && $info['user_ip'] == $_REQUEST['ip'])
             {
                 // This solves the bug where the user clicks twice before getting the portal page
@@ -117 +116 @@
             }
         }
-        else
-        if ($_REQUEST['stage'] == STAGE_LOGOUT || $_REQUEST['stage'] == STAGE_COUNTERS)
+        else if ($_REQUEST['stage'] == STAGE_LOGOUT || $_REQUEST['stage'] == STAGE_COUNTERS)
         {
             if (!empty ($_REQUEST['incoming']) || !empty ($_REQUEST['outgoing']))

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

@@ -95 +95 @@
      * Attempts to login a user against the authentication source
      *
-     * If successfull, returns a User object.
+     * If successfull, returns a User object and must call User::setCurrentUser($user) at the end
      */
     public function login()
@@ -150 +150 @@
                         $default_network_param = $network->getId();
         }
-        if (Server::getServer()->getUseGlobalUserAccounts())
-                $smarty->assign('selectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
-        else
-                $smarty->assign('selectNetworkUI', Network::getSelectUI('auth_source', $networkUserData));
+        if (Server::getServer()->getUseGlobalUserAccounts())
+            $smarty->assign('selectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
+        else
+            $smarty->assign('selectNetworkUI', Network::getSelectUI('auth_source', $networkUserData));
 
         // Set user details

trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php

@@ -138 +138 @@
                 /*
                  * This is only used to discriminate if the problem was a
-                 * non-existent user of a wrong password.
+                 * non-existent user or a wrong password.
                  */
                 $user_info = null;

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

@@ -277 +277 @@
     }
 
-    /** Main processing function do generate the final content.
+    /** Main processing function to generate the final content.
      * It will successively call prepareGetUserUI() on all content objects,
      * and then getUserUI() on all objects.  Note that the point of calling
      * prepareGetUserUI is to allow that function to call methods of MainUI
-     * (such ans changing headers, etc.).  However, please note that you should not
+     * (such as changing headers, etc.).  However, please note that you should not
      * call MainUI::addContent() from prepareGetUserUI, as prepareGetUserUI() wouldn't
      * in turn get called on objects added this way.
@@ -349 +349 @@
             }
         }
-
     }
 
@@ -535 +534 @@
 
     /**
-     * Display the main page
+     * Display the main page.  This is where are called the functions to build the menu, and tool sections
      *
      * @return void
@@ -550 +549 @@
         $networkThemePack = Network :: getCurrentNetwork()->getThemePack();
         if ($networkThemePack) {        
-                $ThemeConfig = $networkThemePack->getThemeConfigPath();
-        }
-        // Checks to see if the theme file exists and if so, loads it.  
-        if (!empty($ThemeConfig) && file_exists($ThemeConfig)) {
-                require_once ($ThemeConfig);
-        }
-        // Checks to see if the theme file exists and if so, checks whether it should load the Base theme.
-        if (!defined('INHERIT_BASE_CSS') || defined('INHERIT_BASE_CSS' == true)) {
-        $this->appendStylesheetURL(BASE_THEME_URL . STYLESHEET_NAME);
-        $this->appendStylesheetURL(BASE_THEME_URL . PRINT_STYLESHEET_NAME, 'print');
-        }
-        //If there is a theme pack, load the CSS file
+            $ThemeConfig = $networkThemePack->getThemeConfigPath();
+              }
+        // Checks to see if the theme file exists and if so, loads it.  
+        if (!empty($ThemeConfig) && file_exists($ThemeConfig)) {
+            require_once ($ThemeConfig);
+        }
+        // Checks to see if the theme file exists and if so, checks whether it should load the Base theme.
+        if (!defined('INHERIT_BASE_CSS') || defined('INHERIT_BASE_CSS' == true)) {
+            $this->appendStylesheetURL(BASE_THEME_URL . STYLESHEET_NAME);
+            $this->appendStylesheetURL(BASE_THEME_URL . PRINT_STYLESHEET_NAME, 'print');
+        }
+        //If there is a theme pack, load the CSS file
         if ($networkThemePack) {
-            $this->appendStylesheetURL($networkThemePack->getStylesheetUrl());
-        }
-        // Checks to see if the theme file exists and if so, checks whether it should always show the page header.
-        if (defined('ALWAYS_SHOW_HEADER') && ALWAYS_SHOW_HEADER == true) {
-        $this->smarty->assign('alwaysShowHeader', true);
-        } else {
-                $this->smarty->assign('alwaysShowHeader', false);
-        }
-        // Checks to see if the theme file exists and if so, checks whether it should always show the page footer.
-        if (defined('ALWAYS_SHOW_FOOTER') && (ALWAYS_SHOW_FOOTER == true)) {
-                $this->smarty->assign('alwaysShowFooter', true);
-        } else {
-                $this->smarty->assign('alwaysShowFooter', false);
-        }
-        // Checks to see if the theme file exists and if so, checks where the site menu should be positioned.
-        if (defined('MENU_POSITION') && MENU_POSITION == "all") {
-        $this->smarty->assign('siteMenuPlaceAll', true);
-        } else {
-                if (defined('MENU_POSITION') && MENU_POSITION == "left") {
-                        $this->smarty->assign('siteMenuPlaceLeft', true);
-                } else {
-                        $this->smarty->assign('siteMenuPlaceMain', true);
-                        }
-                }
+            $this->appendStylesheetURL($networkThemePack->getStylesheetUrl());
+        }
+        // Checks to see if the theme file exists and if so, checks whether it should always show the page header.
+        if (defined('ALWAYS_SHOW_HEADER') && ALWAYS_SHOW_HEADER == true) {
+            $this->smarty->assign('alwaysShowHeader', true);
+        } else {
+            $this->smarty->assign('alwaysShowHeader', false);
+        }
+        // Checks to see if the theme file exists and if so, checks whether it should always show the page footer.
+        if (defined('ALWAYS_SHOW_FOOTER') && (ALWAYS_SHOW_FOOTER == true)) {
+            $this->smarty->assign('alwaysShowFooter', true);
+        } else {
+            $this->smarty->assign('alwaysShowFooter', false);
+        }
+        // Checks to see if the theme file exists and if so, checks where the site menu should be positioned.
+        if (defined('MENU_POSITION') && MENU_POSITION == "all") {
+            $this->smarty->assign('siteMenuPlaceAll', true);
+        } else {
+            if (defined('MENU_POSITION') && MENU_POSITION == "left") {
+                $this->smarty->assign('siteMenuPlaceLeft', true);
+            } else {
+                $this->smarty->assign('siteMenuPlaceMain', true);
+            }
+        }
 
 

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

@@ -759 +759 @@
 
             if (!empty ($lat) && !empty ($long))
-            $this->mDb->execSqlUpdate("UPDATE nodes SET latitude = $lat, longitude = $long WHERE node_id = '{$this->getId()}'");
+                $this->mDb->execSqlUpdate("UPDATE nodes SET latitude = $lat, longitude = $long WHERE node_id = '{$this->getId()}'");
             else
-            $this->mDb->execSqlUpdate("UPDATE nodes SET latitude = NULL, longitude = NULL WHERE node_id = '{$this->getId()}'");
+                $this->mDb->execSqlUpdate("UPDATE nodes SET latitude = NULL, longitude = NULL WHERE node_id = '{$this->getId()}'");
             $this->refresh();
         }

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

@@ -152 +152 @@
     {
         if($this->_row['is_visible'] == "f")
-        return false;
+            return false;
         else
-        return true;
+            return true;
     }
 
@@ -173 +173 @@
         if ($value != $this->isVisible()) {
             if($value == true)
-            $_retVal = $db->execSqlUpdate("UPDATE profiles SET is_visible = true WHERE profile_id = '{$this->getId()}'", false);
+                $_retVal = $db->execSqlUpdate("UPDATE profiles SET is_visible = true WHERE profile_id = '{$this->getId()}'", false);
             else
-            $_retVal = $db->execSqlUpdate("UPDATE profiles SET is_visible = false WHERE profile_id = '{$this->getId()}'", false);
+                $_retVal = $db->execSqlUpdate("UPDATE profiles SET is_visible = false WHERE profile_id = '{$this->getId()}'", false);
             $this->refresh();
         }

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

@@ -71 +71 @@
         $db->execSqlUniqueRes($sql, $row, false);
 
-                $this->_id = $row['profile_template_field_id'];
+        $this->_id = $row['profile_template_field_id'];
         $this->profile_template_field_row = $row;
     }
@@ -179 +179 @@
             $content_type_filter_ui_result = FormSelectGenerator :: getResult($name, null);
 
-                        if(empty($content_type_filter_ui_result))
-                        {
-                                throw new exception("Unable to retrieve the content type filter to associate with the new field");
-                        }
+            if(empty($content_type_filter_ui_result))
+            {
+                throw new exception("Unable to retrieve the content type filter to associate with the new field");
+            }
                         
             $content_type_filter = ContentTypeFilter :: getObject($content_type_filter_ui_result);
@@ -581 +581 @@
      */
     public function delete(& $errmsg) {
-        require_once('classes/User.php');
-        
-                $db = AbstractDb::getObject();
-
-            // Init values
-                $_retVal = false;
-
-                if (!User::getCurrentUser()->DEPRECATEDisSuperAdmin()) {
-                        $errmsg = _('Access denied (must have super admin access)');
-                } else {
-                        $_id = $db->escapeString($this->getId());
-
-                        if (!$db->execSqlUpdate("DELETE FROM profile_template_fields WHERE profile_template_field_id = '{$_id}'", false)) {
-                                $errmsg = _('Could not delete ProfileTemplateField!');
-                        } else {
-                                $_retVal = true;
-                        }
-                }
-
-                return $_retVal;
+        require_once('classes/User.php');
+        
+        $db = AbstractDb::getObject();
+
+        // Init values
+        $_retVal = false;
+
+        if (!User::getCurrentUser()->DEPRECATEDisSuperAdmin()) {
+            $errmsg = _('Access denied (must have super admin access)');
+        } else {
+            $_id = $db->escapeString($this->getId());
+
+            if (!$db->execSqlUpdate("DELETE FROM profile_template_fields WHERE profile_template_field_id = '{$_id}'", false)) {
+                $errmsg = _('Could not delete ProfileTemplateField!');
+            } else {
+                $_retVal = true;
+            }
+        }
+
+        return $_retVal;
     }
     /** Reloads the object from the database.  Should normally be called after a set operation */

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

@@ -81 +81 @@
     
     private function __construct($id) {
-    $this->_id=$id;
+        $this->_id=$id;
     }
     /**

trunk/wifidog-auth/wifidog/include/path_defines_url_content.php

@@ -89 +89 @@
 
 //echo "<pre>";print_r($_SERVER);echo "</pre>";
-
 $current_url = 'http';
 if ($_SERVER['SERVER_PORT'] == '443') {
@@ -108 +107 @@
      * Define base web address to use (this time using SLL)
      */
-    define('BASE_SSL_PATH', 'https://'.$_SERVER['SERVER_NAME'].SYSTEM_PATH);
+  //  define('BASE_SSL_PATH', 'https://'.$_SERVER['SERVER_NAME'].SYSTEM_PATH);
+    if ($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) { 
+        define('BASE_SSL_PATH', 'https://'.$_SERVER['SERVER_NAME'] . ':'.$_SERVER['SERVER_PORT']. SYSTEM_PATH); 
+    } else { 
+        define('BASE_SSL_PATH', 'https://'.$_SERVER['SERVER_NAME'] . SYSTEM_PATH); 
+    } 
 }
 else {

trunk/wifidog-auth/wifidog/login/index.php

@@ -279 +279 @@
 }
 else {
-    $name = $network->getName();}
-    $welcome_msg = sprintf("<span>%s</span> <em>%s</em>",_("Welcome to"), $name);
-    $ui->addContent('page_header', "<div class='welcome_msg'><div class='welcome_msg_inner'>$welcome_msg</div></div>");
-    $ui->addContent('main_area_top', $html);
-
-    /*
-     * Main content (login form)
-     */
-
-    // Get all network content and node "login" content
-    $content_rows = null;
-    $network_id = $network->getId();
-    $sql_network = "(SELECT content_id, display_area, display_order, subscribe_timestamp FROM network_has_content WHERE network_id='$network_id'  AND display_page='login') ";
-    $sql_node = null;
-    if ($node) {
-        // Get all node content
-        $node_id = $db->escapeString($node->getId());
-        $sql_node = "UNION (SELECT content_id, display_area, display_order, subscribe_timestamp FROM node_has_content WHERE node_id='$node_id'  AND display_page='login')";
-    }
-    $sql = "SELECT * FROM ($sql_network $sql_node) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
-
-    $db->execSql($sql, $content_rows, false);
-    if ($content_rows) {
-        foreach ($content_rows as $content_row) {
-            $content = Content :: getObject($content_row['content_id']);
-            if ($content->isDisplayableAt($node)) {
-                $ui->addContent($content_row['display_area'], $content, $content_row['display_order']);
-            }
+    $name = $network->getName();
+}
+$welcome_msg = sprintf("<span>%s</span> <em>%s</em>",_("Welcome to"), $name);
+$ui->addContent('page_header', "<div class='welcome_msg'><div class='welcome_msg_inner'>$welcome_msg</div></div>");
+$ui->addContent('main_area_top', $html);
+
+/*
+ * Main content (login form)
+ */
+
+// Get all network content and node "login" content
+$content_rows = null;
+$network_id = $network->getId();
+$sql_network = "(SELECT content_id, display_area, display_order, subscribe_timestamp FROM network_has_content WHERE network_id='$network_id'  AND display_page='login') ";
+$sql_node = null;
+if ($node) {
+    // Get all node content
+    $node_id = $db->escapeString($node->getId());
+    $sql_node = "UNION (SELECT content_id, display_area, display_order, subscribe_timestamp FROM node_has_content WHERE node_id='$node_id'  AND display_page='login')";
+}
+$sql = "SELECT * FROM ($sql_network $sql_node) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
+
+$db->execSql($sql, $content_rows, false);
+if ($content_rows) {
+    foreach ($content_rows as $content_row) {
+        $content = Content :: getObject($content_row['content_id']);
+        if ($content->isDisplayableAt($node)) {
+            $ui->addContent($content_row['display_area'], $content, $content_row['display_order']);
         }
     }
-
-    /*
-     * Render output
-     */
-    $ui->display();
-
-    /*
-     * Local variables:
-     * tab-width: 4
-     * c-basic-offset: 4
-     * c-hanging-comment-ender-p: nil
-     * End:
-     */
-
-    ?>
+}
+
+/*
+ * Render output
+ */
+$ui->display();
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>