use Pman_Core_AssetTrait;
//outputJavascriptDir()
//outputCssDir();
-
+ var $isDev = false;
var $appName= "";
var $appLogo= "";
var $appShortName= "";
if (method_exists($c, $fn)) {
call_user_func_array(array($c,$fn),$args);
}
- }
+ }
+
}
function get($base, $opts=array())
// 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
-
+ 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..
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(),
'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;
}
$this->callModules('outputJavascriptIncludes', $this);
}
-
+ var $css_includes = array();
/**
* outputCSSIncludes:
*
$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");
}
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);
projects / Pman.Base / blobdiff