Changeset 979

Timestamp:

02/28/06 09:21:36 (7 years ago)

Author:

max-horvath

Message:

"2006-02-28 Max Horvath <max.horvath@…>

• the content selector for an owner could produce notices
• the button add existing content in the content manager will only be shown if content is actually available
• the start button on the portal page won't be shown anymore if a user didn't access it from a WiFiDog hotspot
• deleted wifidog/templates/message_unknown_hotspot.html as this error message will be displayed using the genecir error message template
• display of generic error messages will be handled by the MainUI class
• deleted wifidog/portal/missing_original_url.php as its functions is being handled by wifidog/portal/index.php now
• deleted wifidog/templates/message_default.html as its functions is being handled by wifidog/gw_message.php now
• deleted wifidog/templates/message_activate.html as its functions is being handled by wifidog/gw_message.php now
• account validation hints finally show the real validation grace time (used to display 15 minutes)
• deleted wifidog/templates/message_denied.html as its functions is being handled by wifidog/gw_message.php now
• deleted wifidog/templates/message_failed_validation.html as its functions is being handled by wifidog/gw_message.php now
• deleted wifidog/templates/user_management_menu.html as its not being used anymore
• deleted wifidog/local_content/default/footer.html as its not being used anymore
• deleted wifidog/local_content/default/header.html as its not being used anymore
• deleted wifidog/local_content/default/portal.html as its not being used anymore
• deleted wifidog/local_content/default/new.css as its wasn't ever used
• deleted wifidog/local_content/README as its content isn't valid anymore used anymore"

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/admin/hotspot_location_map.php (modified) (3 diffs)
• wifidog/classes/Content.php (modified) (2 diffs)
• wifidog/classes/MainUI.php (modified) (1 diff)
• wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• wifidog/classes/Style.php (modified) (1 diff)
• wifidog/config.php (modified) (1 diff)
• wifidog/content/index.php (modified) (1 diff)
• wifidog/gw_message.php (modified) (1 diff)
• wifidog/local_content/README (deleted)
• wifidog/local_content/default/footer.html (deleted)
• wifidog/local_content/default/header.html (deleted)
• wifidog/local_content/default/new.css (deleted)
• wifidog/local_content/default/portal.html (deleted)
• wifidog/login/index.php (modified) (1 diff)
• wifidog/portal/index.php (modified) (7 diffs)
• wifidog/portal/missing_original_url.php (deleted)
• wifidog/templates/generic_error.html (modified) (1 diff)
• wifidog/templates/message_activate.html (deleted)
• wifidog/templates/message_default.html (deleted)
• wifidog/templates/message_denied.html (deleted)
• wifidog/templates/message_failed_validation.html (deleted)
• wifidog/templates/message_unknown_hotspot.html (deleted)
• wifidog/templates/sites/portal.tpl (added)
• wifidog/templates/user_management_menu.html (deleted)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-02-28 Max Horváth <max.horvath@maxspot.de>
+        * the content selector for an owner could produce notices
+        * the button add existing content in the content manager will only be shown
+          if content is actually available
+        * the start button on the portal page won't be shown anymore if a user
+          didn't access it from a WiFiDog hotspot
+        * deleted wifidog/templates/message_unknown_hotspot.html as this error
+          message will be displayed using the genecir error message template
+        * display of generic error messages will be handled by the MainUI class
+        * deleted wifidog/portal/missing_original_url.php as its functions is being
+          handled by wifidog/portal/index.php now
+        * deleted wifidog/templates/message_default.html as its functions is being
+          handled by wifidog/gw_message.php now
+        * deleted wifidog/templates/message_activate.html as its functions is being
+          handled by wifidog/gw_message.php now
+        * account validation hints finally show the real validation grace time
+          (used to display 15 minutes)
+        * deleted wifidog/templates/message_denied.html as its functions is being
+          handled by wifidog/gw_message.php now
+        * deleted wifidog/templates/message_failed_validation.html as its functions
+          is being handled by wifidog/gw_message.php now
+        * deleted wifidog/templates/user_management_menu.html as its not being
+          used anymore
+        * deleted wifidog/local_content/default/footer.html as its not being
+          used anymore
+        * deleted wifidog/local_content/default/header.html as its not being
+          used anymore
+        * deleted wifidog/local_content/default/portal.html as its not being
+          used anymore
+        * deleted wifidog/local_content/default/new.css as its wasn't ever used
+        * deleted wifidog/local_content/README as its content isn't valid anymore
+          used anymore
+
 2006-02-26 Max Horváth <max.horvath@maxspot.de>
         * Hotspots map page now uses a direct Javascript call for the link

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

@@ -51 +51 @@
 
 require_once('classes/Node.php');
+require_once('classes/Network.php');
 require_once('classes/AbstractGeocoder.php');
 require_once('classes/MainUI.php');
+require_once('classes/Server.php');
 
 $ui = new MainUI();
@@ -62 +64 @@
 
     // Add Google Maps JavaScript ( must set config values )
-    $html_headers = "<script src=\"http://maps.google.com/maps?file=api&v=1&key=".GMAPS_PUBLIC_API_KEY."\" type=\"text/javascript\"></script>";
+    $html_headers = "<script src=\"http://maps.google.com/maps?file=api&v=1&key=" . Server::getCurrentServer()->getGoogleAPIKey() . "\" type=\"text/javascript\"></script>";
     $ui->setHtmlHeader($html_headers);
 
@@ -87 +89 @@
     $script .= "map.addControl(new GLargeMapControl());\n";
     $script .= "map.addControl(new GMapTypeControl());\n";
+    $script .= "map.setMapType(" . $node->getNetwork()->getGisMapType() . ");\n";
     $script .= "map.centerAndZoom(new GPoint($long, $lat), 1);\n";
     $script .= "var current_marker_point = new GPoint($long, $lat);\n";

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

@@ -556 +556 @@
         $html .= "<li class='admin_section_list_item'>\n";
         $name = "{$user_prefix}_new_existing";
-        $html .= Content :: getSelectContentUI($name, "AND content_id NOT IN (SELECT content_id FROM $link_table WHERE $link_table_obj_key_col='$link_table_obj_key')");
+        $_contentSelector = Content::getSelectContentUI($name, "AND content_id NOT IN (SELECT content_id FROM $link_table WHERE $link_table_obj_key_col='$link_table_obj_key')");
+        $html .= $_contentSelector;
         $name = "{$user_prefix}_new_display_location";
 
         $html .= "<input type='hidden' name='{$name}' value='{$display_location}'>\n";
         $name = "{$user_prefix}_new_existing_submit";
-        $html .= "<input type='submit' name='$name' value='"._("Add")."'>";
+
+        if (strpos($_contentSelector, _("Sorry, no content available in the database")) === false) {
+            $html .= "<input type='submit' name='$name' value='"._("Add")."'>";
+        }
+
         $html .= "</li>\n";
         $html .= "<li class='admin_section_list_item'>\n";
@@ -721 +726 @@
 
             if ($type_interface != "table") {
-                $_html .= FormSelectGenerator::generateFromArray($_tab, null, $_name, null, false);
+                if (isset($_tab)) {
+                    $_html .= FormSelectGenerator::generateFromArray($_tab, null, $_name, null, false);
+                } else {
+                    $_html .= "<div class='warningmsg'>" . _("Sorry, no content available in the database") . "</div>\n";
+                }
             } else {
                 $_html .= "</table>\n";

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

@@ -538 +538 @@
     }
 
-    function displayError($errmsg)
+    /**
+     * Display a generic error message
+     *
+     * @param string $errmsg                  The error message to be displayed
+     * @param bool   $show_tech_support_email Defines wether to show the link of
+     *                                        the tech-support
+     *
+     * @return void
+     *
+     * @access public
+     */
+    function displayError($errmsg, $show_tech_support_email = true)
     {
         // Init ALL smarty values
         $this->smarty->assign("error", "");
+        $this->smarty->assign("show_tech_support_email", false);
         $this->smarty->assign("tech_support_email", "");
 
         // Define needed error content
         $this->smarty->assign("error", $errmsg);
-        $this->smarty->assign("tech_support_email", Network::getCurrentNetwork()->getTechSupportEmail());
+
+        if ($show_tech_support_email) {
+            $this->smarty->assign("show_tech_support_email", true);
+            $this->smarty->assign("tech_support_email", Network::getCurrentNetwork()->getTechSupportEmail());
+        }
 
         /*
          * Output the error message
          */
-        $_html = $this->smarty->fetch("templates/generic_error.html");
+        $_html = $this->smarty->fetch("templates/sites/error.tpl");
 
         $this->setMainContent($_html);

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

@@ -94 +94 @@
     $this->assign('request_uri', $_SERVER["REQUEST_URI"]);
 
-    if(is_file(NODE_CONTENT_PHP_RELATIVE_PATH.PAGE_HEADER_NAME))
-      {
-        $this->assign('header_file',NODE_CONTENT_SMARTY_PATH.PAGE_HEADER_NAME);
-      }
-    else
-      {
-        $this->assign('header_file',DEFAULT_CONTENT_SMARTY_PATH.PAGE_HEADER_NAME);
-      }
-
-    if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.PORTAL_PAGE_NAME)) {
-        $this->assign('portal_page', NODE_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
-    } else {
-        $this->assign('portal_page', DEFAULT_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
-    }
-
-    if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.PORTAL_PAGE_NAME)) {
+    if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.LOGIN_PAGE_NAME)) {
         $this->assign('login_page', NODE_CONTENT_SMARTY_PATH.LOGIN_PAGE_NAME);
     } else {
         $this->assign('login_page', DEFAULT_CONTENT_SMARTY_PATH.LOGIN_PAGE_NAME);
     }
-
-    if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.PAGE_FOOTER_NAME))
-      {
-        $this->assign('footer_file',NODE_CONTENT_SMARTY_PATH.PAGE_FOOTER_NAME);
-      }
-    else
-      {
-        $this->assign('footer_file',DEFAULT_CONTENT_SMARTY_PATH.PAGE_FOOTER_NAME);
-      }
 
     if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.STYLESHEET_NAME))

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

@@ -89 +89 @@
     $smarty = new SmartyWifidog;
     $smarty->assign('title',$title);
-    $retval = $smarty->fetch(DEFAULT_CONTENT_SMARTY_PATH.PAGE_HEADER_NAME);
+    //$retval = $smarty->fetch(DEFAULT_CONTENT_SMARTY_PATH.PAGE_HEADER_NAME);
     global $starttime;
     $starttime = microtime();

trunk/wifidog-auth/wifidog/config.php

@@ -321 +321 @@
 define('DEFAULT_NODE_ID', 'default');
 
-/********************************************************************\
- * DEPRECATED VALUES                                                *
-\********************************************************************/
-
-/**
- * @deprecated since 2005-04-19
- */
-define('PAGE_HEADER_NODE', 'header.html');
-
-/**
- * @deprecated since 2005-04-19
- */
-define('PAGE_HEADER_NAME', 'header.html');
-
-/**
- * @deprecated since 2005-04-19
- */
-define('PAGE_FOOTER_NODE', 'footer.html');
-
-/**
- * @deprecated since 2005-04-19
- */
-define('PAGE_FOOTER_NAME', 'footer.html');
-
-/**
- * @deprecated since 2005-04-19
- */
-define('PORTAL_PAGE_NAME', 'portal.html');
-
 /**
  * In case this is the local.config.php you should remove the next lines.

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

@@ -62 +62 @@
     $node = Node :: getObject($_REQUEST['gw_id']);
 
-if ($node == null)
-{
-    $smarty->assign("tech_support_email", Network::getCurrentNetwork()->getTechSupportEmail());
-    $smarty->display("templates/message_unknown_hotspot.html");
+if ($node == null) {
+    $ui = new MainUI();
+    $ui->displayError(_("No Hotspot specified!"));
     exit;
 }

trunk/wifidog-auth/wifidog/gw_message.php

@@ -50 +50 @@
 
 require_once('include/common_interface.php');
+require_once('classes/User.php');
+require_once('classes/Network.php');
+require_once('classes/MainUI.php');
+
+$ui = new MainUI();
+$errmsg = "";
 
 if (isset($_REQUEST["message"])) {
     switch ($_REQUEST["message"]) {
-        case "failed_validation":
-            $smarty->display("templates/message_failed_validation.html");
-            break;
-        case "denied":
-            $smarty->display("templates/message_denied.html");
-            break;
-        case "activate":
-            $smarty->display("templates/message_activate.html");
-            break;
-        default:
-            $smarty->display("templates/message_default.html");
-            break;
+    case "failed_validation":
+        $errmsg .= "<p>" . sprintf(_("You have failed to validate your account in %d minutes."), (User::getCurrentUser()->getNetwork()->getValidationGraceTime() / 60)) . "</p>";
+        $errmsg .= "<p>" . _("Please validate your account from somewhere else or create a new one.") . "</p>";
+        $ui->displayError($errmsg);
+        break;
+
+    case "denied":
+        $errmsg .= _("Access denied!");
+        $ui->displayError($errmsg);
+        break;
+
+    case "activate":
+        $errmsg .= "<p>" . sprintf(_("You have now been granted %d minutes of Internet access without being validated to go and activate your account."), (User::getCurrentUser()->getNetwork()->getValidationGraceTime() / 60)) . "</p>";
+        $errmsg .= "<p>" . _("If you fail to validate your account in 15 minutes, you will have to validate it from somewhere else.") . "</p>";
+        $errmsg .= "<p>" . _("If you do not receive an email from our validation server in the next minute, perhaps you have made a typo in your email address, you might have to create another account.") . "</p>";
+        $ui->displayError($errmsg);
+        break;
+
+    default:
+        $errmsg .= _("No message has been specified! (this is probably an error)");
+        $ui->displayError($errmsg);
+        break;
     }
 } else {
-    $smarty->display("templates/message_default.html");
+    $errmsg .= _("No message has been specified! (this is probably an error)");
+    $ui->displayError($errmsg);
 }
 

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

@@ -130 +130 @@
 
     catch (Exception $e) {
-        $smarty->assign("error", $e->getMessage());
-        $smarty->assign("tech_support_email", Network::getCurrentNetwork()->getTechSupportEmail());
-        $smarty->display("templates/generic_error.html");
+        $ui = new MainUI();
+        $ui->displayError($e->getMessage());
         exit;
     }

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

@@ -40 +40 @@
  * @author     Philippe April
  * @author     Benoit Gregoire <bock@step.polymtl.ca>
+ * @author     Max Horvath <max.horvath@maxspot.de>
  * @copyright  2004-2006 Philippe April
  * @copyright  2004-2006 Benoit Gregoire, Technologies Coeus inc.
+ * @copyright  2006 Max Horvath, maxspot GmbH
  * @version    Subversion $Id$
  * @link       http://www.wifidog.org/
@@ -56 +58 @@
 require_once('classes/Session.php');
 
-/**
- * Define width of toolbar
- *
- * Must match the stylesheet for the tool section width
- */
-define('TOOLBAR_WIDTH', '250');
+/*
+ * Check for missing URL switch
+ */
+if (isset($_REQUEST['missing']) && $_REQUEST['missing'] == "url") {
+    $ui = new MainUI();
+    $ui->displayError(_('For some reason, we were unable to determine the web site you initially wanted to see.  You should now enter a web address in your URL bar.'), false);
+    exit;
+}
 
 // Init values
@@ -73 +77 @@
 $current_user = User::getCurrentUser();
 
-if (!empty ($_REQUEST['gw_id'])) {
-    $node = Node :: getObject($_REQUEST['gw_id']);
-}
-
-if ($node == null) {
-    $smarty->display("templates/message_unknown_hotspot.html");
+/*
+ * Start general request parameter processing section
+ */
+if (!empty($_REQUEST['gw_id'])) {
+    try {
+        $node = Node::getObject($_REQUEST['gw_id']);
+        $network = $node->getNetwork();
+    }
+
+    catch (Exception $e) {
+        $ui = new MainUI();
+        $ui->displayError($e->getMessage());
+        exit;
+    }
+} else {
+    $ui = new MainUI();
+    $ui->displayError(_("No Hotspot specified!"));
     exit;
 }
-
-// Get information about current network
-$network = $node->getNetwork();
 
 /*
@@ -90 +102 @@
  */
 $custom_portal_url = $node->getCustomPortalRedirectUrl();
+
 if (!empty($custom_portal_url) && $network->getCustomPortalRedirectAllowed()) {
     header("Location: {$custom_portal_url}");
@@ -96 +109 @@
 $node_id = $node->getId();
 $portal_template = $node_id.".html";
-Node :: setCurrentNode($node);
-
-$ui = new MainUI();
-if (isset ($session))
-{
-    if(!empty($_REQUEST['gw_id']))
+Node::setCurrentNode($node);
+
+if (isset($session)) {
+    if (!empty($_REQUEST['gw_id'])) {
         $session->set(SESS_GW_ID_VAR, $_REQUEST['gw_id']);
-
-}
-
-$tool_html = '';
-
-$tool_html .= "<h1>"._("Online users")."</h1>"."\n";
-$tool_html .= '<p class="indent">'."\n";
-$current_node = Node :: getCurrentNode();
-if ($current_node != null)
-{
-    $current_node_id = $current_node->getId();
-    $online_users = $current_node->getOnlineUsers();
-    $num_online_users = count($online_users);
-    if ($num_online_users > 0)
-    {
-        //$tool_html .= $num_online_users.' '._("other users online at this hotspot...");
-        $tool_html .= "<ul class='users_list'>\n";
-        foreach($online_users as $online_user) {
-            $tool_html .= "<li>";
-            $tool_html .= $online_user->getUsername();
-            $roles = array();
-            if ($current_node->isOwner($online_user))
-                $roles[] = _("owner");
-            if ($current_node->isTechnicalOfficer($online_user))
-                $roles[] = _("technical officer");
-            if ($roles)
-                $tool_html .= " <span class='roles'>(" . join($roles, ",") . ")</span>";
-            $tool_html .= "</li>\n";
-        }
-        $tool_html .= "</ul>\n";
-    }
-    else
-    {
-        $tool_html .= _("Nobody is online at this hotspot...");
-    }
-}
-else
-{
-    $network = Network::getCurrentNetwork();
-    $current_node_id = null;
-    $tool_html .= _("You are not currently at a hotspot...");
-}
-$tool_html .= "</p>"."\n";
-
-$tool_html .= '<script type="text/javascript">
-function getElementById(id) {
-    if (document.all) {
-    return document.getElementById(id);
-    }
-    for (i=0;i<document.forms.length;i++) {
-    if (document.forms[i].elements[id]) {return document.forms[i].elements[id]; }
-    }
-}
-
-function getWindowSize(window) {
-var size_array = new Array(2);
-  var myWidth = 0, myHeight = 0;
-  if( typeof( window.innerWidth ) == "number" ) {
-    //Non-IE
-    myWidth = window.innerWidth;
-    myHeight = window.innerHeight;
-  } else if( document.documentElement &&
-      ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-    //IE 6+ in "standards compliant mode"
-    myWidth = document.documentElement.clientWidth;
-    myHeight = document.documentElement.clientHeight;
-  } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-    //IE 4 compatible
-    myWidth = document.body.clientWidth;
-    myHeight = document.body.clientHeight;
-  }
-  size_array[0] = myWidth;
-  size_array[1] = myHeight;
-//  window.alert( "Width = " + myWidth );
-//  window.alert( "Height = " + myHeight );
-return size_array;
-}
-
-
-</script>';
-
-
-$tool_html .= '<p class="indent">'."\n";
-$tool_html .= "<a  id='wifidog_portal_expand' onclick=\"
-var wifidog_portal_expand = getElementById('wifidog_portal_expand');
-var wifidog_portal_collapse = getElementById('wifidog_portal_collapse');
-
-wifidog_portal_expand.style.display = 'none';
-wifidog_portal_collapse.style.display = 'inline';
-var size_array = getWindowSize(window.opener);
-window.resizeTo(size_array[0],size_array[1]);
-\">"._("Expand portal")."</a>"."\n";
-
-$tool_html .= "<a id='wifidog_portal_collapse' onclick=\"
-var wifidog_portal_expand = getElementById('wifidog_portal_expand');
-var wifidog_portal_collapse = getElementById('wifidog_portal_collapse');
-
-wifidog_portal_expand.style.display = 'inline';
-wifidog_portal_collapse.style.display = 'none';
-var size_array = getWindowSize(window.opener);
-window.resizeTo('".TOOLBAR_WIDTH."',size_array[1]);
-
-\">"._("Collapse portal")."</a>"."\n";
-$tool_html .= "</p>"."\n";
-
-
-
-
-    $original_url_requested=$session->get(SESS_ORIGINAL_URL_VAR);
-    if(empty($original_url_requested))
-    {
-        $url="missing_original_url.php";
-    }
-    else
-    {
-        $url=$original_url_requested;
-    }
-$tool_html .= '<p class="indent">'."\n";
-$tool_html .= "<a id='wifidog_use_internet' href='$url' onclick=\"
-var size_array = getWindowSize(window);
-var original_location=window.location.href;
-//this.target='_blank';
-var old_window = window;
-var new_window = window.open('".CURRENT_REQUEST_URL."','wifidog_portal');
-new_window.blur();
-old_window.focus();
-new_window.resizeTo('".TOOLBAR_WIDTH."',size_array[1]);
-
-//old_window.location.href='test';
-//window.moveBy(300, 300);
-/*if(window.open){alert('window.open enabled');}
-else{alert('window.open DISABLED');}*/
-
-\"><img src='" . BASE_SSL_PATH . "images/start.gif'></a>\n";
-$tool_html .= "</p>"."\n";
-
-$tool_html .= '<script type="text/javascript">
-//Set up if expand/collapse functionnality is to be enabled by checking if we were called from another portal window.
-
-window.is_wifidog_portal=true; //This assignement may be read by another window
-
-var wifidog_portal_expand = document.getElementById("wifidog_portal_expand");
-var wifidog_portal_collapse = document.getElementById("wifidog_portal_collapse");
-var wifidog_use_internet = document.getElementById("wifidog_use_internet");
-if(window.opener && window.opener.is_wifidog_portal==true)
-{
-wifidog_portal_expand.style.display = "inline";
-wifidog_portal_collapse.style.display = "none";
-wifidog_use_internet.style.display = "none";
-}
-else
-{
-wifidog_portal_expand.style.display = "none";
-wifidog_portal_collapse.style.display = "none";
-}
-</script>';
-
-$ui->setToolContent($tool_html);
-
-$hotspot_network_name = $network->getName();
-$hotspot_network_url = $network->getHomepageURL();
-$network_logo_url = COMMON_CONTENT_URL.NETWORK_LOGO_NAME;
-$network_logo_banner_url = COMMON_CONTENT_URL.NETWORK_LOGO_BANNER_NAME;
-
-$html = '';
+    }
+}
+
+$current_node = Node::getCurrentNode();
+$current_node_id = $current_node->getId();
+
+// Init ALL smarty SWITCH values
+$smarty->assign('sectionTOOLCONTENT', false);
+$smarty->assign('sectionMAINCONTENT', false);
+
+// Init ALL smarty values
+$smarty->assign('currentNode', null);
+$smarty->assign('numOnlineUsers', 0);
+$smarty->assign('onlineUsers', array());
+$smarty->assign('userIsAtHotspot', false);
+$smarty->assign('noUrl', true);
+$smarty->assign('url', "");
+$smarty->assign('accountValidation', false);
+$smarty->assign('validationTime', 20);
+$smarty->assign('hotspotNetworkUrl', "");
+$smarty->assign('hotspotNetworkName', "");
+$smarty->assign('networkLogoBannerUrl', "");
+$smarty->assign('networkContents', false);
+$smarty->assign('networkContentArray', array());
+$smarty->assign('nodeHomepage', false);
+$smarty->assign('nodeURL', "");
+$smarty->assign('nodeName', "");
+$smarty->assign('nodeContents', false);
+$smarty->assign('nodeContentArray', array());
+$smarty->assign('userContents', false);
+$smarty->assign('userContentArray', array());
+
+/*
+ * Tool content
+ */
+
+// Set section of Smarty template
+$smarty->assign('sectionTOOLCONTENT', true);
+
+// Set details about node
+$smarty->assign('currentNode', $current_node);
+
+// Set details about onlineusers
+$online_users = $current_node->getOnlineUsers();
+$num_online_users = count($online_users);
+
+foreach ($online_users as $online_user) {
+    $roles = array();
+
+    if ($current_node->isOwner($online_user)) {
+        $roles[] = _("owner");
+    }
+
+    if ($current_node->isTechnicalOfficer($online_user)) {
+        $roles[] = _("technical officer");
+    }
+
+    if ($roles) {
+        $rolenames = join($roles, ",");
+    }
+
+    $online_user_array[] = array('Username' => $online_user->getUsername(), 'showRoles' => count($roles) > 0, 'roles' => $rolenames);
+}
+
+$smarty->assign('numOnlineUsers', $num_online_users);
+
+if ($num_online_users > 0) {
+    $smarty->assign('onlineUsers', $online_user_array);
+}
+
+// Check for requested URL and if user is at a hotspot
+$original_url_requested = $session->get(SESS_ORIGINAL_URL_VAR);
+
+$smarty->assign('userIsAtHotspot', Node::getCurrentRealNode() != null ? true : false);
+
+if (empty($original_url_requested)) {
+    $smarty->assign('noUrl', true);
+    $smarty->assign('url', "?missing=url");
+} else {
+    $smarty->assign('noUrl', true);
+    $smarty->assign('url', $original_url_requested);
+}
+
+// Compile HTML code
+$tool_html = $smarty->fetch("templates/sites/portal.tpl");
+
+/*
+ * Main content
+ */
+
+// Reset ALL smarty SWITCH values
+$smarty->assign('sectionTOOLCONTENT', false);
+$smarty->assign('sectionMAINCONTENT', false);
+
+// Set section of Smarty template
+$smarty->assign('sectionMAINCONTENT', true);
 
 // While in validation period, alert user that he should validate his account ASAP
-if($current_user && $current_user->getAccountStatus() == ACCOUNT_STATUS_VALIDATION)
-    $html .= "<div id='warning_message_area'>"._('An email with confirmation instructions was sent to your email address.  Your account has been granted 15 minutes of access to retrieve your email and validate your account.')."</div>";
-
-$html .= "<div id='portal_container'>\n";
-
-
-/* Network section */
-
-$html .= "<div class='portal_network_section'>\n";
-$html .= "<a href='{$hotspot_network_url}'><img class='portal_section_logo' alt='{$hotspot_network_name} logo' src='{$network_logo_banner_url}' border='0'></a>\n";
+if ($current_user && $current_user->getAccountStatus() == ACCOUNT_STATUS_VALIDATION) {
+    $smarty->assign('accountValidation', true);
+    $smarty->assign('validationTime', ($current_user->getNetwork()->getValidationGraceTime() / 60));
+}
+
+/*
+ * Network section
+ */
+
+// Set network details
+$smarty->assign('hotspotNetworkUrl', $network->getHomepageURL());
+$smarty->assign('hotspotNetworkName', $network->getName());
+$smarty->assign('networkLogoBannerUrl', COMMON_CONTENT_URL . NETWORK_LOGO_BANNER_NAME);
+
 // Get all network content and EXCLUDE user subscribed content
-if($current_user)
-    $contents = Network :: getCurrentNetwork()->getAllContent(true, $current_user);
-else
-    $contents = Network :: getCurrentNetwork()->getAllContent();
-if ($contents)
-{
-    foreach ($contents as $content)
-    {
-        if ($content->isDisplayableAt($node))
-        {
-            $html .= "<div class='portal_content'>\n";
-            $html .= $content->getUserUI();
-            $html .= "</div>\n";
-        }
-    }
-}
-$html .= "</div>\n";
-
-/* Node section */
+if ($current_user) {
+    $contents = Network::getCurrentNetwork()->getAllContent(true, $current_user);
+} else {
+    $contents = Network::getCurrentNetwork()->getAllContent();
+}
+
+if ($contents) {
+    foreach ($contents as $content) {
+        $contentArray[] = array('isDisplayableAt' => $content->isDisplayableAt($node), 'userUI' => $content->getUserUI());
+    }
+
+    // Set all content of current node
+    $smarty->assign('networkContents', true);
+    $smarty->assign('networkContentArray', $contentArray);
+}
+
+/*
+ * Node section
+ */
+
 // Get all node content and EXCLUDE user subscribed content
-if($current_user)
+if ($current_user) {
     $contents = $node->getAllContent(true, $current_user);
-else
+} else {
     $contents = $node->getAllContent();
-
-if(!empty($contents))
-{
-    $html .= "<div class='portal_node_section'>\n";
-    $html .= "<span class='portal_section_title'>"._("Content from:")." ";
-    $node_homepage = $node->getHomePageURL();
-    if (!empty ($node_homepage))
-    {
-        $html .= "<a href='$node_homepage'>";
-    }
-    $html .= $node->getName();
-    if (!empty ($node_homepage))
-    {
-        $html .= "</a>\n";
-    }
-    $html .= "</span>";
-    foreach ($contents as $content)
-    {
+}
+
+// Set homepage details of node
+$node_homepage = $node->getHomePageURL();
+if (!empty($node_homepage)) {
+    $smarty->assign('nodeHomepage', true);
+    $smarty->assign('nodeURL', $node_homepage);
+    $smarty->assign('nodeName', $node->getName());
+}
+
+if ($contents) {
+    foreach ($contents as $content) {
         // Check for content requirements to show the "Show all contents" link
         if (!$show_more_link) {
@@ -334 +275 @@
         }
 
-        if ($content->isDisplayableAt($node)) {
-            $html .= "<div class='portal_content'>\n";
-            $html .= $content->getUserUI();
-            $html .= "</div>\n";
+        $contentArray[] = array('isDisplayableAt' => $content->isDisplayableAt($node), 'userUI' => $content->getUserUI());
+    }
+
+    // Set all content of current node
+    $smarty->assign('nodeContents', true);
+    $smarty->assign('nodeContentArray', $contentArray);
+}
+
+/*
+ * User section
+ */
+
+if ($current_user) {
+    $contents = User::getCurrentUser()->getAllContent();
+
+    if ($contents) {
+        foreach ($contents as $content) {
+            $contentArray[] = array('userUI' => $content->getUserUI());
         }
-    }
-    $html .= "</div>\n";
-}
-
-/* User section */
-if($current_user)
-{
-    $contents = User :: getCurrentUser()->getAllContent();
-    if($contents)
-    {
-        $html .= "<div class='portal_user_section'>\n";
-        $html .= "<h1>"._("My content")."</h1>\n";
-        foreach ($contents as $content)
-        {
-            $html .= "<div class='portal_content'>\n";
-            $html .= $content->getUserUI();
-            $html .= "</div>\n";
-        }
-        $html .= "</div>\n";
+
+        // Set all content of current node
+        $smarty->assign('userContents', true);
+        $smarty->assign('userContentArray', $contentArray);
     }
 }
@@ -363 +303 @@
 // Hyperlinks to full content display page
 if ($show_more_link) {
-    $html .= "<a href='" . BASE_SSL_PATH . "content/?gw_id={$current_node_id}'>"._("Show all available contents for this hotspot")."</a>"."\n";
-}
-
-$html .= "<div style='clear:both;'></div>";
-$html .= "</div>\n";
-
-$ui->setMainContent($html);
+    $smarty->assign('showMoreLink', true);
+    $smarty->assign('currentNodeId', $current_node_id);
+}
+
+// Compile HTML code
+$html_body = $smarty->fetch("templates/sites/portal.tpl");
+
+/*
+ * Render output
+ */
+
+$ui = new MainUI();
+$ui->setToolContent($tool_html);
+$ui->setMainContent($html_body);
 $ui->display();
 

trunk/wifidog-auth/wifidog/templates/generic_error.html

@@ -1 @@
-<p>
-{$error}
-</p>
+<div id="warning_message_area">{$error}</div>
 
-<p>
-{"Please get in touch with "|_} <a href="mailto:{$tech_support_email}">{$tech_support_email}</a>.
-</p>
+{if $show_tech_support_email}
+    <p>{"Please get in touch with "|_} <a href="mailto:{$tech_support_email}">{$tech_support_email}</a>.</p>
+{/if}