X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=blobdiff_plain;f=Pman.php;h=cc8ccb1d7f3527fe08b3cc81a8e3bc3172550ef5;hp=2ac52cf4fa36bed7b32bcc3712dea881129da58d;hb=HEAD;hpb=1359bfe271af465762264f9b96b53eab43eb4a91 diff --git a/Pman.php b/Pman.php index 2ac52cf..013978d 100644 --- a/Pman.php +++ b/Pman.php @@ -34,12 +34,24 @@ require_once 'Pman/Core/AssetTrait.php'; +require_once 'Pman/Core/JsonOutputTrait.php'; + class Pman extends HTML_FlexyFramework_Page { - use Pman_Core_AssetTrait; - //outputJavascriptDir() - //outputCssDir(); + use Pman_Core_AssetTrait, + //outputJavascriptDir() + //outputCssDir(); + + Pman_Core_JsonOutputTrait; + // jerr() + // jnotice() + // jerrAuth() + // jerror(); + // jok() + // jdata() + // jdataCache() + var $isDev = false; var $appName= ""; var $appLogo= ""; @@ -370,27 +382,7 @@ class Pman extends HTML_FlexyFramework_Page } return true; } - - - function jsencode($v, $header = false) - { - if ($header) { - header("Content-type: text/javascript"); - } - if (function_exists("json_encode")) { - $ret= json_encode($v); - if ($ret !== false) { - return $ret; - } - } - require_once 'Services/JSON.php'; - $js = new Services_JSON(); - return $js->encodeUnsafe($v); - - - - } @@ -456,271 +448,8 @@ class Pman extends HTML_FlexyFramework_Page - /** - * jerrAuth: standard auth failure - with data that let's the UI know.. - */ - function jerrAuth() - { - $au = $this->authUser; - if ($au) { - // is it an authfailure? - $this->jerror("LOGIN-NOPERM", "Permission denied to view this resource", array('authFailure' => true)); - } - $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true)); - } - - - - /** - * ---------------- Standard JSON outputers. - used everywhere - */ - /** - * ---------------- Standard JSON outputers. - used everywhere - * JSON error - simple error with logging. - * @see Pman::jerror - */ - - function jerr($str, $errors=array(), $content_type = false) // standard error reporting.. - { - return $this->jerror('ERROR', $str,$errors,$content_type); - } - /** - * Recomended JSON error indicator - * - * - * @param string $type - normally 'ERROR' - you can use this to track error types. - * @param string $message - error message displayed to user. - * @param array $errors - optioanl data to pass to front end. - * @param string $content_type - use text/plain to return plan text - ?? not sure why... - * - */ - - function jerror($type, $str, $errors=array(), $content_type = false) // standard error reporting.. - { - if ($this->transObj) { - $this->transObj->query('ROLLBACK'); - } - - $cli = HTML_FlexyFramework::get()->cli; - if ($cli) { - echo "ERROR: " .$str . "\n"; // print the error first, as DB might fail.. - } - $pman = HTML_FlexyFramework::get(); - - - - - - if ($type !== false && empty($pman->nodatabase)) { - - if(!empty($errors)){ - DB_DataObject::factory('Events')->writeEventLogExtra($errors); - } - // various codes that are acceptable. - // - if (!preg_match('/^(ERROR|NOTICE|LOG)/', $type )) { - $type = 'ERROR-' . $type; - } - - $this->addEvent($type, false, $str); - - } - - $cli = HTML_FlexyFramework::get()->cli; - if ($cli) { - exit(1); // cli --- exit code to stop shell execution if necessary. - } - - - if ($content_type == 'text/plain') { - header('Content-Disposition: attachment; filename="error.txt"'); - header('Content-type: '. $content_type); - echo "ERROR: " .$str . "\n"; - exit; - } - - // log all errors!!! - - $retHTML = isset($_SERVER['CONTENT_TYPE']) && - preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']); - - if ($retHTML){ - if (isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] == 'NO') { - $retHTML = false; - } - } else { - $retHTML = isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] !='NO'; - } - - - if ($retHTML) { - header('Content-type: text/html'); - echo ""; - echo $this->jsencode(array( - 'success'=> false, - 'errorMsg' => $str, - 'message' => $str, // compate with exeption / loadexception. - - 'errors' => $errors ? $errors : true, // used by forms to flag errors. - 'authFailure' => !empty($errors['authFailure']), - ), false); - echo ""; - exit; - } - - if (isset($_REQUEST['_debug'])) { - echo '
'.htmlspecialchars(print_r(array(
-                'success'=> false, 
-                'data'=> array(), 
-                'errorMsg' => $str,
-                'message' => $str, // compate with exeption / loadexception.
-                'errors' => $errors ? $errors : true, // used by forms to flag errors.
-                'authFailure' => !empty($errors['authFailure']),
-            ),true));
-            exit;
-                
-        }
-        
-        echo $this->jsencode(array(
-            'success'=> false, 
-            'data'=> array(),
-            'code' => $type,
-            'errorMsg' => $str,
-            'message' => $str, // compate with exeption / loadexception.
-            'errors' => $errors ? $errors : true, // used by forms to flag errors.
-            'authFailure' => !empty($errors['authFailure']),
-        ),true);
-        
-        
-        exit;
-        
-    }
-    function jok($str)
-    {
-        if ($this->transObj ) {
-            $this->transObj->query( connection_aborted() ? 'ROLLBACK' :  'COMMIT');
-        }
-        
-        $cli = HTML_FlexyFramework::get()->cli;
-        if ($cli) {
-            echo "OK: " .$str . "\n";
-            exit;
-        }
-        
-        $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
-                preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
-        
-        if ($retHTML){
-            if (isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] == 'NO') {
-                $retHTML = false;
-            }
-        } else {
-            $retHTML = isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] !='NO';
-        }
-        
-        if ($retHTML) {
-            header('Content-type: text/html');
-            echo "";
-            // encode html characters so they can be read..
-            echo  str_replace(array('<','>'), array('\u003c','\u003e'),
-                        $this->jsencode(array('success'=> true, 'data' => $str), false));
-            echo "";
-            exit;
-        }
-        
-        
-        echo  $this->jsencode(array('success'=> true, 'data' => $str),true);
-        
-        exit;
-        
-    }
-    /**
-     * output data for grids or tree
-     * @ar {Array} ar Array of data
-     * @total {Number|false} total number of records (or false to return count(ar)
-     * @extra {Array} extra key value list of data to pass as extra data.
-     * 
-     */
-    function jdata($ar,$total=false, $extra=array(), $cachekey = false)
-    {
-        // should do mobile checking???
-        if ($total == false) {
-            $total = count($ar);
-        }
-        $extra=  $extra ? $extra : array();
-        
-        
-        $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
-                preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
-        
-        if ($retHTML){
-            if (isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] == 'NO') {
-                $retHTML = false;
-            }
-        } else {
-            $retHTML = isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] !='NO';
-        }
-        
-        if ($retHTML) {
-            
-            header('Content-type: text/html');
-            echo "'), array('\u003c','\u003e'),
-                        $this->jsencode(array('success' =>  true, 'total'=> $total, 'data' => $ar) + $extra, false));
-            echo "]]>";
-            exit;
-        }
-        
-        
-        // see if trimming will help...
-        if (!empty($_REQUEST['_pman_short'])) {
-            $nar = array();
-            
-            foreach($ar as $as) {
-                $add = array();
-                foreach($as as $k=>$v) {
-                    if (is_string($v) && !strlen(trim($v))) {
-                        continue;
-                    }
-                    $add[$k] = $v;
-                }
-                $nar[] = $add;
-            }
-            $ar = $nar;
-              
-        }
-        
-      
-        $ret =  $this->jsencode(array('success' =>  true, 'total'=> $total, 'data' => $ar) + $extra,true);  
-        
-        if (!empty($cachekey)) {
-            
-            $fn = ini_get('session.save_path') . '/json-cache'.date('/Y/m/d').'.'. $cachekey . '.cache.json';
-            if (!file_exists(dirname($fn))) {
-                mkdir(dirname($fn), 0777,true);
-            }
-            file_put_contents($fn, $ret);
-        }
-        
-        echo $ret;
-        exit;
-    }
-    
-    
-    
-    /** a daily cache **/
-    function jdataCache($cachekey)
-    {
-        $fn = ini_get('session.save_path') . '/json-cache'.date('/Y/m/d').'.'. $cachekey . '.cache.json';
-        if (file_exists($fn)) {
-            header('Content-type: application/json');
-            echo file_get_contents($fn);
-            exit;
-        }
-        return false;
-        
-    }
+   
+   
     
    
     
@@ -819,9 +548,26 @@ class Pman extends HTML_FlexyFramework_Page
         
     }
     
+    /**
+     * while doing batch processes, the database sometimes get's locked up.
+     * if we are doing another batch process that can be avoided - we should just stop for a while..
+     */
     
-    
-    
+     function database_is_locked()
+    {
+        $cd = DB_DataObject::Factory('core_enum');
+        $cd->query("show processlist");
+         $locked = 0;
+        while ($cd->fetch()) {
+            if ($cd->State == 'Waiting for table metadata lock') {
+                $locked++;
+            }
+            if ($locked>  10) {
+                return true;
+            }
+        }
+        return false;
+    }
     
     
     
@@ -1081,7 +827,10 @@ class Pman extends HTML_FlexyFramework_Page
         
         $reported = true;
         
-        $out = is_a($ex,'Exception') || is_a($ex, 'Error') ? $ex->getMessage() : $ex->toString();
+        $out = (is_a($ex,'Exception') || is_a($ex, 'Error') ? $ex->getMessage() : $ex->toString()) .
+            ' ' . (empty($_SERVER['REQUEST_METHOD']) ? 'cli' :  $_SERVER['REQUEST_METHOD'] ) . ' ' .
+            (empty($_SERVER['REQUEST_URI'])	 ? 'No URL' : $_SERVER['REQUEST_URI']) .
+              ' ' .    (empty($POST) ? '' : file_get_contents('php://input')) ;
         
         
         //print_R($bt); exit;
@@ -1101,6 +850,7 @@ class Pman extends HTML_FlexyFramework_Page
         //convert the huge backtrace into something that is readable..
         $out .= "\n" . implode("\n",  $ret);
         
+           
         $this->addEvent("EXCEPTION", false, $out);
         
         if ($this->showErrorToUser) {
@@ -1161,7 +911,7 @@ class Pman extends HTML_FlexyFramework_Page
          || !empty($ff->database_is_readonly)
          || substr($act, 0, 7) === 'NOTICE-'
         ) {
-             if (substr($act, 0, 5) !== 'ERROR') {
+            if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) {
                return false;
             }
             $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
@@ -1188,7 +938,7 @@ class Pman extends HTML_FlexyFramework_Page
         
         
         $e->onInsert(isset($_REQUEST) ? $_REQUEST : array() , $this);
-        if (substr($act, 0, 5) !== 'ERROR') {
+        if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) {
             return $e;
         }
         $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';