From 728620fa3536543f5a6f38b62ba4781428afd6f9 Mon Sep 17 00:00:00 2001 From: Alan Date: Thu, 29 Feb 2024 13:04:48 +0800 Subject: [PATCH] Fix #8059 - being splitting of Roo.php into Traits --- Pman.php | 289 +++------------------------------------------------ Pman/Roo.php | 3 +- 2 files changed, 18 insertions(+), 274 deletions(-) diff --git a/Pman.php b/Pman.php index aa20bf1..b3f43df 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= ""; @@ -456,275 +468,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 jnotice($type, $str, $errors=array(), $content_type = false)
-    {
-        return $this->jerror('NOTICE-' . $type, $str, $errors, $content_type);
-    }
-    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;
-        
-    }
+   
+   
     
    
     
diff --git a/Pman/Roo.php b/Pman/Roo.php
index 3c59f0d..ee0e571 100644
--- a/Pman/Roo.php
+++ b/Pman/Roo.php
@@ -49,8 +49,7 @@ class Pman_Roo extends Pman
         Pman_Core_RooPostTrait,
         Pman_Core_RooJsonOutputTrait;
     */
-    
-    /**
+     /**
      * if set to an array (when extending this, then you can restrict which tables are available
      */
     var $validTables = false; 
-- 
2.39.2