$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')
) {
if (
!empty($_REQUEST['isDev'])
&&
+ !empty($_SERVER['SERVER_ADDR']) &&
(
(($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1'))
||
if (method_exists($c, $fn)) {
call_user_func_array(array($c,$fn),$args);
}
- }
+ }
+ return;
}
function get($base, $opts=array())
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;
}
$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.
}
// 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:
*
$mods = $this->modulesList();
+ $this->callModules('applyCSSIncludes', $this);
+ foreach($this->css_includes as $module => $ar) {
+ if ($ar) {
+ $pg->assetArrayToHtml( $ar , 'css');
+ }
+ }
+
+ // old style... - probably remove this...
+ $this->callModules('outputCSSIncludes', $this);
+
foreach($mods as $mod) {
// add the css file..
$this->outputCSSDir("Pman/$mod","*.css");
}
- $this->callModules('outputCSSIncludes', $this);
+
}