X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=blobdiff_plain;f=Pman.php;h=a2821d49cb7acd0bdcfe206499e2b79a0e5112f8;hp=c8a4ecbdcd098f7b67eefd9bd7a20e27291faec4;hb=HEAD;hpb=4d71c63c216ff9dbe8ead4b6a076dbdc74c275ff diff --git a/Pman.php b/Pman.php index c8a4ecb..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= ""; @@ -69,7 +81,11 @@ class Pman extends HTML_FlexyFramework_Page var $serverName = false; var $lang = false; var $allowSignup = false; - + var $_hasInit; + var $appNameShort; + var $appDisable; + var $uiConfig; + /** * ------------- Standard getAuth/get/post methods of framework. * @@ -106,7 +122,8 @@ class Pman extends HTML_FlexyFramework_Page $this->appDisable = $boot->disable; $this->appDisabled = explode(',', $boot->disable); - $this->version = $boot->version; + $this->version = $boot->version; + $this->appVersion = $boot->version; $this->uiConfig = empty($boot->Pman['uiConfig']) ? false : $boot->Pman['uiConfig']; if (!empty($boot->Pman['local_autoauth']) && @@ -211,7 +228,7 @@ class Pman extends HTML_FlexyFramework_Page if (strlen($base) && $bits[0] != 'PasswordReset') { - $this->jerror("BADURL","invalid url: $base"); + $this->jerror("NOTICE-BADURL","invalid url: $base"); } // deliver template if (isset($_GET['onloadTrack'])) { @@ -365,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); - - - - } @@ -451,261 +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->jerr("Permission denied to view this resource", array('authFailure' => true)); - } - $this->jerr("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.. - } - - if ($type !== false) { - - if(!empty($errors)){ - DB_DataObject::factory('Events')->writeEventLogExtra($errors); - } - - $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; - - } + + @@ -734,6 +478,7 @@ class Pman extends HTML_FlexyFramework_Page $mods = $this->modulesList(); + $is_bootstrap = in_array('BAdmin', $mods); foreach($mods as $mod) { @@ -803,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; + } @@ -1053,7 +815,7 @@ class Pman extends HTML_FlexyFramework_Page function onException($ex) { - static $reported = false; + static $reported = false; if ($reported) { return; } @@ -1065,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; @@ -1085,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) { @@ -1138,9 +904,23 @@ class Pman extends HTML_FlexyFramework_Page function addEvent($act, $obj = false, $remarks = '') { - if (!empty(HTML_FlexyFramework::get()->Pman['disable_events'])) { - return; + $ff = HTML_FlexyFramework::get(); + + + if (!empty($ff->Pman['disable_events']) + || !empty($ff->database_is_readonly) + || substr($act, 0, 7) === 'NOTICE-' + ) { + if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) { + return false; + } + $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : ''; + $de = ini_set('display_errors', 0); + trigger_error("{$act} {$str} {$remarks}" , E_USER_NOTICE); + ini_set('display_errors', $de ); + return false; } + $au = $this->getAuthUser(); $e = DB_DataObject::factory('Events'); @@ -1158,8 +938,14 @@ class Pman extends HTML_FlexyFramework_Page $e->onInsert(isset($_REQUEST) ? $_REQUEST : array() , $this); + if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) { + return $e; + } + $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : ''; + $de = ini_set('display_errors', 0); + trigger_error("{$act} [event_id={$e->id}] {$str} {$remarks}" , E_USER_NOTICE); + ini_set('display_errors', $de ); - return $e; }