Changeset 1042

Timestamp:

05/20/06 16:28:27 (7 years ago)

Author:

benoitg

Message:

* page.php: Fix bugs in various files preventing the system from
working from the command line.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/GenericObject.php (modified) (1 diff)
• wifidog/classes/Server.php (modified) (5 diffs)
• wifidog/cron/page.php (modified) (1 diff)
• wifidog/include/common.php (modified) (5 diffs)
• wifidog/include/path_defines_base.php (modified) (4 diffs)
• wifidog/media/base_theme/stylesheet.css (modified) (3 diffs)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
+        * page.php:  Fix bugs in various files preventing the system from working from the command line.
+
 2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
         * More install script fixes:  Phlickr wouldn't install, and the permissions of wifidog/tmp/smarty/cache weren't checked.

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

@@ -45 +45 @@
  * Load content classes
  */
-require_once('classes/Content.php');
 
 /**

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

@@ -46 +46 @@
  */
 require_once('classes/GenericObject.php');
-require_once('classes/User.php');
 
 /**
@@ -208 +207 @@
         public static function getCurrentServer($siltent = false)
         {
+        if(empty($_SERVER['SERVER_NAME']))
+        {
+            return null; //We were probably called from the command line
+        }
             // Define globals
                 global $db;
@@ -390 +393 @@
         public static function processCreateNewObjectUI()
         {
+        require_once('classes/User.php');
             // Init values
                 $_retVal = null;
@@ -775 +779 @@
         public function processAdminUI()
         {
+        require_once('classes/User.php');
                 if (!User::getCurrentUser()->isSuperAdmin()) {
                         throw new Exception(_('Access denied!'));
@@ -823 +828 @@
         public function delete(&$errmsg)
         {
-            // Define globals
+            require_once('classes/User.php');
+        // Define globals
                 global $db;
 

trunk/wifidog-auth/wifidog/cron/page.php

@@ -45 +45 @@
  * Load required files
  */
+
 require_once(dirname(__FILE__) . '/../include/common.php');
 

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

@@ -50 +50 @@
  * Include configuration file
  */
+ /** search parent directory hierarchy for a file */
+function cmnSearchParentDirectories($dirname, $searchfor) {
+    $pieces = explode(DIRECTORY_SEPARATOR, $dirname);
+    $is_absolute = substr($dirname, 0, 1) === DIRECTORY_SEPARATOR ? 1 : 0;
+
+    for ($i = count($pieces); $i > $is_absolute; $i --) {
+        $filename = implode(DIRECTORY_SEPARATOR, array_merge(array_slice($pieces, 0, $i), array ($searchfor)));
+        if (file_exists($filename))
+            return $filename;
+    }
+
+    return false;
+}
+ function cmnRequireConfig($config_file = 'config.php') {
+    global $AVAIL_LOCALE_ARRAY; // so that nobody has to change their custom config.php
+    $config_path = cmnSearchParentDirectories(dirname(__FILE__), $config_file);
+    if (!empty ($config_path))
+        require_once ($config_path);
+}
 cmnRequireConfig();
 
@@ -82 +101 @@
 require_once('classes/Dependencies.php');
 require_once('classes/Server.php');
-
+ echo "test\n";
 global $db;
 
@@ -108 +127 @@
 
 /**
- * Set paths
- */
+ * Set the URL paths, but only if we are NOT called from the command line
+ */
+if (defined('SYSTEM_PATH'))
+{
 require_once('path_defines_url_content.php');
+}
 
 /* Constant shared with the gateway
@@ -210 +232 @@
 }
 
-/** search parent directory hierarchy for a file */
-function cmnSearchParentDirectories($dirname, $searchfor) {
-    $pieces = explode(DIRECTORY_SEPARATOR, $dirname);
-    $is_absolute = substr($dirname, 0, 1) === DIRECTORY_SEPARATOR ? 1 : 0;
-
-    for ($i = count($pieces); $i > $is_absolute; $i --) {
-        $filename = implode(DIRECTORY_SEPARATOR, array_merge(array_slice($pieces, 0, $i), array ($searchfor)));
-        if (file_exists($filename))
-            return $filename;
-    }
-
-    return false;
-}
+
 
 /** join file path pieces together */
@@ -310 +320 @@
 
     return false; // package was not found
-}
-
-function cmnRequireConfig($config_file = 'config.php') {
-    global $AVAIL_LOCALE_ARRAY; // so that nobody has to change their custom config.php
-    $config_path = cmnSearchParentDirectories(dirname(__FILE__), $config_file);
-    if (!empty ($config_path))
-        require_once ($config_path);
 }
 

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

@@ -68 +68 @@
  */
 
+
 /*
  * Tests ...
  *
-
 echo '$_SERVER[\'DOCUMENT_ROOT\']: ' . $_SERVER['DOCUMENT_ROOT'] . '<br/>';
 // Not always available on Windows
@@ -93 +93 @@
 echo "<br/>";
 
- *
- *
- *
-
 // This will never work for subdirectories
 $path_tmp = strstr($_SERVER['SCRIPT_FILENAME'], $_SERVER['PHP_SELF']);
@@ -107 +103 @@
  */
 
-if (!defined('SYSTEM_PATH') || !defined('WIFIDOG_ABS_FILE_PATH')) {
-  /**
-   * Detect wifidog-auth directory base
-   */
-
+if (!defined('WIFIDOG_ABS_FILE_PATH')) {
   // the name of this file's parent directory is the wifidog root.
   // that's a constant, ok, unless this file moves up or down in the hierarchy.
   $wifidog_base = dirname(dirname(__FILE__));
-
+  define('WIFIDOG_ABS_FILE_PATH', $wifidog_base . "/");
+}
+if (!defined('SYSTEM_PATH') && isset($_SERVER['REQUEST_URI'])) {
+  /**
+   * Detect wifidog-auth directory base, but only if we are NOT called from the
+   * command line
+   */
   $browser_url = $_SERVER['SCRIPT_NAME']; // browser url to the script
   $apache_path = $_SERVER['SCRIPT_FILENAME']; // system path to the very same script
-  while ($browser_url != "" && $browser_url != "/" && $apache_path != $wifidog_base) {
+  while ($browser_url != "" && $browser_url != "/" && $apache_path != WIFIDOG_ABS_FILE_PATH) {
     // find the URI that maps to the wifidog base.
-    // figure out the difference between the browser's url, the file system path, and $wifidog_base,
+    // figure out the difference between the browser's url, the file system path, and WIFIDOG_ABS_FILE_PATH,
     // piece by piece, starting on the right.
     // The point at which they diverge defines our DOCUMENT_ROOT and SYSTEM_PATH
@@ -139 +137 @@
   if ($browser_url == "" || substr($browser_url,-1,1) != '/') $browser_url .= '/';
   if (!defined('SYSTEM_PATH')) define('SYSTEM_PATH', $browser_url);
+}
 
-  //if (!defined('WIFIDOG_ABS_FILE_PATH')) define('WIFIDOG_ABS_FILE_PATH', $apache_path . "/");
-  if (!defined('WIFIDOG_ABS_FILE_PATH')) define('WIFIDOG_ABS_FILE_PATH', $wifidog_base . "/");
-}
 
 /*
  * Debug output
  *
-
 echo "SYSTEM_PATH: " . SYSTEM_PATH . "<br/>";
 echo "WIFIDOG_ABS_FILE_PATH: " . WIFIDOG_ABS_FILE_PATH . "<br/>";
 exit;
-
  *
  * End of debug output

trunk/wifidog-auth/wifidog/media/base_theme/stylesheet.css

@@ -5 +5 @@
     margin: 0px;
     padding: 0px;
-    font-family: arial, sans-serif;
+    font-family:  sans-serif;;
     color: black;
     font-size: 0.8em;
@@ -152 +152 @@
 }
 
-/* NOT GOOT ENOUGH, doesn't work with explorer.  Best solution is to override in description and sponsor */
-#main_area_middle>.user_ui_main_outer {
-                background: #E9F6FF;
-        margin: 1em 0em 1em 0em;
-        padding: 1em;
-        border: 1px solid #B4DFFF;
-        color: #3D586B;
-        }
 #main_area_bottom {
                 margin: 1em;
@@ -464 +456 @@
 .user_ui_container {
     display: block;
+        background: #E9F6FF;
+        color: #3D586B;
 }
 .user_ui_title {
     display: block;
-    font-size: medium;
-    font-weight: bold;
-
-    color: #46a43a;
-    border : 1px solid #46a43a;
-    background-color : #daedd8;
+    font-size: 1em;
+    font-weight: bold;
+}
+#main_area_middle .user_ui_container {
+
 }
 .user_ui_title a {