projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
DataObjects
/
Core_group_right.php
diff --git
a/DataObjects/Core_group_right.php
b/DataObjects/Core_group_right.php
index
2196984
..
36d338e
100755
(executable)
--- a/
DataObjects/Core_group_right.php
+++ b/
DataObjects/Core_group_right.php
@@
-13,7
+13,7
@@
*
*
*/
*
*
*/
-require_once 'DB/DataObject.php';
+
class_exists('DB_DataObject') ? '' :
require_once 'DB/DataObject.php';
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
@@
-149,7
+149,7
@@
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
}
$has_admin = true; ///?? not sure..
if ($gid) {
}
$has_admin = true; ///?? not sure..
if ($gid) {
- $g = DB_DataObject::factory('
groups
');
+ $g = DB_DataObject::factory('
core_group
');
$g->get($this->group_id);
$has_admin = $g->type == 2 ? false : true;
}
$g->get($this->group_id);
$has_admin = $g->type == 2 ? false : true;
}
@@
-214,7
+214,7
@@
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
{
// all groups must have the minimum privaligess..
// admin group must have all the privaliges
{
// all groups must have the minimum privaligess..
// admin group must have all the privaliges
- $g = DB_DataObject::Factory('
groups
');
+ $g = DB_DataObject::Factory('
core_group
');
$g->get($this->group_id);
$defs = $this->defaultPermData();
switch($g->name) {
$g->get($this->group_id);
$defs = $this->defaultPermData();
switch($g->name) {
@@
-236,7
+236,7
@@
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
function genDefault()
{
// need to create to special groups, admin & DEFAULT.
function genDefault()
{
// need to create to special groups, admin & DEFAULT.
- $g = DB_DataObject::Factory('
Groups
');
+ $g = DB_DataObject::Factory('
core_group
');
//$g->name = 'Default';
//if (!$g->find(true)) {
// $g->insert();
//$g->name = 'Default';
//if (!$g->find(true)) {
// $g->insert();
@@
-244,7
+244,7
@@
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
$g->id = 0;
$this->applyDefs($g, 1);
$g->id = 0;
$this->applyDefs($g, 1);
- $g = DB_DataObject::Factory('
Groups
');
+ $g = DB_DataObject::Factory('
core_group
');
$g->name = 'Administrators';
$g->type = 0;
if (!$g->find(true)) {
$g->name = 'Administrators';
$g->type = 0;
if (!$g->find(true)) {
@@
-261,7
+261,7
@@
class Pman_Core_DataObjects_Core_group_right extends DB_DataObject
//echo '<PRE>';print_r($defs);
//$usecol = 1;
foreach($defs as $rightname => $defdata) {
//echo '<PRE>';print_r($defs);
//$usecol = 1;
foreach($defs as $rightname => $defdata) {
- $gr = DB_DataObject::Factory('
group_rights
');
+ $gr = DB_DataObject::Factory('
core_group_right
');
$gr->rightname = $rightname;
$gr->group_id = $g->id;
if (!$gr->find(true)) {
$gr->rightname = $rightname;
$gr->group_id = $g->id;
if (!$gr->find(true)) {