X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.php;h=7c5c906dbc015e55eb5e1ef8cb35763ee8f6ea8e;hb=7d72aa15ad84a9f8e6aa9e4e07b5d7b9a1d1b221;hp=bc377420467c10bde6b4fbf4a758a956aee4f0d0;hpb=188ec882d2422085cb7c9f188b1380a8473ac34a;p=Pman.Base diff --git a/Pman.php b/Pman.php index bc37742..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']) ) ) { @@ -255,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']; @@ -275,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: @@ -293,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 * @@ -394,24 +411,29 @@ class Pman extends HTML_FlexyFramework_Page * generate a tempory file with an extension (dont forget to delete it) */ - function tempName($ext, $deleteOnExit=false) + function deleteOnExitAdd($name) { - if ($deleteOnExit && self::$deleteOnExit === false) { + 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); $ret = $x .'.'. $ext; if ($deleteOnExit) { - self::$deleteOnExit[] = $ret; + $this->deleteOnExitAdd($ret); } return $ret; } - static $deleteOnExit = false; - static function deleteOnExit() + static function deleteOnExit() { foreach(self::$deleteOnExit as $fn) { @@ -546,7 +568,8 @@ class Pman extends HTML_FlexyFramework_Page 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. @@ -701,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(); } @@ -734,7 +758,7 @@ class Pman extends HTML_FlexyFramework_Page } $this->callModules('outputJavascriptIncludes', $this); - + return ''; } var $css_includes = array(); /** @@ -750,9 +774,11 @@ 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) { + if ($ar) { $this->assetArrayToHtml( $ar , 'css'); } @@ -763,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.. } @@ -776,14 +808,7 @@ class Pman extends HTML_FlexyFramework_Page - - - - - - - - + // --- OLD CODE - in for BC on MO project.... - needs removing... @@ -812,7 +837,7 @@ class Pman extends HTML_FlexyFramework_Page // and finally the JsTemplate... echo ''."\n"; } - + return ''; } /** * Gather infor for javascript files.. @@ -853,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); @@ -1143,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)