Changeset 79 for branches/1.1dev/lib

Timestamp:

Apr 5, 2006 7:16:48 PM (18 years ago)

Author:

scdev

Message:

axis-out checkin

File:

• branches/1.1dev/lib/App.inc.php (modified) (6 diffs)

branches/1.1dev/lib/App.inc.php

@@ -104 +104 @@
     if (!is_dir($CFG->log_directory) || !is_writable($CFG->log_directory)) {
         // We must use trigger_error rather than calling logMsg, which might lead to an infinite loop.
-        trigger_error(sprintf('Codebase error: log directory (%s) not found or writable.', $CFG->log_directory), E_USER_ERROR);
+        trigger_error(sprintf('Codebase error: log directory not found or writable: %s', $CFG->log_directory), E_USER_NOTICE);
+        $CFG->log_directory = '/tmp';
+        $CFG->log_filename = sprintf('%s_%s.log', getenv('USER'), getenv('HTTP_HOST'));
     }
     
@@ -121 +123 @@
     
     // FILE ACTION
-    if ($priority <= $CFG->log_file_priority && $CFG->log_file_priority) {
+    if ($CFG->log_file_priority && $priority <= $CFG->log_file_priority) {
         error_log($event_str . "\n", 3, $CFG->log_directory . '/' . $CFG->log_filename);
     }
 
     // EMAIL ACTION
-    if ($priority <= $CFG->log_email_priority && $CFG->log_email_priority) {
+    if ($CFG->log_email_priority && $priority <= $CFG->log_email_priority) {
         if (empty($CFG->log_to_email)) {
             $CFG->log_to_email = 'bug@strangecode.com';
@@ -140 +142 @@
     
     // SMS ACTION
-    if ($priority <= $CFG->log_sms_priority && $CFG->log_sms_priority) {
+    if ($CFG->log_sms_priority && $priority <= $CFG->log_sms_priority) {
         if (empty($CFG->log_to_email)) {
             $CFG->log_to_sms = 'bug@strangecode.com';
@@ -150 +152 @@
 
     // SCREEN ACTION
-    if ($priority <= $CFG->log_screen_priority && $CFG->log_screen_priority) {
+    if ($CFG->log_screen_priority && $priority <= $CFG->log_screen_priority) {
         echo "[{$event['date']}] [{$event['type']}] [{$event['file:line']}] [{$event['message']}]\n";
     }
@@ -292 +294 @@
 }
 
-/**
- * Redirects a user by calling the dieURL(). It will use:
- * 1. the stored boomerang URL, it it exists
- * 2. the referring URL, it it exists.
- * 3. an empty string, which will force dieURL to use the default URL.
- */
-function dieBoomerangURL($id=null, $carry_args=null)
+/*
+* Redirects a user by calling App::dieURL(). It will use:
+* 1. the stored boomerang URL, it it exists
+* 2. a specified $default_url, it it exists
+* 3. the referring URL, it it exists.
+* 4. redirect_home_url configuration variable.
+*
+* @access   public
+* @param    string  $id             Identifier for this script.
+* @param    mixed   $carry_args     Additional arguments to carry in the URL automatically (see App::oHREF()).
+* @param    string  $default_url    A default URL if there is not a valid specified boomerang URL.
+* @return   bool                    False if the session is not running. No return otherwise.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @since    31 Mar 2006 19:17:00
+*/
+function dieBoomerangURL($id=null, $carry_args=null, $default_url=null)
 {
     // Get URL from stored boomerang. Allow non specific URL if ID not valid.
@@ -307 +318 @@
             $url = end($_SESSION['_boomerang']['url']);
         }
-    } else if (!refererIsMe() && !preg_match('/admin_common/', getenv('SCRIPT_NAME'))) {
+    } else if (isset($default_url)) {
+        $url = $default_url;
+    } else if (!refererIsMe()) {
         // Ensure that the redirecting page is not also the referrer.
-        // admin_common is an alias of 'admin', which confuses this function. Just here for local testing.
         $url = getenv('HTTP_REFERER');
     } else {