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 $serverName = false;
var $lang = false;
var $allowSignup = false;
-
+ var $_hasInit;
+ var $appNameShort;
+ var $appDisable;
+ var $uiConfig;
+
/**
* ------------- Standard getAuth/get/post methods of framework.
*
$this->appDisable = $boot->disable;
$this->appDisabled = explode(',', $boot->disable);
- $this->version = $boot->version;
+ $this->version = $boot->version;
+ $this->appVersion = $boot->version;
$this->uiConfig = empty($boot->Pman['uiConfig']) ? false : $boot->Pman['uiConfig'];
if (!empty($boot->Pman['local_autoauth']) &&
(($_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'])
)
)
||
*/
function jerrAuth()
{
- $au = $this->authUser();
+ $au = $this->authUser;
if ($au) {
// is it an authfailure?
$this->jerr("Permission denied to view this resource", array('authFailure' => true));
if ($cli) {
echo "ERROR: " .$str . "\n"; // print the error first, as DB might fail..
}
+ $pman = HTML_FlexyFramework::get()->Pman;
- if ($type !== false) {
+ if ($type !== false && empty($pman['nodatabase'])) {
if(!empty($errors)){
DB_DataObject::factory('Events')->writeEventLogExtra($errors);
if ($retHTML) {
header('Content-type: text/html');
- echo "<HTML><HEAD></HEAD><BODY>";
+ echo "<HTML><HEAD></HEAD><BODY><![CDATA[";
// encode html characters so they can be read..
echo str_replace(array('<','>'), array('\u003c','\u003e'),
$this->jsencode(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra, false));
- echo "</BODY></HTML>";
+ echo "]]></BODY></HTML>";
exit;
}
$mods = $this->modulesList();
+
$is_bootstrap = in_array('BAdmin', $mods);
foreach($mods as $mod) {
}
$this->callModules('outputJavascriptIncludes', $this);
-
+ return '';
}
var $css_includes = array();
/**
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..
function onException($ex)
{
- static $reported = false;
+ static $reported = false;
if ($reported) {
return;
}
{
if (!empty(HTML_FlexyFramework::get()->Pman['disable_events'])) {
+ $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
+ $de = ini_set('display_errors', 0);
+ trigger_error("$act {$str}{$remarks}" , E_USER_NOTICE);
+ ini_set('display_errors', $de );
+
+
return;
}
$au = $this->getAuthUser();