*/
-
-
+
require_once 'Pman/Core/AssetTrait.php';
use Pman_Core_AssetTrait;
//outputJavascriptDir()
//outputCssDir();
-
+ var $isDev = false;
var $appName= "";
var $appLogo= "";
var $appShortName= "";
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..
var $css_path = ''; // can inject a specific path into the base HTML 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.
*
// move away from doing this ... you can access bootLoader.XXXXXX in the master template..
$boot = HTML_FlexyFramework::get();
// echo'<PRE>';print_R($boot);exit;
- $this->appName= $boot->appName;
- $this->appNameShort= $boot->appNameShort;
+ $this->appName = $boot->appName;
+ $this->appNameShort = $boot->appNameShort;
- $this->appModules= $boot->enable;
+ $this->appModules = $boot->enable;
// echo $this->arrayToJsInclude($files);
$this->isDev = empty($boot->Pman['isDev']) ? false : $boot->Pman['isDev'];
$this->version = $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')
) {
!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'])
)
) {
}
/*
- * 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??
+ *
+ * // usage: $this->callModules('init', $base)
+ *
*/
- function initModules()
+
+ 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);
+ if (method_exists($c, $fn)) {
+ call_user_func_array(array($c,$fn),$args);
}
}
- }
-
-
+
+ }
function get($base, $opts=array())
{
$this->init();
if (empty($base)) {
- $this->initModules();
+ $this->callModules('init', $this, $base);
}
//$this->allowSignup= empty($opts['allowSignup']) ? 0 : 1;
// 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) {
}
- if (strlen($base)) {
+ if (strlen($base) && $bits[0] != 'PasswordReset') {
$this->jerror("BADURL","invalid url: $base");
}
// deliver template
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'];
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:
$au = $this->getAuthUser();
return $au && $au->hasPerm($name,$lvl);
- }
-
+ }
/**
* modulesList: List the modules in the application
*
-
+ 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 ---------------
}
}
-
+ 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?
*/
- 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..
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)){
$cli = HTML_FlexyFramework::get()->cli;
if ($cli) {
- echo "ERROR: " .$str . "\n";
exit(1); // cli --- exit code to stop shell execution if necessary.
}
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']);
if ($retHTML) {
header('Content-type: text/html');
echo "<HTML><HEAD></HEAD><BODY>";
- 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 "</BODY></HTML>";
exit;
}
}
- 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;
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']);
echo "<HTML><HEAD></HEAD><BODY>";
// 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 "</BODY></HTML>";
exit;
}
- echo $json->encode(array('success'=> true, 'data' => $str));
+ echo $this->jsencode(array('success'=> true, 'data' => $str),true);
exit;
$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']);
echo "<HTML><HEAD></HEAD><BODY>";
// 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 "</BODY></HTML>";
exit;
}
}
- $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)) {
}
file_put_contents($fn, $ret);
}
+
echo $ret;
exit;
}
*/
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();
}
// and finally the JsTemplate...
echo '<script type="text/javascript" src="'. $this->baseURL. '/Core/JsTemplate"></script>'."\n";
}
-
+
+ $this->callModules('outputJavascriptIncludes', $this);
+ return '';
}
-
+ var $css_includes = array();
/**
* outputCSSIncludes:
*
*/
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 '<!-- missing '. $this->rootDir."/Pman/$mod/is_bootstrap - skipping -->";
+ continue;
+ }
$this->outputCSSDir("Pman/$mod","*.css");
-
+ $this->outputSCSS($mod);
}
-
+ return ''; // needs to return something as we output it..
+
}
-
-
-
-
-
-
-
-
+
// --- OLD CODE - in for BC on MO project.... - needs removing...
// and finally the JsTemplate...
echo '<script type="text/javascript" src="'. $this->baseURL. '/Core/JsTemplate"></script>'."\n";
}
-
+ return '';
}
/**
* Gather infor for javascript files..
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);
// 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)
projects / Pman.Base / blobdiff