Changeset 35 for trunk/lib

Timestamp:

Dec 13, 2005 7:43:12 AM (19 years ago)

Author:

scdev

Message:

Fixed mime_content_type bug in Upload.inc.php

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Auth_SQL.inc.php (modified) (2 diffs)
• Email.inc.php (modified) (1 diff)
• TemplateGlue.inc.php (modified) (2 diffs)
• Upload.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -482 +482 @@
         $event['file:line'] = "$file : $line";
         preg_match_all('/(<[^>\s]{7,})[^>]*>/', $message, $strip_tags_allow); // <...> with lots of chars maybe we don't want stripped.
-        $event['message'] = strip_tags(preg_replace('/\s{2,}/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
+        $event['message'] = strip_tags(preg_replace('/\s+/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
         $event_str = '[' . join('] [', $event) . ']';
         

trunk/lib/Auth_SQL.inc.php

@@ -468 +468 @@
         // Tesing login should occur once. This is the first time. Set flag.
         $this->_authentication_tested = true;
-        
+
         // Some users will access from networks with a changing IP number (i.e. behind a proxy server). These users must be allowed entry by adding their IP to the list of trusted_networks.
         if ($trusted_net = ipInRange(getRemoteAddr(), $this->_params['trusted_networks'])) {
@@ -513 +513 @@
         } else if (isset($_SESSION[$this->_sess]) && true === $_SESSION[$this->_sess]['authenticated']) {
             // User is authenticated, but login has expired.
-            App::raiseMsg(sprintf(_("Your %s session has closed. You need to log-in again."), strtolower($this->_auth)), MSG_NOTICE, __FILE__, __LINE__);
+            if (strtotime($_SESSION[$this->_sess]['last_access_datetime']) > time() - 43200) {
+                // Only raise message if last session is less than 12 hours old.
+                App::raiseMsg(sprintf(_("Your %s session has closed. You need to log-in again."), strtolower($this->_auth)), MSG_NOTICE, __FILE__, __LINE__);
+            }
             
             // Log the reason for login expiration.

trunk/lib/Email.inc.php

@@ -190 +190 @@
         array_walk($search, create_function('&$v', '$v = "/{" . preg_quote($v) . "}/i";'));
 
-        // Replace values.
+        // Replacement values.
         $replace = array_values($replacements);
         

trunk/lib/TemplateGlue.inc.php

@@ -15 +15 @@
 function bbftp($file)
 {
-    return sprintf('<a href="bbftp://%s@%s:%s%s" title="%s">%s</a>', $_SERVER['USER'], $_SERVER['HTTP_HOST'], $_SERVER['DOCUMENT_ROOT'], $file, $file, basename($file));
+    return sprintf('<a href="bbftp://%s@%s:%s%s" title="%s" style="text-decoration: none; border-bottom: blue 1px dotted;">%s</a>', $_SERVER['USER'], $_SERVER['HTTP_HOST'], $_SERVER['DOCUMENT_ROOT'], $file, $file, basename($file));
 }
 
@@ -29 +29 @@
     $filepath = preg_match('!://!', $src) ? $src : getenv('DOCUMENT_ROOT') . $src;
     
-    if (false === ($gis = @getimagesize($filepath)) || preg_match('/width|height/', $extra)) {
+    if (true === ($gis = @getimagesize($filepath)) && !preg_match('/width|height/', $extra)) {
+        $image_size = $gis[3];
+    } else {
         $image_size = '';
-    } else {
-        $image_size = $gis[3];
     }
     

trunk/lib/Upload.inc.php

@@ -300 +300 @@
         // To keep this script running even if user tries to stop browser.
         ignore_user_abort(true); 
-        if (!ini_get('safe_mode')) { 
-            set_time_limit(300); 
-        }
+        ini_set('max_execution_time', 300);
+        ini_set('max_input_time', 300);
 
         $new_file_names = array();
@@ -347 +346 @@
             // If the file name has no extension, use the mime-type extension.
             if (!preg_match('/\.[^.]{1,5}$/', $file_name) && function_exists('mime_content_type')) {
-                if ($ext = array_search(mime_content_type($files['type'][$i]), $this->mime_extension_map)) {
+                if ($ext = array_search(mime_content_type($files['tmp_name'][$i]), $this->mime_extension_map)) {
                     $file_name .= ".$ext";
                 }