X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.php;h=7c5c906dbc015e55eb5e1ef8cb35763ee8f6ea8e;hb=7d72aa15ad84a9f8e6aa9e4e07b5d7b9a1d1b221;hp=70058ad282f418a8222ca5c49f80660378284cdb;hpb=0c61c7f4b119a2e04d8a5c21522556199b01c2b5;p=Pman.Base diff --git a/Pman.php b/Pman.php index 70058ad..7c5c906 100644 --- a/Pman.php +++ b/Pman.php @@ -31,8 +31,7 @@ */ - - + require_once 'Pman/Core/AssetTrait.php'; @@ -41,7 +40,7 @@ class Pman extends HTML_FlexyFramework_Page use Pman_Core_AssetTrait; //outputJavascriptDir() //outputCssDir(); - + var $isDev = false; var $appName= ""; var $appLogo= ""; var $appShortName= ""; @@ -54,7 +53,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 +63,13 @@ 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; + /** * ------------- Standard getAuth/get/post methods of framework. * @@ -115,11 +121,19 @@ class Pman extends HTML_FlexyFramework_Page if ( !empty($_REQUEST['isDev']) && - !empty($_SERVER['SERVER_ADDR']) && ( - (($_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']) ) ) { @@ -158,7 +172,7 @@ class Pman extends HTML_FlexyFramework_Page call_user_func_array(array($c,$fn),$args); } } - return; + } function get($base, $opts=array()) @@ -173,12 +187,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) { @@ -195,7 +210,7 @@ class Pman extends HTML_FlexyFramework_Page } - if (strlen($base)) { + if (strlen($base) && $bits[0] != 'PasswordReset') { $this->jerror("BADURL","invalid url: $base"); } // deliver template @@ -254,17 +269,9 @@ class Pman extends HTML_FlexyFramework_Page } - - /** - * 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']; @@ -274,8 +281,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: @@ -292,8 +311,7 @@ class Pman extends HTML_FlexyFramework_Page $au = $this->getAuthUser(); return $au && $au->hasPerm($name,$lvl); - } - + } /** * modulesList: List the modules in the application * @@ -350,11 +368,26 @@ class Pman extends HTML_FlexyFramework_Page - + 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); + + + + } - - - + /** * ---------------- Global Tools --------------- @@ -373,18 +406,42 @@ 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) + { + if (self::$deleteOnExit === false) { + register_shutdown_function(array('Pman','deleteOnExit')); + self::$deleteOnExit = array(); + } + self::$deleteOnExit[] = $name; + } + + function tempName($ext, $deleteOnExit=false) { + $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP'); unlink($x); - return $x .'.'. $ext; + $ret = $x .'.'. $ext; + if ($deleteOnExit) { + $this->deleteOnExitAdd($ret); + } + return $ret; + } + static function deleteOnExit() + { + + foreach(self::$deleteOnExit as $fn) { + if (file_exists($fn)) { + unlink($fn); + } + } + } /** * ------------- Authentication password reset ------ ??? MOVEME? @@ -393,35 +450,6 @@ class Pman extends HTML_FlexyFramework_Page */ - 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"; - } - $this->showNewPass = implode("/", array($id,$t,$key)); - return false; - } /** * jerrAuth: standard auth failure - with data that let's the UI know.. @@ -496,12 +524,7 @@ class Pman extends HTML_FlexyFramework_Page exit; } - - - require_once 'Services/JSON.php'; - $json = new Services_JSON(); - - // log all errors!!! + // log all errors!!! $retHTML = isset($_SERVER['CONTENT_TYPE']) && preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']); @@ -518,14 +541,14 @@ class Pman extends HTML_FlexyFramework_Page if ($retHTML) { header('Content-type: text/html'); echo ""; - echo $json->encodeUnsafe(array( + 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; } @@ -543,14 +566,15 @@ class Pman extends HTML_FlexyFramework_Page } - echo $json->encode(array( + echo $this->jsencode(array( 'success'=> false, - 'data'=> array(), + '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; @@ -567,8 +591,6 @@ class Pman extends HTML_FlexyFramework_Page 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']); @@ -586,13 +608,13 @@ class Pman extends HTML_FlexyFramework_Page echo ""; // encode html characters so they can be read.. echo str_replace(array('<','>'), array('\u003c','\u003e'), - $json->encodeUnsafe(array('success'=> true, 'data' => $str))); + $this->jsencode(array('success'=> true, 'data' => $str), false)); echo ""; exit; } - echo $json->encode(array('success'=> true, 'data' => $str)); + echo $this->jsencode(array('success'=> true, 'data' => $str),true); exit; @@ -611,8 +633,7 @@ class Pman extends HTML_FlexyFramework_Page $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']); @@ -631,7 +652,7 @@ class Pman extends HTML_FlexyFramework_Page 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)); + $this->jsencode(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra, false)); echo ""; exit; } @@ -656,7 +677,7 @@ class Pman extends HTML_FlexyFramework_Page } - $ret = $json->encode(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra); + $ret = $this->jsencode(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra,true); if (!empty($cachekey)) { @@ -666,6 +687,7 @@ class Pman extends HTML_FlexyFramework_Page } file_put_contents($fn, $ret); } + echo $ret; exit; } @@ -702,8 +724,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(); } @@ -735,7 +758,7 @@ class Pman extends HTML_FlexyFramework_Page } $this->callModules('outputJavascriptIncludes', $this); - + return ''; } var $css_includes = array(); /** @@ -751,10 +774,14 @@ class Pman extends HTML_FlexyFramework_Page $mods = $this->modulesList(); - + $is_bootstrap = in_array('BAdmin', $mods); + $this->callModules('applyCSSIncludes', $this); foreach($this->css_includes as $module => $ar) { - $pg->assetArrayToHtml( $ar , 'css'); + + if ($ar) { + $this->assetArrayToHtml( $ar , 'css'); + } } // old style... - probably remove this... @@ -762,9 +789,15 @@ class Pman extends HTML_FlexyFramework_Page 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.. } @@ -775,14 +808,7 @@ class Pman extends HTML_FlexyFramework_Page - - - - - - - - + // --- OLD CODE - in for BC on MO project.... - needs removing... @@ -811,7 +837,7 @@ class Pman extends HTML_FlexyFramework_Page // and finally the JsTemplate... echo ''."\n"; } - + return ''; } /** * Gather infor for javascript files.. @@ -852,15 +878,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); @@ -1142,10 +1182,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)