Changeset 1030

Timestamp:

05/09/06 16:01:17 (7 years ago)

Author:

benoitg

Message:

• Finish content assignation system
• Content ordering is now global (network, nodes and everywhere content cand now be in mixed order).
  • Implement 'everywhere' content
  • Change MainUI::apendContent to MainUI::addContent

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (1 diff)
• wifidog/admin/hotspot_location_map.php (modified) (1 diff)
• wifidog/admin/import_user_database.php (modified) (1 diff)
• wifidog/admin/index.php (modified) (1 diff)
• wifidog/admin/online_users.php (modified) (1 diff)
• wifidog/admin/stats.php (modified) (1 diff)
• wifidog/admin/user_log.php (modified) (1 diff)
• wifidog/change_password.php (modified) (2 diffs)
• wifidog/classes/Content.php (modified) (1 diff)
• wifidog/classes/MainUI.php (modified) (24 diffs)
• wifidog/classes/NodeLists/NodeListHTML.php (modified) (1 diff)
• wifidog/content/PatternLanguage/archives.php (modified) (1 diff)
• wifidog/content/PatternLanguage/hotspots.php (modified) (1 diff)
• wifidog/content/PatternLanguage/index.php (modified) (1 diff)
• wifidog/content/PatternLanguage/narrative.php (modified) (1 diff)
• wifidog/content/PatternLanguage/subscription.php (modified) (1 diff)
• wifidog/content/index.php (modified) (2 diffs)
• wifidog/faq.php (modified) (1 diff)
• wifidog/help.php (modified) (1 diff)
• wifidog/hotspots_map.php (modified) (1 diff)
• wifidog/index.php (modified) (1 diff)
• wifidog/login/index.php (modified) (1 diff)
• wifidog/lost_password.php (modified) (2 diffs)
• wifidog/lost_username.php (modified) (2 diffs)
• wifidog/node_list.php (modified) (1 diff)
• wifidog/portal/index.php (modified) (8 diffs)
• wifidog/resend_validation.php (modified) (2 diffs)
• wifidog/signup.php (modified) (2 diffs)
• wifidog/templates/classes/MainUI_Display.tpl (modified) (5 diffs)
• wifidog/user_profile.php (modified) (1 diff)
• wifidog/validate.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-05-09 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Finish content assignation system
+        * Content ordering is now global (network, nodes and everywhere content cand now be in mixed order).
+        * Implement 'everywhere' content
+        * Change MainUI::apendContent to MainUI::addContent
+
 2006-04-28 François Proulx <francois.proulx@gmail.com>  
         * Fixed error in initial data script

trunk/wifidog-auth/wifidog/admin/generic_object_admin.php

@@ -427 +427 @@
 $ui->setHtmlHeader($_htmlHeader);
 $ui->setToolSection('ADMIN');
-$ui->appendContent('main_area_middle', "<div>" . $html . "</div>");
+$ui->addContent('main_area_middle', "<div>" . $html . "</div>");
 $ui->display();
 

trunk/wifidog-auth/wifidog/admin/hotspot_location_map.php

@@ -71 +71 @@
     $html .= "<div id=\"map_frame\"></div>\n";
     $html .= "<input type='button' value='"._("Use these coordinates")."' onClick='setLocationInOriginalWindow();'>\n";
-    $ui->appendContent('main_area_middle', $html);
+    $ui->addContent('main_area_middle', $html);
 
     if($node->getGisLocation() !== null)

trunk/wifidog-auth/wifidog/admin/import_user_database.php

@@ -264 +264 @@
     $ui=new MainUI();
     $ui->setToolSection('ADMIN');
-    $ui->appendContent('main_area_middle', $html);
+    $ui->addContent('main_area_middle', $html);
     $ui->display();
 

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

@@ -67 +67 @@
 }
 
-$ui->appendContent('main_area_middle', $html);
+$ui->addContent('main_area_middle', $html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/admin/online_users.php

@@ -59 +59 @@
 $ui = new MainUI();
 $ui->setToolSection('ADMIN');
-$ui->appendContent('main_area_middle', $smarty->fetch("admin/templates/online_users.html"));
+$ui->addContent('main_area_middle', $smarty->fetch("admin/templates/online_users.html"));
 $ui->display();
 

trunk/wifidog-auth/wifidog/admin/stats.php

@@ -125 +125 @@
 $ui = new MainUI();
 $ui->setToolSection('ADMIN');
-$ui->appendContent('main_area_middle', $html);
+$ui->addContent('main_area_middle', $html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/admin/user_log.php

@@ -121 +121 @@
     $ui=new MainUI();
     $ui->setToolSection('ADMIN');
-    $ui->appendContent('main_area_middle', $html);
+    $ui->addContent('main_area_middle', $html);
     $ui->display();
 }

trunk/wifidog-auth/wifidog/change_password.php

@@ -131 +131 @@
 
         $ui = new MainUI();
-        $ui->appendContent('main_area_middle', $smarty->fetch("templates/sites/validate.tpl"));
+        $ui->addContent('main_area_middle', $smarty->fetch("templates/sites/validate.tpl"));
         $ui->display();
 
@@ -154 +154 @@
 $ui = new MainUI();
 $smarty->assign('SelectNetworkUI', Network::getSelectNetworkUI('auth_source'));
-$ui->appendContent('main_area_middle', $smarty->fetch("templates/change_password.html"));
+$ui->addContent('main_area_middle', $smarty->fetch("templates/change_password.html"));
 $ui->display();
 

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

@@ -969 +969 @@
     }
 
-    /** Is this Content element displayable at this hotspot, many classer override this
+    /** Is this Content element displayable at this hotspot, many classes override this
      * @param $node Node, optionnal
      * @return true or false */

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

@@ -70 +70 @@
  */
 class MainUI {
-    /**
-     * Available structural display areas where content can be placed
-     *
-     * @var array
-     * @access private
-     */
-    private $available_display_areas;
 
     /**
@@ -84 +77 @@
     * @access private
     */
-    private $contentArray;
+    private $_contentDisplayArray;
+
+    /**
+    * Content to be displayed on the page, before ordering
+    *
+    * @var array
+    * @access private
+    */
+    private $_contentArray;
 
     /**
@@ -104 +105 @@
      * Additional class of the <body> of the HTML page
      */
-    private $page_name;
+    private $_pageName;
 
     /**
@@ -112 +113 @@
      * @access private
      */
-    private $html_headers;
+    private $_htmlHeaders;
 
     /**
@@ -120 +121 @@
      * @access private
      */
-    private $tool_section_enabled = true;
+    private $_toolSectionEnabled = true;
 
     /**
@@ -128 +129 @@
      * @access private
      */
-    private $footer_scripts = array ();
-
-        private $shrink_left_area = false;
+    private $_footerScripts = array ();
+
+    private $_shrinkLeftArea = false;
 
     /**
@@ -151 +152 @@
         $db->execSql($current_content_sql, $rows, false);
         foreach ($rows as $row) {
-            $this->contentArray[$row['display_area']] = '';
+            $this->_contentDisplayArray[$row['display_area']] = '';
         }
     }
@@ -163 +164 @@
      * 
      * @param string $content HTML content to be added to the area
-     *
-     * @return void
-     */
-    public function appendContent($display_area, $content) {
-        if (!isset ($this->contentArray[$display_area])) {
-            throw new exception(sprintf(_('%s is not a valid structural display area'), $display_area));
-        }
-        $this->contentArray[$display_area] .= $content;
+     * 
+     * @param integer $display_order_index The order in which the content should
+     * be displayed
+     *
+     * @return void
+     */
+    public function addContent($displayArea, $content, $displayOrderIndex = 1) {
+            //echo "MainUI::addContent(): Debug: displayArea: $displayArea, displayOrderIndex: $displayOrderIndex, content: $content<br/>";
+    if (!isset ($this->_contentDisplayArray[$displayArea])) {
+            throw new exception(sprintf(_('%s is not a valid structural display area'), $displayArea));
+        }
+        $this->_contentArray[] = array ('display_area' => $displayArea, 'display_order' => $displayOrderIndex, 'content' => $content);
+    }
+
+    /** Private compare function for sorting the _contentArray() */
+    private static function _contentArrayCmp($a, $b) {
+        if ($a['display_order'] == $b['display_order']) {
+            return 0;
+        }
+        return ($a['display_order'] < $b['display_order']) ? -1 : 1;
+    }
+
+    /**
+     * Orders the content and put it in the _contentDisplayArray array
+     *
+     * @return void
+     */
+    private function generateDisplayContent() {
+        //pretty_print_r($this->_contentArray);
+        usort($this->_contentArray, array ('MainUI', '_contentArrayCmp'));
+        foreach ($this->_contentArray as $content_fragment) {
+            $this->_contentDisplayArray[$content_fragment['display_area']] .= $content_fragment['content'];
+        }
+
+    }
+
+    /**
+     * Add the content marked "everywhere" from both the current node and the
+     * current network.
+     *
+     * @return void
+     */
+    private function addEverywhereContent() {
+        global $db;
+        // Get all network content and node "everywhere" content
+        $content_rows = null;
+        $network_id = $db->escapeString(Network :: getCurrentNetwork()->getId());
+        $sql_network = "(SELECT content_id, display_area, display_order, subscribe_timestamp FROM network_has_content WHERE network_id='$network_id'  AND display_page='everywhere') ";
+        $node = Node :: getCurrentNode();
+        $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='everywhere')";
+        }
+        $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)) {
+                    $this->addContent($content_row['display_area'], $content->getUserUI(), $content_row['display_order']);
+                }
+            }
+        }
+
+    }
+
+    /**
+    * Check if the tool section is enabled
+    *
+    * @return bool True or false
+    *
+    * @access public
+    */
+    public function isToolSectionEnabled() {
+        return $this->_toolSectionEnabled;
     }
 
@@ -180 +251 @@
      * @access public
      */
-    public function isToolSectionEnabled() {
-        return $this->tool_section_enabled;
-    }
-
-    /**
-     * Check if the tool section is enabled
-     *
-     * @return bool True or false
-     *
-     * @access public
-     */
     public function setToolSectionEnabled($status) {
-        $this->tool_section_enabled = $status;
+        $this->_toolSectionEnabled = $status;
     }
 
@@ -209 +269 @@
 
     public function shrinkLeftArea() {
-                $this->shrink_left_area = true;
-        }
+        $this->_shrinkLeftArea = true;
+    }
 
     /**
@@ -222 +282 @@
      */
     public function setPageName($page_name_string) {
-        $this->page_name = $page_name_string;
+        $this->_pageName = $page_name_string;
     }
 
@@ -240 +300 @@
     */
     public function addFooterScript($script) {
-        $this->footer_scripts[] = $script;
+        $this->_footerScripts[] = $script;
     }
 
@@ -253 +313 @@
      */
     public function setHtmlHeader($headers_string) {
-        $this->html_headers = $headers_string;
+        $this->_htmlHeaders = $headers_string;
     }
 
@@ -281 +341 @@
                     // The user has no permission to access the administrative functions
                     $_html = _("You do not have permissions to access any administration functions.");
-                } else {
+                }
+                else {
                     // Init values
                     $_sqlAdditionalWhere = "";
 
                     // Init ALL smarty values
-                                        User::assignSmartyValues($this->smarty, $_currentUser);
+                    User :: assignSmartyValues($this->smarty, $_currentUser);
                     $this->smarty->assign('formAction', "");
                     $this->smarty->assign('nodeUI', "");
@@ -327 +388 @@
         }
 
-        $this->appendContent('left_area_middle', $_html);
+        $this->addContent('left_area_middle', $_html);
     }
 
@@ -338 +399 @@
      */
     private function getToolContent() {
-            // Define globals
-    global $session;
+        // Define globals
+        global $session;
         global $AVAIL_LOCALE_ARRAY;
 
@@ -354 +415 @@
         $this->smarty->assign('sectionLOGIN', false);
 
-                // Set section of Smarty template
-                $this->smarty->assign('sectionSTART', true);
-
-                // Get information about user
-                $_currentUser = User :: getCurrentUser();
-
-                                User::assignSmartyValues($this->smarty, $_currentUser);
-
-                $this->smarty->assign('logoutParameters', "");
-                $this->smarty->assign('loginParameters', "");
-                $this->smarty->assign('formAction', "");
-                $this->smarty->assign('toolContent', "");
-                $this->smarty->assign('accountInformation', "");
-                $this->smarty->assign('techSupportInformation', "");
-                $this->smarty->assign('shrinkLeftArea', $this->shrink_left_area);
-
-                // Provide Smarty with information about the network
-                                Network::assignSmartyValues($this->smarty);
-
-                /*
-                 * Provide Smarty information about the user's login/logout status
-                 */
-
-                if ($_currentUser != null) {
-                    // User is logged in
-
-                    // Detect gateway information
-                    $_gwId = $session->get(SESS_GW_ID_VAR);
-                    $_gwAddress = $session->get(SESS_GW_ADDRESS_VAR);
-                    $_gwPort = $session->get(SESS_GW_PORT_VAR);
-
-                    // If gateway information could be detected tell them Smarty
-                    if ($_gwId && $_gwAddress && $_gwPort) {
-                        $this->smarty->assign('logoutParameters', "&amp;gw_id=".$_gwId."&amp;gw_address=".$_gwAddress."&amp;gw_port=".$_gwPort);
-                    }
-                } else {
-                    // Detect gateway information
-                    $_gwId = !empty ($_REQUEST['gw_id']) ? $_REQUEST['gw_id'] : $session->get(SESS_GW_ID_VAR);
-                    $_gwAddress = !empty ($_REQUEST['gw_address']) ? $_REQUEST['gw_address'] : $session->get(SESS_GW_ADDRESS_VAR);
-                    $_gwPort = !empty ($_REQUEST['gw_port']) ? $_REQUEST['gw_port'] : $session->get(SESS_GW_PORT_VAR);
-
-                    // If gateway information could be detected tell them Smarty
-                    if (!empty ($_gwId) && !empty ($_gwAddress) && !empty ($_gwPort)) {
-                        $this->smarty->assign('loginParameters', "?gw_id=".$_gwId."&amp;gw_address=".$_gwAddress."&amp;gw_port=".$_gwPort);
-                    }
-                }
-
-                /*
-                 * Provide Smarty information for the language chooser
-                 */
-
-                // Assign the action URL for the form
-                $this->smarty->assign('formAction', $_SERVER['REQUEST_URI']);
-
-                foreach ($AVAIL_LOCALE_ARRAY as $_langIds => $_langNames) {
-                    if (Locale :: getCurrentLocale()->getId() == $_langIds) {
-                        $_selected = ' selected="selected"';
-                    } else {
-                        $_selected = "";
-                    }
-
-                    $_languageChooser[] = '<option label="'.$_langNames.'" value="'.$_langIds.'"'.$_selected.'>'.$_langNames.'</option>';
-                }
-
-                // Provide Smarty all available languages
-                $this->smarty->assign('languageChooser', $_languageChooser);
-
-                /*
-                 * Provide Smarty information for the language chooser
-                 */
-                 
-                // Provide information
-                $this->smarty->assign('accountInformation', sprintf(_("Accounts on %s are and will stay completely free."), Network :: getCurrentNetwork()->getName()));
-                $this->smarty->assign('techSupportInformation', sprintf(_("Please inform us of any problem or service interruption at: %s"), '<a href="mailto:'.Network :: getCurrentNetwork()->getTechSupportEmail().'">'.Network :: getCurrentNetwork()->getTechSupportEmail().'</a>'));
-
-                // Compile HTML code
-                $_html = $this->smarty->fetch("templates/classes/MainUI_ToolContent.tpl");
- 
+        // Set section of Smarty template
+        $this->smarty->assign('sectionSTART', true);
+
+        // Get information about user
+        $_currentUser = User :: getCurrentUser();
+
+        User :: assignSmartyValues($this->smarty, $_currentUser);
+
+        $this->smarty->assign('logoutParameters', "");
+        $this->smarty->assign('loginParameters', "");
+        $this->smarty->assign('formAction', "");
+        $this->smarty->assign('toolContent', "");
+        $this->smarty->assign('accountInformation', "");
+        $this->smarty->assign('techSupportInformation', "");
+        $this->smarty->assign('shrinkLeftArea', $this->_shrinkLeftArea);
+
+        // Provide Smarty with information about the network
+        Network :: assignSmartyValues($this->smarty);
+
+        /*
+         * Provide Smarty information about the user's login/logout status
+         */
+
+        if ($_currentUser != null) {
+            // User is logged in
+
+            // Detect gateway information
+            $_gwId = $session->get(SESS_GW_ID_VAR);
+            $_gwAddress = $session->get(SESS_GW_ADDRESS_VAR);
+            $_gwPort = $session->get(SESS_GW_PORT_VAR);
+
+            // If gateway information could be detected tell them Smarty
+            if ($_gwId && $_gwAddress && $_gwPort) {
+                $this->smarty->assign('logoutParameters', "&amp;gw_id=".$_gwId."&amp;gw_address=".$_gwAddress."&amp;gw_port=".$_gwPort);
+            }
+        }
+        else {
+            // Detect gateway information
+            $_gwId = !empty ($_REQUEST['gw_id']) ? $_REQUEST['gw_id'] : $session->get(SESS_GW_ID_VAR);
+            $_gwAddress = !empty ($_REQUEST['gw_address']) ? $_REQUEST['gw_address'] : $session->get(SESS_GW_ADDRESS_VAR);
+            $_gwPort = !empty ($_REQUEST['gw_port']) ? $_REQUEST['gw_port'] : $session->get(SESS_GW_PORT_VAR);
+
+            // If gateway information could be detected tell them Smarty
+            if (!empty ($_gwId) && !empty ($_gwAddress) && !empty ($_gwPort)) {
+                $this->smarty->assign('loginParameters', "?gw_id=".$_gwId."&amp;gw_address=".$_gwAddress."&amp;gw_port=".$_gwPort);
+            }
+        }
+
+        /*
+         * Provide Smarty information for the language chooser
+         */
+
+        // Assign the action URL for the form
+        $this->smarty->assign('formAction', $_SERVER['REQUEST_URI']);
+
+        foreach ($AVAIL_LOCALE_ARRAY as $_langIds => $_langNames) {
+            if (Locale :: getCurrentLocale()->getId() == $_langIds) {
+                $_selected = ' selected="selected"';
+            }
+            else {
+                $_selected = "";
+            }
+
+            $_languageChooser[] = '<option label="'.$_langNames.'" value="'.$_langIds.'"'.$_selected.'>'.$_langNames.'</option>';
+        }
+
+        // Provide Smarty all available languages
+        $this->smarty->assign('languageChooser', $_languageChooser);
+
+        /*
+         * Provide Smarty information for the language chooser
+         */
+
+        // Provide information
+        $this->smarty->assign('accountInformation', sprintf(_("Accounts on %s are and will stay completely free."), Network :: getCurrentNetwork()->getName()));
+        $this->smarty->assign('techSupportInformation', sprintf(_("Please inform us of any problem or service interruption at: %s"), '<a href="mailto:'.Network :: getCurrentNetwork()->getTechSupportEmail().'">'.Network :: getCurrentNetwork()->getTechSupportEmail().'</a>'));
+
+        // Compile HTML code
+        $_html = $this->smarty->fetch("templates/classes/MainUI_ToolContent.tpl");
+
         return $_html;
     }
@@ -446 +509 @@
      */
     public function display() {
+
         // Init values
         $_stylesheetFile = "";
@@ -461 +525 @@
 
         // Add HTML headers
-        $this->smarty->assign('htmlHeaders', $this->html_headers);
+        $this->smarty->assign('htmlHeaders', $this->_htmlHeaders);
 
         // Asign title
@@ -467 +531 @@
 
         // Asign CSS class for body
-        $this->smarty->assign('page_name', $this->page_name);
+        $this->smarty->assign('page_name', $this->_pageName);
 
         // Asign path to CSS stylesheet
@@ -477 +541 @@
         if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.STYLESHEET_NAME)) {
             $_stylesheetFile = NODE_CONTENT_SMARTY_PATH.STYLESHEET_NAME;
-        } else {
+        }
+        else {
             $_stylesheetFile = DEFAULT_CONTENT_SMARTY_PATH.STYLESHEET_NAME;
         }
@@ -490 +555 @@
 
         // Get information about user
-                User::assignSmartyValues($this->smarty);
-
-                $this->appendContent('page_header', $this->customBanner());
-
+        User :: assignSmartyValues($this->smarty);
+
+        //Handle content
+
+        $this->addContent('page_header', $this->customBanner());
         /*
          * Build tool pane if it has been enabled
          */
         if ($this->isToolSectionEnabled()) {
-            $this->appendContent('left_area_top', $this->getToolContent());
-        }
-
+            $this->addContent('left_area_top', $this->getToolContent());
+        }
+        $this->addEverywhereContent();
+        $this->generateDisplayContent();
         // Provide the content array to Smarty
-        $this->smarty->assign('contentArray', $this->contentArray);
+        $this->smarty->assign('contentDisplayArray', $this->_contentDisplayArray);
 
         // Provide footer scripts to Smarty
-        $this->smarty->assign('footerScripts', $this->footer_scripts);
+        $this->smarty->assign('footerScripts', $this->_footerScripts);
 
         // Compile HTML code and output it
@@ -523 +590 @@
      */
     function displayError($errmsg, $show_tech_support_email = true) {
-        // Init ALL smarty values
-        $this->smarty->assign("error", "");
+            // Init ALL smarty values
+    $this->smarty->assign("error", "");
         $this->smarty->assign("show_tech_support_email", false);
         $this->smarty->assign("tech_support_email", "");
@@ -541 +608 @@
         $_html = $this->smarty->fetch("templates/sites/error.tpl");
 
-        $this->appendContent('page_header', $_html);
+        $this->addContent('page_header', $_html);
         $this->display();
     }
 
-        static public function redirect($redirect_url, $redirect_to_title=null, $timeout=60) {
-                if (!$redirect_to_title) {
-                        $network = Network :: getCurrentNetwork();
-                        $redirect_to_title = $network ? sprintf(_("%s Login"), $network->getName()) : _("Login");
-                }
-
-                header("Location: $redirect_url");
-                echo "<html>\n" .
-                        "<head><meta http-equiv='Refresh' content='$timeout; URL=$redirect_url'/></head>\n".
-                        "<body>\n" .
-                        "<noscript>\n" .
-                        "<span style='display:none;'>\n" .
-                        "<h1>" . $redirect_to_title . "</h1>\n" .
-                        sprintf(_("Click <a href='%s'>here</a> to continue"), $redirect_url) . "<br/>\n" .
-                        _("The transfer from secure login back to regular http may cause a warning.") . "\n" .
-                        "</span>\n" .
-                        "</noscript>\n" .
-                        "</body>\n" .
-                        "</html>\n"
-                        ;
-                exit;
-        }
-
-        public function customBanner() {
-                $custom_banner = '';
-
-                return $custom_banner;
-        }
+    static public function redirect($redirect_url, $redirect_to_title = null, $timeout = 60) {
+        if (!$redirect_to_title) {
+            $network = Network :: getCurrentNetwork();
+            $redirect_to_title = $network ? sprintf(_("%s Login"), $network->getName()) : _("Login");
+        }
+
+        header("Location: $redirect_url");
+        echo "<html>\n"."<head><meta http-equiv='Refresh' content='$timeout; URL=$redirect_url'/></head>\n"."<body>\n"."<noscript>\n"."<span style='display:none;'>\n"."<h1>".$redirect_to_title."</h1>\n".sprintf(_("Click <a href='%s'>here</a> to continue"), $redirect_url)."<br/>\n"._("The transfer from secure login back to regular http may cause a warning.")."\n"."</span>\n"."</noscript>\n"."</body>\n"."</html>\n";
+        exit;
+    }
+
+    public function customBanner() {
+        $custom_banner = '';
+
+        return $custom_banner;
+    }
 }
 

trunk/wifidog-auth/wifidog/classes/NodeLists/NodeListHTML.php

@@ -232 +232 @@
         $this->_mainUI->setTitle(_("Hotspot list"));
         $this->_mainUI->SetHtmlHeader('<link rel="alternate" type="application/rss+xml" title="' . $this->_network->getName() . ": " . _("Newest Hotspots") . '" href="' . BASE_SSL_PATH . 'hotspot_status.php?format=RSS">');
-        $this->_mainUI->appendContent('left_area_middle', $_html);
-        $this->_mainUI->appendContent('main_area_middle', $_html_body);
+        $this->_mainUI->addContent('left_area_middle', $_html);
+        $this->_mainUI->addContent('main_area_middle', $_html_body);
 
         $this->_mainUI->display();

trunk/wifidog-auth/wifidog/content/PatternLanguage/archives.php

@@ -98 +98 @@
 
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 $ui->setTitle(_("Pattern Language - Archives"));
-$ui->appendContent('main_area_middle', $body_html);
+$ui->addContent('main_area_middle', $body_html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/content/PatternLanguage/hotspots.php

@@ -103 +103 @@
 
 $ui=new MainUI();
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 $ui->setTitle(_("Pattern Language - Hotspots list"));
-$ui->appendContent('main_area_middle', $body_html);
+$ui->addContent('main_area_middle', $body_html);
 $ui->display();
 

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

@@ -93 +93 @@
 
 $ui=new MainUI();
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 $ui->setTitle(_("Pattern Language - About"));
-$ui->appendContent('main_area_middle', $body_html);
+$ui->addContent('main_area_middle', $body_html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/content/PatternLanguage/narrative.php

@@ -114 +114 @@
 
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 $ui->setTitle(_("Pattern Language - Narrative"));
-$ui->appendContent('main_area_middle', $body_html);
+$ui->addContent('main_area_middle', $body_html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/content/PatternLanguage/subscription.php

@@ -142 +142 @@
 
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 $ui->setTitle(_("Pattern Language - Subscription"));
-$ui->appendContent('main_area_middle', $body_html);
+$ui->addContent('main_area_middle', $body_html);
 $ui->display();
 

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

@@ -114 +114 @@
 $tool_html .= "</p>"."\n";
 */
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 
 
@@ -149 +149 @@
 }
 
-$ui->appendContent('main_area_middle', $html);
+$ui->addContent('main_area_middle', $html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/faq.php

@@ -53 +53 @@
 
 $ui = new MainUI();
-$ui->appendContent('main_area_middle', $smarty->fetch("templates/faq.html"));
+$ui->addContent('main_area_middle', $smarty->fetch("templates/faq.html"));
 $ui->display();
 

trunk/wifidog-auth/wifidog/help.php

@@ -58 +58 @@
 
 $ui = new MainUI();
-$ui->appendContent('main_area_middle', $smarty->fetch("templates/sites/help.tpl"));
+$ui->addContent('main_area_middle', $smarty->fetch("templates/sites/help.tpl"));
 $ui->display();
 

trunk/wifidog-auth/wifidog/hotspots_map.php

@@ -169 +169 @@
 $ui->setTitle(_("Hotspots status map"));
 $ui->setHtmlHeader($html_headers);
-$ui->appendContent('left_area_middle', $html);
-$ui->appendContent('main_area_middle', $html_body);
+$ui->addContent('left_area_middle', $html);
+$ui->addContent('main_area_middle', $html_body);
 $ui->addFooterScript($script);
 $ui->display();

trunk/wifidog-auth/wifidog/index.php

@@ -103 +103 @@
  */
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $html);
-$ui->appendContent('main_area_middle', $html_body);
+$ui->addContent('left_area_middle', $html);
+$ui->addContent('main_area_middle', $html_body);
 $ui->display();
 

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

@@ -262 +262 @@
 $ui->setPageName('login');
 $ui->shrinkLeftArea();
-$ui->appendContent('left_area_middle', $html);
+$ui->addContent('left_area_middle', $html);
 
 /*
  * Main content
  */
-// Get all network content
-$content_rows = null;
-$network_id = $db->escapeString($network->getId());
-    $sql = "SELECT content_id, display_area FROM network_has_content WHERE network_id='$network_id'  AND display_page='login' 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->appendContent($content_row['display_area'], $content->getUserUI());
+ 
+         // 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')";
         }
-    }
-}
-
-if($node)
-{
-// Get all node content
-$content_rows = null;
-$node_id = $db->escapeString($node->getId());
-    $sql = "SELECT content_id, display_area FROM node_has_content WHERE node_id='$node_id'  AND display_page='login' ORDER BY display_area, display_order, subscribe_timestamp DESC";
-$db->execSql($sql, $content_rows, false);
-$showMoreLink = false;
-if ($content_rows) {
-    foreach ($content_rows as $content_row) {
-        $content = Content :: getObject($content_row['content_id']);
-        if ($content->isDisplayableAt($node)) {
-            $ui->appendContent($content_row['display_area'], $content->getUserUI());
+        $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->getUserUI(), $content_row['display_order']);
+                }
+            }
         }
-    }
-}
-}
-
-$ui->appendContent('main_area_middle',
-        "\n<h1>" . sprintf(_("Welcome to the %s Hotspot network."), $network->getName()) . "</h1>\n" .
-
-        "<p>" .
-        _("Please use the login/signup form on the left to activate your connection with the internet.") .
-        "</p>\n".
-
-        "<p>" .
-        _("If you already have an account please use that to login.") . " " .
-        _("Thanks to the hospitality of your proprietor, this is a surfing free zone.") . " " .
-        _("Once you login you are welcome to use the internet as long as you like.") .
-        "</p>\n" .
-
-        "<p>" .
-        sprintf(_("If you are new to %s, please use the form on the left to create a new account."), $network->getName()) . " " .
-        _("There will be no charge for this service.") .
-        "</p>\n"
-);
 
 /*

trunk/wifidog-auth/wifidog/lost_password.php

@@ -141 +141 @@
          */
         $ui = new MainUI();
-        $ui->appendContent('left_area_middle', $html);
-        $ui->appendContent('main_area_middle', $html_body);
+        $ui->addContent('left_area_middle', $html);
+        $ui->addContent('main_area_middle', $html_body);
         $ui->display();
 
@@ -211 +211 @@
  */
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $html);
-$ui->appendContent('main_area_middle', $html_body);
+$ui->addContent('left_area_middle', $html);
+$ui->addContent('main_area_middle', $html_body);
 $ui->display();
 

trunk/wifidog-auth/wifidog/lost_username.php

@@ -125 +125 @@
          */
         $ui = new MainUI();
-        $ui->appendContent('left_area_middle', $html);
-        $ui->appendContent('main_area_middle', $html_body);
+        $ui->addContent('left_area_middle', $html);
+        $ui->addContent('main_area_middle', $html_body);
         $ui->display();
 
@@ -195 +195 @@
  */
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $html);
-$ui->appendContent('main_area_middle', $html_body);
+$ui->addContent('left_area_middle', $html);
+$ui->addContent('main_area_middle', $html_body);
 $ui->display();
 

trunk/wifidog-auth/wifidog/node_list.php

@@ -133 +133 @@
 
 $ui = new MainUI();
-$ui->appendContent('main_area_middle', $smarty->fetch("templates/node_list.html"));
+$ui->addContent('main_area_middle', $smarty->fetch("templates/node_list.html"));
 $ui->display();
 

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

@@ -211 +211 @@
 $ui->setTitle(sprintf(_("%s portal for %s"), $network->getName(), $node->getName()));
 $ui->setPageName('portal');
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 /*
  * Main content
@@ -221 +221 @@
     $validationMsgHtml .= sprintf(_("Your account has been granted %s minutes of access to retrieve your email and validate your account."), ($current_user->getNetwork()->getValidationGraceTime() / 60));
     $validationMsgHtml .= "</div>\n";
-    $ui->appendContent('page_header', $validationMsgHtml);
+    $ui->addContent('page_header', $validationMsgHtml);
 }
 
@@ -229 +229 @@
 if ($current_user) {
     $user_id = $db->escapeString($current_user->getId());
-    $sql = "SELECT content_id, display_area FROM network_has_content WHERE network_id='$network_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM network_has_content WHERE network_id='$network_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
 } else {
-    $sql = "SELECT content_id, display_area FROM network_has_content WHERE network_id='$network_id'  AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM network_has_content WHERE network_id='$network_id'  AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
 }
 $db->execSql($sql, $content_rows, false);
@@ -238 +238 @@
         $content = Content :: getObject($content_row['content_id']);
         if ($content->isDisplayableAt($node)) {
-            $ui->appendContent($content_row['display_area'], $content->getUserUI());
+            $ui->addContent($content_row['display_area'], $content->getUserUI(), $content_row['display_order']);
         }
     }
@@ -248 +248 @@
 if ($current_user) {
     $user_id = $db->escapeString($current_user->getId());
-    $sql = "SELECT content_id, display_area FROM node_has_content WHERE node_id='$node_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM node_has_content WHERE node_id='$node_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
 } else {
-    $sql = "SELECT content_id, display_area FROM node_has_content WHERE node_id='$node_id'  AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM node_has_content WHERE node_id='$node_id'  AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
 }
 $db->execSql($sql, $content_rows, false);
@@ -258 +258 @@
         $content = Content :: getObject($content_row['content_id']);
         if ($content->isDisplayableAt($node)) {
-            $ui->appendContent($content_row['display_area'], $content->getUserUI());
+            $ui->addContent($content_row['display_area'], $content->getUserUI(), $content_row['display_order']);
         }
         // Check for content requirements to show the "Show all contents" link
@@ -283 +283 @@
             $content = Content :: getObject($content_row['content_id']);
             if ($content->isDisplayableAt($node)) {
-                $ui->appendContent('main_area_middle', $content->getUserUI());
+                $ui->addContent('main_area_middle', $content->getUserUI());
             }
         }
@@ -291 +291 @@
 if ($showMoreLink) {
     $link_html = "<a href='{$base_ssl_path}content/?gw_id={$currentNodeId}'>"._("Show all available contents for this hotspot")."</a>\n";
-    $ui->appendContent('main_area_middle', $link_html);
+    $ui->addContent('main_area_middle', $link_html);
 }
 $ui->display();

trunk/wifidog-auth/wifidog/resend_validation.php

@@ -124 +124 @@
          */
         $ui = new MainUI();
-        $ui->appendContent('left_area_middle', $html);
-        $ui->appendContent('main_area_middle', $html_body);
+        $ui->addContent('left_area_middle', $html);
+        $ui->addContent('main_area_middle', $html_body);
         $ui->display();
 
@@ -194 +194 @@
  */
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $html);
-$ui->appendContent('main_area_middle', $html_body);
+$ui->addContent('left_area_middle', $html);
+$ui->addContent('main_area_middle', $html_body);
 $ui->display();
 

trunk/wifidog-auth/wifidog/signup.php

@@ -258 +258 @@
         $ui = new MainUI();
 
-        $ui->appendContent('left_area_middle', $html);
-        $ui->appendContent('main_area_middle', $html_body);
-
-                // $ui->appendContent('page_header', $validationMsgHtml);
-                $ui->appendContent('main_area_top', $validationMsgHtml);
+        $ui->addContent('left_area_middle', $html);
+        $ui->addContent('main_area_middle', $html_body);
+
+                // $ui->addContent('page_header', $validationMsgHtml);
+                $ui->addContent('main_area_top', $validationMsgHtml);
 
         $ui->display();
@@ -345 +345 @@
  */
 $ui = new MainUI();
-$ui->appendContent('left_area_middle', $html);
-$ui->appendContent('main_area_middle', $html_body);
+$ui->addContent('left_area_middle', $html);
+$ui->addContent('main_area_middle', $html_body);
 $ui->display();
 

trunk/wifidog-auth/wifidog/templates/classes/MainUI_Display.tpl

@@ -68 +68 @@
 
     <body id='page' class='{$page_name}'>
-        {if !empty($contentArray.page_header) || $debugRequested}
+        {if !empty($contentDisplayArray.page_header) || $debugRequested}
                 <div class='page_header'>
             {if $debugRequested}
                 <pre>{$debugOutput}</pre>
                 {/if}
-                        {if !empty($contentArray.page_header)}
-                                {$contentArray.page_header}
+                        {if !empty($contentDisplayArray.page_header)}
+                                {$contentDisplayArray.page_header}
                 {/if}
                 </div>
@@ -81 +81 @@
 
         <div id="page_body">
-        {if !empty($contentArray.left_area_top) ||  !empty($contentArray.left_area_middle) ||  !empty($contentArray.left_area_middle)}
+        {if !empty($contentDisplayArray.left_area_top) ||  !empty($contentDisplayArray.left_area_middle) ||  !empty($contentDisplayArray.left_area_middle)}
                 <div id="left_area">
-                        {if !empty($contentArray.left_area_top)}
+                        {if !empty($contentDisplayArray.left_area_top)}
                         <div id="left_area_top">
-                            {$contentArray.left_area_top}
+                            {$contentDisplayArray.left_area_top}
                         </div>
                         {/if}
-                        {if !empty($contentArray.left_area_middle)}
+                        {if !empty($contentDisplayArray.left_area_middle)}
                         <div id="left_area_middle">
-                            {$contentArray.left_area_middle}
+                            {$contentDisplayArray.left_area_middle}
                         </div>
                         {/if}
-                        {if !empty($contentArray.left_area_bottom)}
+                        {if !empty($contentDisplayArray.left_area_bottom)}
                         <div id="left_area_bottom">
-                            {$contentArray.left_area_bottom}
+                            {$contentDisplayArray.left_area_bottom}
                         </div>
                         {/if}   
@@ -101 +101 @@
         {/if}
         
-        {if !empty($contentArray.main_area_top) ||  !empty($contentArray.main_area_middle) ||  !empty($contentArray.main_area_middle)}
+        {if !empty($contentDisplayArray.main_area_top) ||  !empty($contentDisplayArray.main_area_middle) ||  !empty($contentDisplayArray.main_area_middle)}
                 <div id="main_area">
-                        {if !empty($contentArray.main_area_top)}
+                        {if !empty($contentDisplayArray.main_area_top)}
                         <div id="main_area_top">
-                            {$contentArray.main_area_top}
+                            {$contentDisplayArray.main_area_top}
                         </div>
                         {/if}
-                        {if !empty($contentArray.main_area_middle)}
+                        {if !empty($contentDisplayArray.main_area_middle)}
                         <div id="main_area_middle">
-                            {$contentArray.main_area_middle}
+                            {$contentDisplayArray.main_area_middle}
                         </div>
                         {/if}
-                        {if !empty($contentArray.main_area_bottom)}
+                        {if !empty($contentDisplayArray.main_area_bottom)}
                         <div id="main_area_bottom">
-                            {$contentArray.main_area_bottom}
+                            {$contentDisplayArray.main_area_bottom}
                         </div>
                         {/if}   
@@ -121 +121 @@
         {/if}        
 
-          {if !empty($contentArray.right_area_top) ||  !empty($contentArray.right_area_middle) ||  !empty($contentArray.right_area_bottom)}
+          {if !empty($contentDisplayArray.right_area_top) ||  !empty($contentDisplayArray.right_area_middle) ||  !empty($contentDisplayArray.right_area_bottom)}
                 <div id="right_area">
-                        {if !empty($contentArray.right_area_top)}
+                        {if !empty($contentDisplayArray.right_area_top)}
                         <div id="right_area_top">
-                            {$contentArray.right_area_top}
+                            {$contentDisplayArray.right_area_top}
                         </div>
                         {/if}
-                        {if !empty($contentArray.right_area_middle)}
+                        {if !empty($contentDisplayArray.right_area_middle)}
                         <div id="right_area_middle">
-                            {$contentArray.right_area_middle}
+                            {$contentDisplayArray.right_area_middle}
                         </div>
                         {/if}
-                        {if !empty($contentArray.right_area_bottom)}
+                        {if !empty($contentDisplayArray.right_area_bottom)}
                         <div id="right_area_bottom">
-                            {$contentArray.right_area_bottom}
+                            {$contentDisplayArray.right_area_bottom}
                         </div>
                         {/if}   
@@ -141 +141 @@
         {/if}   
         </div>
-    {if !empty($contentArray.page_footer)}
+    {if !empty($contentDisplayArray.page_footer)}
         <div class='page_footer'>
-                        {$contentArray.page_footer}
+                        {$contentDisplayArray.page_footer}
         </div>
     {/if} 

trunk/wifidog-auth/wifidog/user_profile.php

@@ -80 +80 @@
 
 $ui=new MainUI();
-$ui->appendContent('left_area_middle', $tool_html);
+$ui->addContent('left_area_middle', $tool_html);
 $smarty->assign("title", _("User Profile"));
 //TODO: Write User profiles
-$ui->appendContent('main_area_middle', $body_html);
+$ui->addContent('main_area_middle', $body_html);
 $ui->display();
 

trunk/wifidog-auth/wifidog/validate.php

@@ -86 +86 @@
 
 $ui = new MainUI();
-$ui->appendContent('main_area_middle', $smarty->fetch("templates/sites/validate.tpl"));
+$ui->addContent('main_area_middle', $smarty->fetch("templates/sites/validate.tpl"));
 $ui->display();