Changeset 709

Timestamp:

Nov 16, 2019 9:14:04 PM (4 years ago)

Author:

anonymous

Message:

Fix PHP notice errors

Location:

branches/1.1dev

Files:

• lib/App.inc.php (modified) (1 diff)
• lib/Upload.inc.php (modified) (1 diff)
• templates/form_error_header.ihtml (modified) (2 diffs)

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

@@ -297 +297 @@
         // Use non specific boomerang if available.
         $url = end($_SESSION['_boomerang']['url']);
+    } else {
+        // If URL is not specified, use the $CFG->redirect_home config value.
+        $url = $CFG->redirect_home;
     }
 

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

@@ -576 +576 @@
     {
         preg_match('/.*?\.(\w+)$/i', $file_name, $ext);
-        return $ext[1];
+        if (isset($ext[1])) {
+            return $ext[1];
+        } else {
+            logMsg(sprintf('No filename extension found: %s.', $file_name), LOG_NOTICE, __FILE__, __LINE__);
+            return '';
+        }
     }
 }
-
-?>

branches/1.1dev/templates/form_error_header.ihtml

@@ -1 +1 @@
 <?php
 // This prints the messages saved in the error messages stack used in FormValidator.inc.php
-if (method_exists($fv, 'getErrorList')) {
+if (isset($fv) && method_exists($fv, 'getErrorList')) {
     if ($fv->anyErrors()) {
         ?><div class="codebasemsg"><?php
@@ -14 +14 @@
                     echo '<div class="error">' . $_err['message'] . '</div>';
                     break;
-        
+
                 case MSG_WARNING:
                     echo '<div class="warning">' . $_err['message'] . '</div>';
                     break;
-        
+
                 case MSG_SUCCESS:
                     echo '<div class="success">' . $_err['message'] . '</div>';
                     break;
-        
+
                 case MSG_NOTICE:
                 default: