projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove invalid copyright
[Pman.Core]
/
RooTrait.php
diff --git
a/RooTrait.php
b/RooTrait.php
index
ae418d4
..
b00112a
100644
(file)
--- a/
RooTrait.php
+++ b/
RooTrait.php
@@
-10,9
+10,23
@@
trait Pman_Core_RooTrait {
var $debugEnabled = true;
var $debugEnabled = true;
+ var $appName;
+ var $appNameShort;
+ var $appModules;
+ var $isDev;
+ var $appDisable;
+ var $appDisabled;
+ var $version ;
+ var $uiConfig ;
+
+ var $cols = array();
+ var $countWhat;
+ var $colsJname;
+ var $_hasInit;
+
function init()
{
function init()
{
- if (
isset
($this->_hasInit)) {
+ if (
!empty
($this->_hasInit)) {
return;
}
return;
}
@@
-92,7
+106,7
@@
trait Pman_Core_RooTrait {
if (!is_array($id) && empty($id)) {
if (method_exists($x, 'toRooSingleArray')) {
if (!is_array($id) && empty($id)) {
if (method_exists($x, 'toRooSingleArray')) {
- $this->jok($x->toRooSingleArray($this->
getAuthUser()
, $req));
+ $this->jok($x->toRooSingleArray($this->
authUser
, $req));
}
if (method_exists($x, 'toRooArray')) {
}
if (method_exists($x, 'toRooArray')) {
@@
-132,7
+146,7
@@
trait Pman_Core_RooTrait {
}
// different symantics on all these calls??
if (method_exists($x, 'toRooSingleArray')) {
}
// different symantics on all these calls??
if (method_exists($x, 'toRooSingleArray')) {
- $this->jok($x->toRooSingleArray($this->
getAuthUser()
, $req));
+ $this->jok($x->toRooSingleArray($this->
authUser
, $req));
}
if (method_exists($x, 'toRooArray')) {
$this->jok($x->toRooArray($req));
}
if (method_exists($x, 'toRooArray')) {
$this->jok($x->toRooArray($req));
@@
-143,7
+157,7
@@
trait Pman_Core_RooTrait {
}
}
- var $cols = array();
+
function loadMap($do, $cfg =array())
{
function loadMap($do, $cfg =array())
{
@@
-152,7
+166,7
@@
trait Pman_Core_RooTrait {
$excludecolumns = !empty($cfg['exclude']) ? $cfg['exclude'] : array();
$excludecolumns[] = 'passwd'; // we never expose passwords
$excludecolumns = !empty($cfg['exclude']) ? $cfg['exclude'] : array();
$excludecolumns[] = 'passwd'; // we never expose passwords
- DB_DataObject::debugLevel(1);
+
$ret = $do->autoJoin(array(
'include' => $onlycolumns,
'exclude' => $excludecolumns,
$ret = $do->autoJoin(array(
'include' => $onlycolumns,
'exclude' => $excludecolumns,
@@
-171,7
+185,7
@@
trait Pman_Core_RooTrait {
{
if (method_exists($x, 'applyFilters')) {
// DB_DataObject::debugLevel(1);
{
if (method_exists($x, 'applyFilters')) {
// DB_DataObject::debugLevel(1);
- if (false === $x->applyFilters($q, $this->
getAuthUser()
, $this)) {
+ if (false === $x->applyFilters($q, $this->
authUser
, $this)) {
return;
}
}
return;
}
}
@@
-257,7
+271,7
@@
trait Pman_Core_RooTrait {
$x->whereAdd("(on_id = $oid OR
on_id IN ( SELECT distinct(id) FROM Documents WHERE original = $o )
)");
$x->whereAdd("(on_id = $oid OR
on_id IN ( SELECT distinct(id) FROM Documents WHERE original = $o )
)");
- continue;
+ continue
2
;
}
$x->on_id = $val;
}
$x->on_id = $val;
@@
-281,7
+295,7
@@
trait Pman_Core_RooTrait {
}
}
- continue;
+ continue
2
;
}
}
if (!empty($q_filtered)) {
}
}
if (!empty($q_filtered)) {
@@
-310,7
+324,7
@@
trait Pman_Core_RooTrait {
return;
}
return;
}
- if (
Pman
::$permitError) {
+ if (
self
::$permitError) {
return;
return;
@@
-368,7
+382,7
@@
trait Pman_Core_RooTrait {
if (!method_exists($obj, 'checkPerm')) {
return true;
}
if (!method_exists($obj, 'checkPerm')) {
return true;
}
- if ($obj->checkPerm($lvl, $this->
getAuthUser()
, $req)) {
+ if ($obj->checkPerm($lvl, $this->
authUser
, $req)) {
return true;
}
return true;
}