X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=blobdiff_plain;f=Pman.php;h=a2821d49cb7acd0bdcfe206499e2b79a0e5112f8;hp=0c9702dc63dc5ab232be82144aae649fbaae0a21;hb=HEAD;hpb=1612b0eefe44c127b0c1aade5e9b2017f35a9356 diff --git a/Pman.php b/Pman.php index 0c9702d..013978d 100644 --- a/Pman.php +++ b/Pman.php @@ -31,17 +31,28 @@ */ - - + 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= ""; var $appShortName= ""; @@ -54,7 +65,7 @@ class Pman extends HTML_FlexyFramework_Page var $appModules = ''; var $appDisabled = array(); // array of disabled modules.. // (based on config option disable) - + var $authUser; // always contains the authenticated user.. var $disable_jstemplate = false; /// disable inclusion of jstemplate code.. @@ -64,6 +75,17 @@ class Pman extends HTML_FlexyFramework_Page var $transObj = false; // used to rollback or commit in JOK/JERR + + // these are used somewhere - + var $builderJs = false;// + var $serverName = false; + var $lang = false; + var $allowSignup = false; + var $_hasInit; + var $appNameShort; + var $appDisable; + var $uiConfig; + /** * ------------- Standard getAuth/get/post methods of framework. * @@ -100,10 +122,13 @@ 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']) && + if (!empty($boot->Pman['local_autoauth']) && + !empty($_SERVER['SERVER_ADDR']) && + !empty($_SERVER['REMOTE_ADDR']) && ($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') ) { @@ -114,9 +139,18 @@ class Pman extends HTML_FlexyFramework_Page !empty($_REQUEST['isDev']) && ( - (($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')) + ( + !empty($_SERVER['SERVER_ADDR']) && + ( + (($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')) + || + (($_SERVER['SERVER_ADDR'] == '::1') && ($_SERVER['REMOTE_ADDR'] == '::1')) + || + (preg_match('/^192\.168/', $_SERVER['SERVER_ADDR']) && $_SERVER['SERVER_ADDR'] == $_SERVER['HTTP_HOST']) + ) + ) || - (($_SERVER['SERVER_ADDR'] == '::1') && ($_SERVER['REMOTE_ADDR'] == '::1')) + !empty($boot->Pman['enable_isdev_url']) ) ) { @@ -132,60 +166,37 @@ class Pman extends HTML_FlexyFramework_Page } /* - * module init is only loaded on main page call, and includes checks for configuration settings. + * call a method on {module}/Pman.php + * * initially used on the main page load to call init(); + * * also used for ccsIncludes?? * - * // callModules('init', $base) + * // usage: $this->callModules('init', $base) * */ - function callModules($fn, $base) - { - foreach(explode(',',$this->appModules) as $m) { - - $cls = 'Pman_'. $m . '_Pman'; - - if (!file_exists($this->rootDir . '/'.str_replace('_','/', $cls). '.php')) { - continue; - } - - require_once str_replace('_','/', $cls). '.php'; - - $c = new $cls(); - - if (method_exists($c, $fn)) { - - $c->{$fn}($this,$base); - - } - } - } - - function initModules($base) + function callModules($fn) { + $args = func_get_args(); + array_shift($args); foreach(explode(',',$this->appModules) as $m) { $cls = 'Pman_'. $m . '_Pman'; - //echo $cls; - //echo $this->rootDir . '/'.str_replace('_','/', $cls). '.php'; - if (!file_exists($this->rootDir . '/'.str_replace('_','/', $cls). '.php')) { continue; } require_once str_replace('_','/', $cls). '.php'; $c = new $cls(); - if (method_exists($c,'init')) { - $c->init($this,$base); + if (method_exists($c, $fn)) { + call_user_func_array(array($c,$fn),$args); } } - } - - + + } function get($base, $opts=array()) { $this->init(); if (empty($base)) { - // $this->callModules('init', $base); - $this->initModules($base); + $this->callModules('init', $this, $base); } //$this->allowSignup= empty($opts['allowSignup']) ? 0 : 1; @@ -193,12 +204,13 @@ class Pman extends HTML_FlexyFramework_Page // should really be moved to Login... - + /* if ($bits[0] == 'PasswordReset') { $this->linkFail = $this->resetPassword(@$bits[1],@$bits[2],@$bits[3]); header('Content-type: text/html; charset=utf-8'); return; - } + } + */ $au = $this->getAuthUser(); if ($au) { @@ -215,8 +227,8 @@ class Pman extends HTML_FlexyFramework_Page } - if (strlen($base)) { - $this->jerror("BADURL","invalid url: $base"); + if (strlen($base) && $bits[0] != 'PasswordReset') { + $this->jerror("NOTICE-BADURL","invalid url: $base"); } // deliver template if (isset($_GET['onloadTrack'])) { @@ -267,22 +279,16 @@ class Pman extends HTML_FlexyFramework_Page if (!is_a($this->company, 'DB_DataObject')) { // non-core pman projects return false; } - $this->company->get('comptype', 'OWNER'); + $e = DB_DataObject::Factory('core_enum')->lookupObject('COMPTYPE', 'OWNER'); + + $this->company->get('comptype_id', $e->id); return $this->company; } - - /** - * getAuthUser: - get the authenticated user.. - * - * @return {DB_DataObject} of type Pman[authTable] if authenticated. - */ - - function getAuthUser() - { - if (!empty($this->authUser)) { - return $this->authUser; + static function staticGetAuthUser($t) { + if (!empty($t->authUser)) { + return $t->authUser; } $ff = HTML_FlexyFramework::get(); $tbl = empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable']; @@ -292,8 +298,20 @@ class Pman extends HTML_FlexyFramework_Page if (is_a($u,'PEAR_Error') || !$u->isAuth()) { return false; } - $this->authUser =$u->getAuthUser(); - return $this->authUser ; + $t->authUser =$u->getAuthUser(); + return $t->authUser ; + + } + + /** + * getAuthUser: - get the authenticated user.. + * + * @return {DB_DataObject} of type Pman[authTable] if authenticated. + */ + + function getAuthUser() + { + return self::staticGetAuthUser($this); } /** * hasPerm: @@ -310,8 +328,7 @@ class Pman extends HTML_FlexyFramework_Page $au = $this->getAuthUser(); return $au && $au->hasPerm($name,$lvl); - } - + } /** * modulesList: List the modules in the application * @@ -365,14 +382,9 @@ class Pman extends HTML_FlexyFramework_Page } return true; } - - - - - - + /** * ---------------- Global Tools --------------- @@ -391,313 +403,53 @@ class Pman extends HTML_FlexyFramework_Page } } - + static $deleteOnExit = false; /** * generate a tempory file with an extension (dont forget to delete it) */ - function tempName($ext) + function deleteOnExitAdd($name) { - $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP'); - unlink($x); - return $x .'.'. $ext; - } - - - /** - * ------------- Authentication password reset ------ ??? MOVEME? - * - * - */ - - - function resetPassword($id,$t, $key) - { - - $au = $this->getAuthUser(); - if ($au) { - return "Already Logged in - no need to use Password Reset"; - } - - $u = DB_DataObject::factory('core_person'); - //$u->company_id = $this->company->id; - $u->active = 1; - if (!$u->get($id) || !strlen($u->passwd)) { - return "invalid id"; - } - - // validate key.. - if ($key != $u->genPassKey($t)) { - return "invalid key"; - } - $uu = clone($u); - $u->no_reset_sent = 0; - $u->update($uu); - - if ($t < strtotime("NOW - 1 DAY")) { - return "expired"; + if (self::$deleteOnExit === false) { + register_shutdown_function(array('Pman','deleteOnExit')); + self::$deleteOnExit = array(); } - $this->showNewPass = implode("/", array($id,$t,$key)); - return false; + self::$deleteOnExit[] = $name; } - /** - * jerrAuth: standard auth failure - with data that let's the UI know.. - */ - function jerrAuth() + function tempName($ext, $deleteOnExit=false) { - $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'); - } - - if ($type !== false) { - - if(!empty($errors)){ - DB_DataObject::factory('Events')->writeEventLogExtra($errors); - } - - $this->addEvent($type, false, $str); - - } - - $cli = HTML_FlexyFramework::get()->cli; - if ($cli) { - echo "ERROR: " .$str . "\n"; - 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; - } - - - - require_once 'Services/JSON.php'; - $json = new Services_JSON(); - - // 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 $json->encodeUnsafe(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']), - )); - 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; - + $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP'); + unlink($x); + $ret = $x .'.'. $ext; + if ($deleteOnExit) { + $this->deleteOnExitAdd($ret); } - - echo $json->encode(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']), - )); - - - exit; - + return $ret; + } - function jok($str) + + static function deleteOnExit() { - if ($this->transObj ) { - $this->transObj->query( connection_aborted() ? 'ROLLBACK' : 'COMMIT'); - } - - $cli = HTML_FlexyFramework::get()->cli; - if ($cli) { - echo "OK: " .$str . "\n"; - exit; - } - require_once 'Services/JSON.php'; - $json = new Services_JSON(); - $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; + foreach(self::$deleteOnExit as $fn) { + if (file_exists($fn)) { + unlink($fn); } - } 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'), - $json->encodeUnsafe(array('success'=> true, 'data' => $str))); - echo ""; - exit; } - - - echo $json->encode(array('success'=> true, 'data' => $str)); - - 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. + * ------------- Authentication password reset ------ ??? MOVEME? + * * */ - function jdata($ar,$total=false, $extra=array(), $cachekey = false) - { - // should do mobile checking??? - if ($total == false) { - $total = count($ar); - } - $extra= $extra ? $extra : array(); - require_once 'Services/JSON.php'; - $json = new Services_JSON(); - - $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'), - $json->encodeUnsafe(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra)); - 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 = $json->encode(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra); - - 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; - - } + + @@ -716,8 +468,9 @@ class Pman extends HTML_FlexyFramework_Page */ function outputJavascriptIncludes() { - // BC support - currently 1 project still relies on this.. (MO portal) - $o = HTML_FlexyFramework::get()->Pman_Core; + // BC support - currently 1 project still relies on this.. (MO portal) + $ff = HTML_FlexyFramework::get(); + $o = isset($ff->Pman_Core) ? $ff->Pman_Core : array(); if (isset($o['packseed'])) { return $this->outputJavascriptIncludesBC(); } @@ -725,6 +478,7 @@ class Pman extends HTML_FlexyFramework_Page $mods = $this->modulesList(); + $is_bootstrap = in_array('BAdmin', $mods); foreach($mods as $mod) { @@ -747,9 +501,11 @@ class Pman extends HTML_FlexyFramework_Page // and finally the JsTemplate... echo ''."\n"; } - + + $this->callModules('outputJavascriptIncludes', $this); + return ''; } - + var $css_includes = array(); /** * outputCSSIncludes: * @@ -760,32 +516,63 @@ class Pman extends HTML_FlexyFramework_Page */ function outputCSSIncludes() // includes on CSS links. { + $mods = $this->modulesList(); + $is_bootstrap = in_array('BAdmin', $mods); + + $this->callModules('applyCSSIncludes', $this); + foreach($this->css_includes as $module => $ar) { + + if ($ar) { + $this->assetArrayToHtml( $ar , 'css'); + } + } + + // old style... - probably remove this... + $this->callModules('outputCSSIncludes', $this); foreach($mods as $mod) { // add the css file.. + if ($is_bootstrap && !file_exists($this->rootDir."/Pman/$mod/is_bootstrap")) { + echo '"; + continue; + } $this->outputCSSDir("Pman/$mod","*.css"); + + $this->outputSCSS($mod); + + } + return ''; // needs to return something as we output it.. - $this->callModules('outputCSSIncludes', false); } + /** + * 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; + } - - - - - - - - - - + // --- OLD CODE - in for BC on MO project.... - needs removing... @@ -814,7 +601,7 @@ class Pman extends HTML_FlexyFramework_Page // and finally the JsTemplate... echo ''."\n"; } - + return ''; } /** * Gather infor for javascript files.. @@ -855,15 +642,29 @@ class Pman extends HTML_FlexyFramework_Page ksort($arfiles); // just sort by name so it's consistant for serialize.. + // The original idea of this was to serve the files direct from a publicly available 'cache' directory. + // but that doesnt really make sense - as we can just serve it from the session directory where we stick + // cached data anyway. + + /* $compile = empty($ff->Pman['public_cache_dir']) ? 0 : 1; $basedir = $compile ? $ff->Pman['public_cache_dir'] : false; $baseurl = $compile ? $ff->Pman['public_cache_url'] : false; - + */ + $compile = 1; + $basedir = session_save_path(). '/translate-cache/'; + if (!file_exists($basedir)) { + mkdir($basedir,0755); + } + $baseurl = $this->baseURL . '/Admin/Translations'; - - $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;'); - usort($files, $lsort); + if (PHP_VERSION_ID < 70000 ) { + $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;'); + usort($files, $lsort); + } else { + usort($files, function($a,$b) { return strlen($a) > strlen($b) ? 1 : -1; }); + } $smod = str_replace('/','.',$mod); @@ -1014,7 +815,7 @@ class Pman extends HTML_FlexyFramework_Page function onException($ex) { - static $reported = false; + static $reported = false; if ($reported) { return; } @@ -1026,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; @@ -1046,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) { @@ -1099,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'); @@ -1119,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; } @@ -1145,10 +970,7 @@ class Pman extends HTML_FlexyFramework_Page // DEPRECITAED - use moduleslist function modules() { return $this->modulesList(); } - // DEPRECIATED.. - use getAuthUser... - function staticGetAuthUser() { $x = new Pman(); return $x->getAuthUser(); } - - + // DEPRICATED USE Pman_Core_Mailer function emailTemplate($templateFile, $args)