Changeset 1020

Timestamp:

04/24/06 14:42:01 (7 years ago)

Author:

benoitg

Message:

• Revert Rob's SYSTEM_PATH change. Sorry about that. The devs spent hours to finally get the PATH stuff consistent and fixing the countless bugs that this process introduced. Maybe some links still need to use BASE_URL_PATH instead of BASE_SSL_PATH, (or vice-versa) but it was on purpose that SYSTEM_PATH was not made available to Smarty. We already have 3 defines to be used for links and html refs, that's enough BASE_SSL_PATH should be used to enter SSL mode (if available) BASE_NON_SSL_PATH should be used to break out of SSL mode of when we explicitely do not want someting to be referenced over http BASE_URL_PATH should be used in all other cases to avoid needless SSL warning

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/NodeLists/NodeListRSS.php (modified) (1 diff)
• wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• wifidog/config.php (modified) (1 diff)
• wifidog/help.php (modified) (1 diff)
• wifidog/include/path_defines_url_content.php (modified) (3 diffs)
• wifidog/include/schema_validate.php (modified) (1 diff)
• wifidog/local_content/default/stylesheet.css (modified) (3 diffs)
• wifidog/login/index.php (modified) (1 diff)
• wifidog/templates/classes/MainUI_Display.tpl (modified) (1 diff)
• wifidog/templates/classes/MainUI_ToolContent.tpl (modified) (1 diff)
• wifidog/templates/classes/MainUI_ToolSection.tpl (modified) (4 diffs)
• wifidog/templates/sites/index.tpl (modified) (2 diffs)
• wifidog/templates/sites/login.tpl (modified) (1 diff)
• wifidog/templates/sites/lost_password.tpl (modified) (1 diff)
• wifidog/templates/sites/lost_username.tpl (modified) (1 diff)
• wifidog/templates/sites/resend_validation.tpl (modified) (1 diff)
• wifidog/templates/sites/signup.tpl (modified) (2 diffs)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-04-24 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Revert Rob's SYSTEM_PATH change.  Sorry about that.  The devs spent hours to finally get the PATH
+         stuff consistent and fixing the countless bugs that this process introduced. 
+         Maybe some links still need to use BASE_URL_PATH instead of BASE_SSL_PATH,
+        (or vice-versa) but it was on purpose that SYSTEM_PATH was not made available to Smarty.  
+        We already have 3 defines to be used for links and html refs, that's enough
+         BASE_SSL_PATH should be used to enter SSL mode (if available)
+         BASE_NON_SSL_PATH should be used to break out of SSL mode of when we
+         explicitely do not want someting to be referenced over http
+         BASE_URL_PATH should be used in all other cases to avoid needless SSL warning
+        
 2006-04-17 Rob Janes <janes.rob@gmail.com>
         * javascript for validating and navigating forms.

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

@@ -320 +320 @@
                 if ($_node->getDeploymentStatus() != 'NON_WIFIDOG_NODE') {
                     if ($_nodeData['is_up'] == 't') {
-                        $_descriptionText .= "<img src='" . SYSTEM_PATH . "images/HotspotStatus/up.gif' alt='' />";
+                        $_descriptionText .= "<img src='" . BASE_URL_PATH . "images/HotspotStatus/up.gif' alt='' />";
                     } else {
-                        $_descriptionText .= "<img src='" . SYSTEM_PATH . "images/HotspotStatus/down.gif' alt='' />";
+                        $_descriptionText .= "<img src='" . BASE_URL_PATH . "images/HotspotStatus/down.gif' alt='' />";
                     }
                 }

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

@@ -121 +121 @@
 /* Useful stuff from config.php */
 
-        $this->assign('system_path', SYSTEM_PATH);
         $this->assign('base_url_path', BASE_URL_PATH);
         $this->assign('base_ssl_path', BASE_SSL_PATH);

trunk/wifidog-auth/wifidog/config.php

@@ -183 +183 @@
 
 /**
- * Other linux distributions use locales like this:
+ * Other linux distributions (Ubuntu, Mandriva 10.1) use locales like this:
  */
 $AVAIL_LOCALE_ARRAY = array('fr_CA.UTF8' => 'Français',

trunk/wifidog-auth/wifidog/help.php

@@ -55 +55 @@
 Network::assignSmartyValues($smarty);
 $smarty->assign('read_the_faq',
-        sprintf('Read the <a href="%sfaq.php">faq</a> document for more information.', SYSTEM_PATH));
+        sprintf('Read the <a href="%sfaq.php">faq</a> document for more information.', BASE_URL_PATH));
 
 $ui = new MainUI();

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

@@ -43 +43 @@
  */
 
-/* This section deals with PATHs used in URLs and local content */
+/* This section deals with PATHs used in URLs and local content
+ * BASE_SSL_PATH should be used to enter SSL mode (if available)
+ * BASE_NON_SSL_PATH should be used to break out of SSL mode of when we
+ * explicitely do not want someting to be referenced over http
+ * BASE_URL_PATH should be used in all other cases to avoid needless SSL warning
+ * 
+ *   */
 
 /**
@@ -81 +87 @@
 }
 
-/* If we actually ARE in SSL mode, make all URLS http:// to avoid security warnings. */
-// no no no just use the SYSTEM_PATH ... use /login/index.php rather than http://auth.wirelesstoronto.ca/login/index.php
-// if (isset ($_SERVER['HTTPS'])) {
-//    /**
-//     * Define base web address to use (this time using SLL)
-//     */
-//    define('BASE_URL_PATH', BASE_SSL_PATH);
-// }
-// else {
+/* If we actually ARE in SSL mode, make all URLS https:// to avoid security warnings. */
+ if (isset ($_SERVER['HTTPS'])) {
+    /**
+     * Define base web address to use (this time using SLL)
+     */
+    define('BASE_URL_PATH', BASE_SSL_PATH);
+ }
+ else {
     /**
      * Define base web address to use
@@ -96 +101 @@
      */
     define('BASE_URL_PATH', BASE_NON_SSL_PATH);
-// }
+ }
+
+
+/***************************************************************************************************
+ *  NOTE:  This stuff has to go elsewhere or be removed as part of the layout system refactoring.   
+ * benoitg, 24/04/2006 
+ * ***************************************************************************************/
+
 
 /**

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

@@ -73 +73 @@
         echo "<html><body>";
         echo "<h1>"._("Unable to retrieve schema version. The database schema is too old to be updated.")."</h1>";
-        echo "<h2>"._("Try running the")." <a href='" . SYSTEM_PATH . "install.php'>"._("installation script")."</a>.</h2>\n";
+        echo "<h2>"._("Try running the")." <a href='" . BASE_URL_PATH . "install.php'>"._("installation script")."</a>.</h2>\n";
         echo "</html></body>";
         exit ();

trunk/wifidog-auth/wifidog/local_content/default/stylesheet.css

@@ -11 +11 @@
 .bodyBackColor {
 {/literal}
-        background : #dbffa8 url({$system_path}images/bg_body.gif) repeat-x fixed 0px 0px;
+        background : #dbffa8 url({$base_url_path}images/bg_body.gif) repeat-x fixed 0px 0px;
 {literal}
 }
@@ -17 +17 @@
 div.navigation {
 {/literal}
-        background-image: url({$system_path}images/01_nav.gif);
+        background-image: url({$base_url_path}images/01_nav.gif);
 {literal}
 }
@@ -23 +23 @@
 div.avis{
 {/literal}
-        background-image: url({$system_path}images/03_avis.gif);
+        background-image: url({$base_url_path}images/03_avis.gif);
 {literal}
 }

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

@@ -124 +124 @@
 
 if (isset($_REQUEST["form_signup"]) && $_REQUEST["form_signup"] == $create_a_free_account) {
-        MainUI::redirect(SYSTEM_PATH . "signup.php");
+        MainUI::redirect(BASE_URL_PATH . "signup.php");
         exit;
 }

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

@@ -60 +60 @@
 
                 <link rel="stylesheet" type="text/css" href="{$stylesheetURL}">
-                <script src="{$system_path}js/formutils.js"></script>
+                <script src="{$base_url_path}js/formutils.js"></script>
 
         <style type="text/css">

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

@@ -55 +55 @@
                 {if $isValidUser}
                     <p>{"Logged in as"|_}: {$username}</p>
-                    <a class="administration" href="{$system_path}user_profile.php"><img class="administration" src="{$system_path}images/profile.gif">{"My Profile"|_}</a>
-                    <a class="administration" href="{$system_path}login/?logout=true{$logoutParameters}"><img class="administration" src="{$system_path}images/logout.gif">{"Logout"|_}</a>
+                    <a class="administration" href="{$base_ssl_path}user_profile.php"><img class="administration" src="{$base_url_path}images/profile.gif">{"My Profile"|_}</a>
+                    <a class="administration" href="{$base_ssl_path}login/?logout=true{$logoutParameters}"><img class="administration" src="{$base_url_path}images/logout.gif">{"Logout"|_}</a>
                 {else}
                                         {if !$shrinkLeftArea}
                     <p>
                         {"I am not logged in."|_}<br>
-                        <a href="{$system_path}login/{$loginParameters}">{"Login"|_}</a>
+                        <a href="{$base_ssl_path}login/{$loginParameters}">{"Login"|_}</a>
                     </p>
                                         {/if}
 
-                    <a class="administration" href="{$networkHomepageURL}"><img class="administration" src="{$system_path}images/lien_ext.gif">{$networkName}</a>
-                    <a class="administration" href="{$system_path}faq.php"><img class="administration" src="{$system_path}images/where.gif">{"Where am I?"|_}</a>
+                    <a class="administration" href="{$networkHomepageURL}"><img class="administration" src="{$base_url_path}images/lien_ext.gif">{$networkName}</a>
+                    <a class="administration" href="{$base_url_path}faq.php"><img class="administration" src="{$base_url_path}images/where.gif">{"Where am I?"|_}</a>
                 {/if}
             </span>

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

@@ -57 +57 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$system_path}admin/user_log.php">{"User logs"|_}</a></li>
-                        <li><a href="{$system_path}admin/online_users.php">{"Online Users"|_}</a></li>
-                        <li><a href="{$system_path}admin/stats.php">{"Statistics"|_}</a></li>
-                        <li><a href="{$system_path}admin/import_user_database.php">{"Import NoCat user database"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/user_log.php">{"User logs"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/online_users.php">{"Online Users"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/stats.php">{"Statistics"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/import_user_database.php">{"Import NoCat user database"|_}</a></li>
                     </ul>
                 </div>
@@ -87 +87 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Node&action=list">{"Nodes"|_}</a></li>
-                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Node&action=new_ui">{"Add new Node"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Node&action=list">{"Nodes"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Node&action=new_ui">{"Add new Node"|_}</a></li>
                     </ul>
                 </div>
@@ -100 +100 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Network&action=list">{"Networks"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Network&action=list">{"Networks"|_}</a></li>
                     </ul>
                 </div>
@@ -110 +110 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Server&action=list">{"Servers"|_}</a></li>
-                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Content&action=list">{"Content"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Server&action=list">{"Servers"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Content&action=list">{"Content"|_}</a></li>
                     </ul>
                 </div>

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

@@ -54 +54 @@
         <ul>
                         {if $isValidUser}
-            <li><a href="{$system_path}change_password.php">{"Change password"|_}</a></li>
+            <li><a href="{$base_ssl_path}change_password.php">{"Change password"|_}</a></li>
                         {else}
-            <li><a href="{$system_path}faq.php">{"I have trouble connecting and I would like some help"|_}</a></li>
+            <li><a href="{$base_url_path}faq.php">{"I have trouble connecting and I would like some help"|_}</a></li>
                         {/if}
         </ul>
@@ -102 +102 @@
     <ul>
         {if $googleMapsEnabled && !$userIsAtHotspot}
-            <li><a href="{$system_path}hotspots_map.php">{"Deployed HotSpots map"|_}</a></li>
+            <li><a href="{$base_url_path}hotspots_map.php">{"Deployed HotSpots map"|_}</a></li>
         {/if}
-        <li><a href="{$system_path}hotspot_status.php">{"Deployed HotSpots status with coordinates"|_}</a></li>
-        <li><a href="{$system_path}node_list.php">{"Full node technical status (includes non-deployed nodes)"|_}</a></li>
-        <li><a href="{$system_path}admin/index.php">{"Administration"|_}</a></li>
+        <li><a href="{$base_url_path}hotspot_status.php">{"Deployed HotSpots status with coordinates"|_}</a></li>
+        <li><a href="{$base_url_path}node_list.php">{"Full node technical status (includes non-deployed nodes)"|_}</a></li>
+        <li><a href="{$base_url_path}admin/index.php">{"Administration"|_}</a></li>
     </ul>
 {*

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

@@ -90 +90 @@
 
         <ul>
-            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$base_url_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$base_url_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$base_url_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$base_url_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>

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

@@ -59 +59 @@
 
         <ul>
-            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$base_url_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$base_url_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$base_url_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$base_url_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>

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

@@ -59 +59 @@
 
         <ul>
-            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$base_url_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$base_url_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$base_url_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$base_url_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>

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

@@ -59 +59 @@
 
         <ul>
-            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$base_url_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$base_url_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$base_url_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$base_url_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>

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

@@ -59 +59 @@
 
         <ul>
-                <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-                <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-                <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-                <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
+                <li><a href="{$base_url_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+                <li><a href="{$base_url_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+                <li><a href="{$base_url_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+                <li><a href="{$base_url_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
 </div>
@@ -128 +128 @@
         <b>{"You can also use the following links if you need help"|_}:</b>
         <ul>
-            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$base_url_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$base_url_path}lost_password.php">{"I Forgot my password"|_}</a></li>
         </ul>
     </p>