projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6eec7e8
)
DataObjects/Group_Rights.php
author
Alan Knowles
<alan@akbkhome.com>
Mon, 28 Nov 2011 08:20:55 +0000
(16:20 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Mon, 28 Nov 2011 08:20:55 +0000
(16:20 +0800)
DataObjects/Group_Rights.php
patch
|
blob
|
history
diff --git
a/DataObjects/Group_Rights.php
b/DataObjects/Group_Rights.php
index
8e3530f
..
2ff86b9
100755
(executable)
--- a/
DataObjects/Group_Rights.php
+++ b/
DataObjects/Group_Rights.php
@@
-13,7
+13,7
@@
class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
public $__table = 'Group_Rights'; // table name
public $rightname; // string(64) not_null
public $group_id; // int(11) not_null
public $__table = 'Group_Rights'; // table name
public $rightname; // string(64) not_null
public $group_id; // int(11) not_null
- public $
AccessM
ask; // string(10) not_null
+ public $
accessm
ask; // string(10) not_null
public $id; // int(11) not_null primary_key auto_increment
public $id; // int(11) not_null primary_key auto_increment
@@
-31,10
+31,10
@@
class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
$ret = array();
while($t->fetch()) {
if (isset($ret[$t->rightname])) {
$ret = array();
while($t->fetch()) {
if (isset($ret[$t->rightname])) {
- $ret[$t->rightname] = $this->mergeMask($ret[$t->rightname], $t->
AccessM
ask);
+ $ret[$t->rightname] = $this->mergeMask($ret[$t->rightname], $t->
accessm
ask);
continue;
}
continue;
}
- $ret[$t->rightname] = $t->
AccessM
ask;
+ $ret[$t->rightname] = $t->
accessm
ask;
}
// blank out rights that are disabled by the system..
$defs = $this->defaultPermData();
}
// blank out rights that are disabled by the system..
$defs = $this->defaultPermData();
@@
-164,11
+164,11
@@
class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
$defs = $this->defaultPermData();
switch($g->name) {
case "Administrators";
$defs = $this->defaultPermData();
switch($g->name) {
case "Administrators";
- $this->
AccessMask = $this->mergeMask($this->AccessM
ask, $defs[$this->rightname][0]);
+ $this->
accessmask = $this->mergeMask($this->accessm
ask, $defs[$this->rightname][0]);
break;
default:
break;
default:
- //$this->
AccessMask = $this->mergeMask($this->AccessM
ask, $defs[$this->rightname][1]);
+ //$this->
accessmask = $this->mergeMask($this->accessm
ask, $defs[$this->rightname][1]);
break;
}
break;
}
@@
-206,13
+206,13
@@
class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
$gr->rightname = $rightname;
$gr->group_id = $g->id;
if (!$gr->find(true)) {
$gr->rightname = $rightname;
$gr->group_id = $g->id;
if (!$gr->find(true)) {
- $gr->
AccessM
ask = $defdata[$usecol];
+ $gr->
accessm
ask = $defdata[$usecol];
$gr->insert();
continue;
}
$oldgr = clone($gr);
$gr->insert();
continue;
}
$oldgr = clone($gr);
- $gr->
AccessMask = $gr->mergeMask($gr->AccessM
ask, $defdata[$usecol]);
- if ($gr->
AccessMask == $oldgr->AccessM
ask) {
+ $gr->
accessmask = $gr->mergeMask($gr->accessm
ask, $defdata[$usecol]);
+ if ($gr->
accessmask == $oldgr->accessm
ask) {
continue;
}
$gr->update($oldgr);
continue;
}
$gr->update($oldgr);