Unset temporary variables to prevent their accidental use

Geeklog-Core · Mar 8, 2017 · da0d332 · da0d332
1 parent 40449d0
commit da0d332
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/public_html/users.php b/public_html/users.php
@@ -540,12 +540,13 @@ function resend_request()
             foreach ($data as $key => &$value) {
                 if ($key == CSRF_TOKEN) {
                     $value = SEC_createToken();
-                }                else {
+                } else {
                     if ($magic) {
                         $value = stripslashes_gpc_recursive($value);
                     }
                 }
             }
+            unset($value);
 
             $returnUrl = $returnUrl . '?' . http_build_query($data);
             $req = new HTTP_Request2($returnUrl, HTTP_Request2::METHOD_GET);
@@ -681,7 +682,7 @@ function resend_request()
             }
         } else {
             // this request doesn't make sense - ignore it
-            COM_redirect($_CONF['site_url']  . '/index.php');
+            COM_redirect($_CONF['site_url'] . '/index.php');
         }
         break;
 
@@ -693,8 +694,8 @@ function resend_request()
                 $_CONF['site_url'] . '/users.php?'
                 . http_build_query(array(
                     'mode' => 'newpwd',
-                    'uid' => (int) Geeklog\Input::fPost('uid'),
-                    'rid' => Geeklog\Input::post('rid')
+                    'uid'  => (int) Geeklog\Input::fPost('uid'),
+                    'rid'  => Geeklog\Input::post('rid'),
                 ))
             );
         } else {
@@ -791,7 +792,8 @@ function resend_request()
         } elseif ($_CONF['user_login_method']['openid'] &&
             ($_CONF['usersubmission'] == 0) &&
             !$_CONF['disable_new_user_registration'] &&
-            (Geeklog\Input::get('openid_login')  == '1')) {
+            (Geeklog\Input::get('openid_login') == '1')
+        ) {
             // Here we go with the handling of OpenID authentication.
 
             $query = array_merge($_GET, $_POST);
@@ -888,18 +890,18 @@ function resend_request()
 
                 $consumer->setRedirectURL($callback_url);
                 $oauth_userinfo = $consumer->authenticate_user();
-                
-                if ( $oauth_userinfo === false ) {
+
+                if ($oauth_userinfo === false) {
                     COM_updateSpeedlimit('login');
                     COM_errorLog("OAuth Error: " . $consumer->error, 1);
                     COM_redirect($_CONF['site_url'] . '/users.php?msg=111'); // OAuth authentication error
                 }
-                
-                if ( $consumer->doAction($oauth_userinfo) == NULL ) {
+
+                if ($consumer->doAction($oauth_userinfo) == null) {
                     COM_errorLog("Oauth: Error creating new user in OAuth authentication", 1);
                     COM_redirect($_CONF['site_url'] . '/users.php?msg=111'); // OAuth authentication error
                 }
-            }            
+            }
         } else {
             $status = -2; // User just visited login page no error. -1 = error
         }

diff --git a/system/classes/language.class.php b/system/classes/language.class.php
@@ -420,8 +420,8 @@ public static function adminMassDelete()
             foreach ($ids as &$id) {
                 $id = intval($id, 10);
             }
-
             unset($id);
+
             $sql = "DELETE FROM {$_TABLES['language_items']} "
                 . " WHERE (id IN (" . implode(',', $ids) . ")) ";
             DB_query($sql);

diff --git a/system/classes/scripts.class.php b/system/classes/scripts.class.php
@@ -233,6 +233,7 @@ private function setJavaScriptLibraries()
                         $file['load'] = false;
                     }
                 }
+                unset($file);
             }
         } elseif ($this->jquery_ui_cdn) { // This might happen if a jQuery UI file is not found
             $librarycode .= '<script type="text/javascript" src="' . $_CONF['site_url'] . '/' . $this->library_files['jquery']['file'] . '"></script>' . LB;
@@ -244,6 +245,7 @@ private function setJavaScriptLibraries()
                     $file['load'] = false;
                 }
             }
+            unset($file);
         }
 
         // Now load in the rest of the libraries

diff --git a/system/classes/story.class.php b/system/classes/story.class.php
@@ -1938,7 +1938,6 @@ public static function getRelatedArticlesByKeywords($articleId, $keywordList, $l
                         break;
                     }
                 }
-
                 unset($item);
 
                 if (!$found) {

diff --git a/system/lib-story.php b/system/lib-story.php
@@ -758,6 +758,8 @@ function STORY_whatsRelated($related, $uid, $sid)
                     $value = COM_checkWords($value, 'story');
                 }
             }
+            unset($value);
+
         }
 
         $topics = array();