Changeset 1156

Timestamp:

12/31/06 00:25:37 (5 years ago)

Author:

benoitg

Message:

• install.php: Move path verification to the first page, and make it clearer. Fix PHP warnings.
• wifidog/include/smarty.resource.string.php: A smarty resource plugin to parse a smarty template from a

string

• SmartyTemplate?: Very basic but functionnal commit of the new Smarty content type. IMPORTANT NOTE: This will eventually obsolete IFrameRest, which will be removed.
• Continue cleaning-up/standardizing Smarty variable usage.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/change_password.php (modified) (1 diff)
• wifidog/classes/Content/IFrameRest/IFrameRest.php (modified) (1 diff)
• wifidog/classes/Content/SmartyTemplate (added)
• wifidog/classes/Content/SmartyTemplate/SmartyTemplate.php (added)
• wifidog/classes/MainUI.php (modified) (4 diffs)
• wifidog/classes/Node.php (modified) (1 diff)
• wifidog/classes/SmartyWifidog.php (modified) (4 diffs)
• wifidog/help.php (modified) (1 diff)
• wifidog/include/smarty.resource.string.php (added)
• wifidog/index.php (modified) (1 diff)
• wifidog/install.php (modified) (4 diffs)
• wifidog/login/index.php (modified) (1 diff)
• wifidog/portal/index.php (modified) (4 diffs)
• wifidog/templates/sites/login.tpl (modified) (1 diff)
• wifidog/templates/sites/portal.tpl (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-12-30 Benoit Grégoire  <bock@step.polymtl.ca>
+        * install.php:  Move path verification to the first page, and make it clearer.  Fix PHP warnings.
+        * wifidog/include/smarty.resource.string.php:  A smarty resource plugin to parse a smarty template from a string
+        * SmartyTemplate:  Very basic but functionnal commit of the new Smarty content type.  
+        IMPORTANT NOTE:  This will eventually obsolete IFrameRest, which will be removed.
+        * Continue cleaning-up/standardizing Smarty variable usage.
+        
+2006-12-12 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Fix all PHP 5.2 compatibility issues I could find.  This needs further testing
+
 2006-12-12 Pascal Charest <pascal.charest@gmail.com>
         * install.php: Remove obsolete Phlickr installation references

trunk/wifidog-auth/wifidog/change_password.php

@@ -65 +65 @@
 $user = User::getCurrentUser();
 if ($user) {
-        User::assignSmartyValues($smarty, $user);
 
         if ($user->isSuperAdmin() && isset($_REQUEST['username'])) {

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

@@ -110 +110 @@
      * @return string HTML code for the administration interface
      */
-    public function getAdminUI()
+    public function getAdminUI($subclass_admin_interface = null, $title=null)
     {
         // Init values

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

@@ -402 +402 @@
 
                 // Init ALL smarty values
-                User :: assignSmartyValues($this->smarty, $_currentUser);
                 $this->smarty->assign('formAction', "");
                 $this->smarty->assign('nodeUI', "");
@@ -475 +474 @@
         $_currentUser = User :: getCurrentUser();
 
-        User :: assignSmartyValues($this->smarty, $_currentUser);
-
         $this->smarty->assign('logoutParameters', "");
         $this->smarty->assign('loginParameters', "");
@@ -484 +481 @@
         $this->smarty->assign('techSupportInformation', "");
         $this->smarty->assign('shrinkLeftArea', $this->_shrinkLeftArea);
-
-        // Provide Smarty with information about the network
-        Network :: assignSmartyValues($this->smarty);
 
         /*
@@ -596 +590 @@
          */
 
-        // Get information about user
-        User :: assignSmartyValues($this->smarty);
-
         // Provide footer scripts to Smarty
         $this->smarty->assign('footerScripts', $this->_footerScripts);

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

@@ -1555 +1555 @@
         }
 
+    /**
+     * Assigns values about node to be processed by the Smarty engine.
+     *
+     * @param object $smarty Smarty object
+     * @param object $net    Node object
+     *
+     * @return void
+     *
+     * @static
+     * @access public
+     */
+    public static function assignSmartyValues($smarty, $node = null)
+    {
+        if (!$node) {
+            $node = self::getCurrentNode();
+        }
+
+        // Set network details
+        $smarty->assign('nodeId', $node ? $node->getId() : '');
+        $smarty->assign('nodeName', $node ? $node->getName() : '');
+    }
 }
 

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

@@ -46 +46 @@
  */
 require_once("classes/Locale.php");
+require_once("include/smarty.resource.string.php");
 
 // Check if Smarty installed, if not redirect user to web-base installation
@@ -123 +124 @@
  */
 class SmartyWifidog extends Smarty {
-    private static $object;
     public static function getObject() {
-        if (self::$object==null)
-        {
-                self::$object=new self();
-        }
-        return self::$object;
+        return new self();
     }
    private function __construct()
@@ -152 +148 @@
         $this->register_modifier("fsize_format", "smarty_modifier_fsize_format");
 
+                // register the resource name "string"
+                $this->register_resource("string", array("smarty_resource_string_source",
+                                       "smarty_resource_string_timestamp",
+                                       "smarty_resource_string_secure",
+                                       "smarty_resource_string_trusted"));
         $this->caching = false;
         //$this->compile_check = true;
-        $this->assign('app_name','Wifidog auth server');
-
-    /* We need this for various forms to redirect properly (language form) */
-    $this->assign('request_uri', $_SERVER["REQUEST_URI"]);
 
 /* Common content */
@@ -172 +169 @@
 
      /* Other useful stuff */
-     $this->assign('userIsAtHotspot', Node::getCurrentRealNode() != null ? true : false);
-
-     $this->assign('currentLocale', Locale::getCurrentLocale());
+$this->assign('userIsAtHotspot', Node :: getCurrentRealNode() != null ? true : false);
+Network::assignSmartyValues($this);
+Node::assignSmartyValues($this);
+User::assignSmartyValues($this);
    }
 

trunk/wifidog-auth/wifidog/help.php

@@ -53 +53 @@
 require_once('classes/Network.php');
 $smarty = SmartyWifidog::getObject();
-Network::assignSmartyValues($smarty);
 $smarty->assign('read_the_faq',
         sprintf('Read the <a href="%sfaq.php">faq</a> document for more information.', BASE_URL_PATH));

trunk/wifidog-auth/wifidog/index.php

@@ -67 +67 @@
 // Get information about network
 $network = Network::getCurrentNetwork();
-Network::assignSmartyValues($smarty, $network);
-
-// Get information about user
-User::assignSmartyValues($smarty);
 
 /*

trunk/wifidog-auth/wifidog/install.php

@@ -314 +314 @@
         function execVerbose($command, & $output, & $return_var, $always_show_output = true) {
             print "$command";
-            $retval = exec($command.'  2>&1', & $output, & $return_var);
+            $retval = exec($command.'  2>&1', $output, $return_var);
             if ($return_var != 0)
             print "<p style='color:red'><em>Error:</em>  Command did not complete successfully  (returned $return_var): <br/>\n";
@@ -444 +444 @@
                 $error = 0;
 
-                print "<p><em>Installation directory (WIFIDOG_ABS_FILE_PATH)</em>: " . WIFIDOG_ABS_FILE_PATH . "</p>";
-                print "<p><em>Note:</em> Please validate that 'Installation directory' value is the right one. If this value is wrong, the PATH automatic detection will not work as properly";
                 print "<p><em>HTTP daemon UNIX username/group</em>: $process_username/$process_group</p>";
                 #    print "<p><em>HTTPD group</em>: $process_group<BR</p>";
@@ -1422 +1420 @@
         $WIFIDOG_VERSION = $configArray['WIFIDOG_VERSION'];
         # TODO : Add links to auth-server web documents
-        print<<<EndHTML
+print<<<EndHTML
 <h1>Welcome to WifiDog Auth-Server installation and configuration script.</h1>
 <p>This installation still needs improvement, so please any report bug to the mailing list for better support.<BR/>
 The current auth-server version is <em>$WIFIDOG_VERSION</em>.</p>
 
-<p><strong>Before going any further</strong> with this installation you need to have/create a valid user and database.
-<p>Here is a command line example for PostgreSQL (or use the way you like) :</p>
-
+<p><strong>Before going any further</strong> with this installation you need to do the following:\n
+<h2>1-Make sure you created a valid user and database.</h2>
+<p>If you haven't, here is a command line example for PostgreSQL (or use the way you like) :</p>
 <em>Create the PostgreSQL databaser user for WifiDog</em> (createuser and createdb need to be in you PATH) :
 <pre>  <I>postgres@yourserver $></I> createuser wifidog --pwprompt
@@ -1438 +1436 @@
   CREATE USER
 </pre>
-
 <em>Create the WifiDog database</em>
 <pre>  <I>postgres@yourserver $></I> createdb wifidog --encoding=UTF-8 --owner=wifidog
   CREATE DATABASE
 </pre>
-
-<em>Security</em> : A password is needed to continue with the installation. You need to read the random password in <em>$password_file</em> file. No username needed, only the password. This password is only usefull for the installation, you will never use it in Auth-Server administration pages.
+<h2>2-Check that the paths were autodected properly</h2>
+EndHTML;
+                echo "<table>\n";
+                echo "<tr><td>Absolute path to the /wifidog directory (WIFIDOG_ABS_FILE_PATH):</td><td>" . WIFIDOG_ABS_FILE_PATH . "</td></tr>\n";
+                                echo "<tr><td>URL path to reach the /wifidog directory with a web browser (SYSTEM_PATH): </td><td>" . SYSTEM_PATH . "</td></tr>\n";
+                echo "<tr><td colspan=2><em>Please verify the two values above.</em> They should be autodectected correctly by wifidog in path_defines_base.php.  If there is a bug and they are not, you need to override them in config.php (or find the bug), or your auth server will not work properly.  </td></tr></table>\n";
+print<<<EndHTML
+<h2>3-Retrieve the install password</h2>
+A password is needed to continue with the installation. You need to read the random password in <em>$password_file</em> file. No username needed, only the password. This password is only usefull for the installation, you will never use it in Auth-Server administration pages.
 </pre>
 

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

@@ -242 +242 @@
 
 // Set details about node
-$smarty->assign('node', $node);
 $smarty->assign('gw_address', $gw_address);
 $smarty->assign('gw_port', $gw_port);

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

@@ -135 +135 @@
 $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('currentUrl', "");
-$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
@@ -184 +152 @@
 
  */
-$smarty->assign('numOnlineUsers', $num_online_users);
-
+$smarty->assign('onlineUsers', array ());
 if ($num_online_users > 0) {
     $smarty->assign('onlineUsers', $online_user_array);
@@ -192 +159 @@
 // 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)) {
@@ -199 +164 @@
     $smarty->assign('url', "?missing=url");
 } else {
-    $smarty->assign('noUrl', true);
+    $smarty->assign('noUrl', false);
     $smarty->assign('url', $original_url_requested);
 }
-
-// Assign current request url
-$smarty->assign('currentUrl', CURRENT_REQUEST_URL);
 
 // Compile HTML code

trunk/wifidog-auth/wifidog/templates/sites/login.tpl

@@ -50 +50 @@
         <form name="login_form" action="{$base_ssl_path}login/index.php" method="post" onsubmit="return validateForm(this);">
                         <input type="hidden" name="form_request" value="login">
-            {if $node != null}
+            {if $gw_address != null}
                 <input type="hidden" name="gw_address" value="{$gw_address}">
+            {/if}
+            {if $gw_port != null}
                 <input type="hidden" name="gw_port" value="{$gw_port}">
+            {/if}
+            {if $gw_id != null}
                 <input type="hidden" name="gw_id" value="{$gw_id}">
             {/if}

trunk/wifidog-auth/wifidog/templates/sites/portal.tpl

@@ -49 +49 @@
 
     <p class="indent">
-        {if $currentNode != null}
-            {if ($numOnlineUsers > 0)}
-                {if ($numOnlineUsers == 1)}
+        {if $nodeId != null}
+            {if ($networkNumOnlineUsers > 0)}
+                {if ($networkNumOnlineUsers == 1)}
                     1 {"user is online at this hotspot"|_}
                 {else}
-                    {$numOnlineUsers} {"users are online at this hotspot"|_}
+                    {$networkNumOnlineUsers} {"users are online at this hotspot"|_}
                 {/if}