Changeset 608 for branches/1.1dev

Timestamp:

Jul 13, 2017 1:50:49 PM (7 years ago)

Author:

anonymous

Message:

Fix undefined index errors

Location:

branches/1.1dev

Files:

• config/boot.inc.php (modified) (1 diff)
• lib/App.inc.php (modified) (1 diff)
• lib/AuthSQL.inc.php (modified) (2 diffs)

branches/1.1dev/config/boot.inc.php

@@ -205 +205 @@
     session_start();
 
+    // Access session data using: $_SESSION['...'].
+    // Initialize here _after_ session has started.
+    if (!isset($_SESSION['_boomerang'])) {
+        $_SESSION['_boomerang'] = array(
+            'url' => array(),
+        );
+    }
+    if (!isset($_SESSION['_messages'])) {
+        $_SESSION['_messages'] = array();
+    }
+
 //     if (isset($_COOKIE[session_name()])) {
 //         logMsg(sprintf('Found session in cookie: %s=%s', session_name(), $_COOKIE[session_name()]), LOG_DEBUG, __FILE__, __LINE__);

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

@@ -198 +198 @@
 
     if (isset($url) && is_string($url)) {
-        // Delete any boomerang request keys in the query string.
-        $url = preg_replace('/boomerang=[\w]+/', '', $url);
-
-        if (is_array($_SESSION['_boomerang']['url']) && !empty($_SESSION['_boomerang']['url'])) {
+        // Delete any boomerang request keys in the query string (along with any trailing delimiters after the deletion).
+        $url = preg_replace(array('/([&?])boomerang=[^&?]+[&?]?/', '/[&?]$/'), array('$1', ''), $url);
+
+        if (isset($_SESSION['_boomerang']['url']) && is_array($_SESSION['_boomerang']['url']) && !empty($_SESSION['_boomerang']['url'])) {
             // If the URL currently exists in the boomerang array, delete.
             while ($existing_key = array_search($url, $_SESSION['_boomerang']['url'])) {

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

@@ -234 +234 @@
             'last_access_datetime'  => date('Y-m-d H:i:s'),
             'remote_ip'             => getRemoteAddr(),
-            'abuse_warning_level'   => $user_data['abuse_warning_level'],
+            'abuse_warning_level'   => isset($user_data['abuse_warning_level']) ? $user_data['abuse_warning_level'] : 0,
             'login_abuse_exempt'    => isset($user_data['login_abuse_exempt']) ? !empty($user_data['login_abuse_exempt']) : in_array(strtolower($username), $this->_params['login_abuse_exempt_usernames']),
             'match_remote_ip_exempt'=> isset($user_data['match_remote_ip_exempt']) ? !empty($user_data['match_remote_ip_exempt']) : in_array(strtolower($username), $this->_params['match_remote_ip_exempt_usernames']),
@@ -375 +375 @@
         // Do we match the user's remote IP at all? Yes, if set in config and not disabled for specific user.
         if ($this->getFeature('match_remote_ip') && !$this->getVal('match_remote_ip_exempt')) {
-            $remote_ip_is_matched = ($_SESSION[$this->_auth_name]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network);
+            $remote_ip_is_matched = (isset($_SESSION[$this->_auth_name]['remote_ip']) && $_SESSION[$this->_auth_name]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network);
         } else {
             logMsg(sprintf('%s%s exempt from remote_ip match.',