* - authentication link checking?? MOVEME?
* - authentication reset password ?? MOVEME?
* ?? arrayClean.. what's it doing here?!? ;)
+ *
+ *
+ * OPTIONS
+ * Pman['local_autoauth'] // who to login as when using localhost
+ * Pman['isDev'] // can the site show develpment info.?
+ * Pman['uiConfig'] // extra variable to export to front end..
+ * Pman['auth_comptype'] // -- if set to 'OWNER' then only users with company=OWNER can log in
+ * Pman['authTable'] // the authentication table (default 'person')
+ *
*
* Usefull implemetors
* DB_DataObject*:*toEventString (for logging - this is generically prefixed to all database operations.)
* - any data object where this method exists, the result will get prefixed to the log remarks
*/
+
+
+
+
+require_once 'Pman/Core/AssetTrait.php';
+
class Pman extends HTML_FlexyFramework_Page
{
+ use Pman_Core_AssetTrait;
+ //outputJavascriptDir()
+ //outputCssDir();
+
var $appName= "";
var $appLogo= "";
var $appShortName= "";
var $disable_jstemplate = false; /// disable inclusion of jstemplate code..
var $company = false;
+ var $css_path = ''; // can inject a specific path into the base HTML page.
+
+
+ var $transObj = false; // used to rollback or commit in JOK/JERR
/**
* ------------- Standard getAuth/get/post methods of framework.
*
$this->loadOwnerCompany();
return true;
-
}
- function init()
+ function init($base = false)
{
+
if (isset($this->_hasInit)) {
return;
}
// 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->css_path = empty($boot->Pman['css_path']) ? '' : $boot->Pman['css_path'];
+
$this->appDisable = $boot->disable;
$this->appDisabled = explode(',', $boot->disable);
$this->version = $boot->version;
$this->uiConfig = empty($boot->Pman['uiConfig']) ? false : $boot->Pman['uiConfig'];
- if (!empty($ff->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')
) {
$this->isDev = true;
}
+ if (
+ !empty($_REQUEST['isDev'])
+ &&
+ !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'))
+ )
+
+ ) {
+ $boot->Pman['isDev'] = true;
+ $this->isDev = true;
+ }
+
// if a file Pman_{module}_Pman exists.. and it has an init function... - call that..
//var_dump($this->appModules);
}
/*
- * 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)
+ function get($base, $opts=array())
{
$this->init();
if (empty($base)) {
- $this->initModules();
+ $this->callModules('init', $this, $base);
}
//$this->allowSignup= empty($opts['allowSignup']) ? 0 : 1;
$bits = explode('/', $base);
- //print_R($bits);
- if ($bits[0] == 'Link') {
- $this->linkFail = $this->linkAuth(@$bits[1],@$bits[2]);
- header('Content-type: text/html; charset=utf-8');
- return;
- }
+
// 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)) {
- $this->addEvent("BADURL", false, $base);
- $this->jerr("invalid url");
+ if (strlen($base) && $bits[0] != 'PasswordReset') {
+ $this->jerror("BADURL","invalid url: $base");
}
// deliver template
if (isset($_GET['onloadTrack'])) {
//var_dump($this->isDev);
// force regeneration on load for development enviroments..
- HTML_FlexyFramework::get()->generateDataobjectsCache($this->isDev);
+ HTML_FlexyFramework::get()->generateDataobjectsCache($this->isDev && !empty($_REQUEST['isDev']));
//header('Content-type: application/xhtml+xml; charset=utf-8');
if ($this->company && $this->company->logo_id) {
$im = DB_DataObject::Factory('Images');
$im->get($this->company->logo_id);
- $this->appLogo = $this->baseURL . '/Images/Thumb/300x100/'. $this->company->logo_id .'/' . $im->filename;
+ $this->appLogo = $this->baseURL . '/Images/Thumb/x100/'. $this->company->logo_id .'/' . $im->filename;
}
header('Content-type: text/html; charset=utf-8');
/**
* loadOwnerCompany:
* finds the compay with comptype=='OWNER'
+ * ?? what about comptype_id-name ?????
*
* @return {Pman_Core_DataObjects_Companies} the owner company
*/
{
// only applies if authtable is person..
$ff = HTML_FlexyFramework::get();
- if (!empty($ff->Pman['authTable']) && $ff->Pman['authTable'] != 'Person') {
+ if (!empty($ff->Pman['authTable']) && !in_array($ff->Pman['authTable'] , [ 'core_person', 'Person' ])) {
return false;
}
- $this->company = DB_DataObject::Factory('Companies');
+ $this->company = DB_DataObject::Factory('core_company');
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;
}
return $this->authUser;
}
$ff = HTML_FlexyFramework::get();
- $tbl = empty($ff->Pman['authTable']) ? 'Person' : $ff->Pman['authTable'];
+ $tbl = empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable'];
$u = DB_DataObject::factory( $tbl );
- if (!$u->isAuth()) {
+
+ if (is_a($u,'PEAR_Error') || !$u->isAuth()) {
return false;
}
$this->authUser =$u->getAuthUser();
/**
* hasPerm:
* wrapper arround authuser->hasPerm
- * @see Pman_Core_DataObjects_User::hasPerm
+ * @see Pman_Core_DataObject_Core_person::hasPerm
*
* @param {String} $name The permission name (eg. Projects.List)
* @param {String} $lvl eg. (C)reate (E)dit (D)elete ... etc.
}
$ret[] = $mod;
}
- print_R($ret);exit;
return $ret;
}
return in_array($name, $this->modules());
}
- $x = DB_DataObject::factory('Group_Rights');
+ $x = DB_DataObject::factory('core_group_right');
$ar = $x->defaultPermData();
if (empty($ar[$name]) || empty($ar[$name][0])) {
return false;
* generate a tempory file with an extension (dont forget to delete it)
*/
- function tempName($ext)
+ function tempName($ext, $deleteOnExit=false)
{
+ if ($deleteOnExit && self::$deleteOnExit === false) {
+ register_shutdown_function(array('Pman','deleteOnExit'));
+ self::$deleteOnExit = array();
+ }
$x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP');
unlink($x);
- return $x .'.'. $ext;
+ $ret = $x .'.'. $ext;
+ if ($deleteOnExit) {
+ self::$deleteOnExit[] = $ret;
+ }
+ return $ret;
+
}
- /**
- * ------------- Authentication testing ------ ??? MOVEME?
- *
- *
- */
- function linkAuth($trid, $trkey)
+
+ static $deleteOnExit = false;
+ static function deleteOnExit()
{
- $tr = DB_DataObject::factory('Documents_Tracking');
- if (!$tr->get($trid)) {
- return "Invalid URL";
- }
- if (strtolower($tr->authkey) != strtolower($trkey)) {
- $this->AddEvent("ERROR-L", false, "Invalid Key");
- return "Invalid KEY";
- }
- // check date..
- $this->onloadTrack = (int) $tr->doc_id;
- if (strtotime($tr->date_sent) < strtotime("NOW - 14 DAYS")) {
- $this->AddEvent("ERROR-L", false, "Key Expired");
- return "Key Expired";
- }
- // user logged in and not
- $au = $this->getAuthUser();
- if ($au && $au->id && $au->id != $tr->person_id) {
- $au->logout();
-
- return "Logged Out existing Session\n - reload to log in with correct key";
- }
- if ($au) { // logged in anyway..
- $this->AddEvent("LOGIN", false, "With Key (ALREADY)");
- header('Location: ' . $this->baseURL.'?onloadTrack='.$this->onloadTrack);
- exit;
- return false;
- }
-
- // authenticate the user...
- // slightly risky...
- $u = DB_DataObject::factory('Person');
-
- $u->get($tr->person_id);
- $u->login();
- $this->AddEvent("LOGIN", false, "With Key");
-
- // we need to redirect out - otherwise refererer url will include key!
- header('Location: ' . $this->baseURL.'?onloadTrack='.$this->onloadTrack);
- exit;
-
- return false;
-
-
-
+ foreach(self::$deleteOnExit as $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('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..
/**
* ---------------- 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..
{
- $this->addEvent("ERROR", false, $str);
+ 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) {
- echo "ERROR: " .$str . "\n";
- exit;
+ exit(1); // cli --- exit code to stop shell execution if necessary.
}
// log all errors!!!
+ $retHTML = isset($_SERVER['CONTENT_TYPE']) &&
+ preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
- if (!empty($_REQUEST['returnHTML']) ||
- (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 "<HTML><HEAD></HEAD><BODY>";
echo $json->encodeUnsafe(array(
}
function jok($str)
{
+ if ($this->transObj ) {
+ $this->transObj->query( connection_aborted() ? 'ROLLBACK' : 'COMMIT');
+ }
+
$cli = HTML_FlexyFramework::get()->cli;
if ($cli) {
echo "OK: " .$str . "\n";
require_once 'Services/JSON.php';
$json = new Services_JSON();
- if (!empty($_REQUEST['returnHTML']) ||
- (isset($_SERVER['CONTENT_TYPE']) && preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']))
+ $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 "<HTML><HEAD></HEAD><BODY>";
// encode html characters so they can be read..
$extra= $extra ? $extra : array();
require_once 'Services/JSON.php';
$json = new Services_JSON();
- if (isset($_SERVER['CONTENT_TYPE']) && preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE'])) {
+
+ $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 "<HTML><HEAD></HEAD><BODY>";
*/
function outputJavascriptIncludes()
{
+ // BC support - currently 1 project still relies on this.. (MO portal)
+ $o = HTML_FlexyFramework::get()->Pman_Core;
+ if (isset($o['packseed'])) {
+ return $this->outputJavascriptIncludesBC();
+ }
+
$mods = $this->modulesList();
+ $is_bootstrap = in_array('BAdmin', $mods);
+
foreach($mods as $mod) {
// add the css file..
-
- $files = $this->moduleJavascriptList($mod.'/widgets');
- foreach($files as $f) {
- echo '<script type="text/javascript" src="'. $f. '"></script>'."\n";
- }
-
- $files = $this->moduleJavascriptList($mod);
- foreach($files as $f) {
- echo '<script type="text/javascript" src="'. $f. '"></script>'."\n";
+ if ($is_bootstrap) {
+ if (!file_exists($this->rootDir."/Pman/$mod/is_bootstrap")) {
+ echo '<!-- missing '. $this->rootDir."/Pman/$mod/is_bootstrap - skipping -->";
+ continue;
+ }
+
}
+
+ $this->outputJavascriptDir("Pman/$mod/widgets", "*.js");
+ $this->outputJavascriptDir("Pman/$mod", "*.js");
}
+
if (empty($this->disable_jstemplate)) {
// and finally the JsTemplate...
echo '<script type="text/javascript" src="'. $this->baseURL. '/Core/JsTemplate"></script>'."\n";
}
+
+ $this->callModules('outputJavascriptIncludes', $this);
}
+ var $css_includes = array();
/**
* outputCSSIncludes:
*
*/
function outputCSSIncludes() // includes on CSS links.
{
+
$mods = $this->modulesList();
+ $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..
- $dir = $this->rootDir.'/Pman/'.$mod;
- $ar = glob($dir . '/*.css');
- foreach($ar as $fn) {
- $css = $this->rootURL .'/Pman/'.$mod.'/'.basename($fn) . '?ts=' . filemtime($fn);
- echo '<link rel="stylesheet" type="text/css" href="'.$css.'" />'."\n";
- }
+ $this->outputCSSDir("Pman/$mod","*.css");
+ }
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ // --- OLD CODE - in for BC on MO project.... - needs removing...
+
+ // used on old versions.....
+ function outputJavascriptIncludesBC()
+ {
+
+ $mods = $this->modulesList();
+
+ foreach($mods as $mod) {
+ // add the css file..
+
+ $files = $this->moduleJavascriptList($mod.'/widgets');
+ foreach($files as $f) {
+ echo '<script type="text/javascript" src="'. $f. '"></script>'."\n";
+ }
+
+ $files = $this->moduleJavascriptList($mod);
+ foreach($files as $f) {
+ echo '<script type="text/javascript" src="'. $f. '"></script>'."\n";
+ }
}
+ if (empty($this->disable_jstemplate)) {
+ // and finally the JsTemplate...
+ echo '<script type="text/javascript" src="'. $this->baseURL. '/Core/JsTemplate"></script>'."\n";
+ }
}
-
/**
* Gather infor for javascript files..
*
$basedir = $compile ? $ff->Pman['public_cache_dir'] : false;
$baseurl = $compile ? $ff->Pman['public_cache_url'] : false;
+
+
+
$lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
usort($files, $lsort);
* Error handling...
* PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError'));
*/
+ function initErrorHandling()
+ {
+ if (!class_exists('HTML_FlexyFramework2')) {
+ // what about older code that still users PEAR?
+ PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError'));
+ }
+ set_exception_handler(array($this,'onException'));
+
+ }
+
- static $permitError = false;
+ static $permitError = false; // static why?
+
+ var $showErrorToUser = true;
function onPearError($err)
{
- static $reported = false;
+ return $this->onException($err);
+
+ }
+
+
+ function onException($ex)
+ {
+ static $reported = false;
if ($reported) {
return;
}
if (Pman::$permitError) {
-
return;
-
}
$reported = true;
- $out = $err->toString();
+
+ $out = is_a($ex,'Exception') || is_a($ex, 'Error') ? $ex->getMessage() : $ex->toString();
//print_R($bt); exit;
$ret = array();
$n = 0;
- foreach($err->backtrace as $b) {
+ $bt = is_a($ex,'Exception')|| is_a($ex, 'Error') ? $ex->getTrace() : $ex->backtrace;
+ if (is_a($ex,'Exception')|| is_a($ex, 'Error') ) {
+ $ret[] = $ex->getFile() . '('. $ex->getLine() . ')';
+ }
+ foreach( $bt as $b) {
$ret[] = @$b['file'] . '(' . @$b['line'] . ')@' . @$b['class'] . '::' . @$b['function'];
if ($n > 20) {
break;
}
//convert the huge backtrace into something that is readable..
$out .= "\n" . implode("\n", $ret);
-
- $this->jerr($out);
+ $this->addEvent("EXCEPTION", false, $out);
+
+ if ($this->showErrorToUser) {
+ print_R($out);exit;
+ }
+ // not sure why this is here... - perhaps doing a jerr() was actually caught by the UI, and hidden from the user..?
+ $this->jerror(false,"An error Occured, please contact the website owner");
+ //$this->jerr($out);
}
$e = DB_DataObject::factory('Events');
$e->init($act,$obj,$remarks);
- $e->event_when = date('Y-m-d H:i:s');
+ $e->event_when = $e->sqlValue('NOW()');
$eid = $e->insert();
return $e;
}
+
+ function addEventNotifyOnly($act, $obj = false, $remarks = '')
+ {
+ $au = $this->getAuthUser();
+
+ $e = DB_DataObject::factory('Events');
+ $e->init($act,$obj,$remarks);
+
+ $e->event_when = $e->sqlValue('NOW()');
+ $wa = DB_DataObject::factory('core_watch');
+ if (method_exists($wa,'notifyEvent')) {
+ $wa->notifyEvent($e); // trigger any actions..
+ }
+ }
+
+
// ------------------ DEPERCIATED ----------------------------
// DEPRECITAED - use moduleslist
projects / Pman.Base / blobdiff