explode array_pop
authorAlan Knowles <alan@roojs.com>
Wed, 27 Jan 2021 04:44:53 +0000 (12:44 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 27 Jan 2021 04:44:53 +0000 (12:44 +0800)
HTML/FlexyFramework.php
HTML/FlexyFramework2.php

index c02aba9..2b5f543 100755 (executable)
@@ -1154,7 +1154,8 @@ RewriteRule ^(.+)$ /web.hpasite/index.local.php [L,NC,E=URL:$1]
         }
         
         $startRequest = $request;
-        $request =@ array_shift(explode('?', $request));
+        $ra = explode('?', $request);
+        $request =  array_shift($ra);
         $this->debug("INPUT REQUEST $request<BR>");
         if (!$isRedirect) {
             // check that request forms contains baseurl????
@@ -1265,7 +1266,7 @@ RewriteRule ^(.+)$ /web.hpasite/index.local.php [L,NC,E=URL:$1]
         }
         
         
-        $request_array=explode("/",$request);
+        $request_array = explode("/",$request);
         $original_request_array = $request_array;
         $sub_request_array = array();
         $l = count($request_array)-1;
@@ -1429,7 +1430,8 @@ RewriteRule ^(.+)$ /web.hpasite/index.local.php [L,NC,E=URL:$1]
             return true;
         }
         // file exists, but process might not be the same..
-        $name = array_pop(explode('_', get_class($class)));
+        $ea = explode('_', get_class($class));
+        $name = array_pop($ea);
         $cmd = file_get_contents('/proc/' . $oldpid.'/cmdline');
         if (!preg_match('/php/i',$cmd) || !preg_match('/'.$name.'/i',$cmd)) {
             file_put_contents($lock, getmypid());
index 690de51..3676733 100644 (file)
@@ -581,7 +581,7 @@ class HTML_FlexyFramework2 {
         //$GLOBALS['_DB_DATAOBJECT']['INI'][$this->database] =   parse_ini_file($iniCache, true);
         //$GLOBALS['_DB_DATAOBJECT']['SEQUENCE']
         // clear any dataobject cache..
-         
+          
         
         //die("done");
         
@@ -1107,7 +1107,8 @@ class HTML_FlexyFramework2 {
         }
         
         $startRequest = $request;
-        $request =@ array_shift(explode('?', $request));
+        $rq = explode('?', $request);
+        $request =  array_shift($rq);
         $this->debug("INPUT REQUEST $request<BR>");
         if (!$isRedirect) {
             // check that request forms contains baseurl????
@@ -1377,7 +1378,8 @@ class HTML_FlexyFramework2 {
             return true;
         }
         // file exists, but process might not be the same..
-        $name = array_pop(explode('_', get_class($class)));
+        $ca = explode('_', get_class($class));
+        $name = array_pop($ca);
         $cmd = file_get_contents('/proc/' . $oldpid.'/cmdline');
         if (!preg_match('/php/i',$cmd) || !preg_match('/'.$name.'/i',$cmd)) {
             file_put_contents($lock, getmypid());