Update of /cvsroot/squirrelmail/smdoc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15960/lib Modified Files: class.anonuser.php class.object.php class.user.php lib.php smdoc.class.error.php smdoc.class.translation.php smdoc.env.group.php textism.textile.php Log Message: updates I made eons ago. Who knows what they're for anymore. (I think I changed everyone to everybody to match nobody because I am that anal). Index: class.anonuser.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/class.anonuser.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- class.anonuser.php 31 Dec 2003 05:24:39 -0000 1.7 +++ class.anonuser.php 28 Jun 2004 21:53:56 -0000 1.8 @@ -58,7 +58,7 @@ * @return bool TRUE or FALSE. */ function inGroup($groupName, $creatorid = NULL) { // *SQM - if ($groupName == 'Everyone') + if ($groupName == 'Everybody') return TRUE; elseif ($groupName == 'Nobody') return FALSE; Index: class.object.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/class.object.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -w -r1.21 -r1.22 --- class.object.php 15 Apr 2004 06:42:36 -0000 1.21 +++ class.object.php 28 Jun 2004 21:53:56 -0000 1.22 @@ -208,7 +208,8 @@ $title = NULL, $viewGroup = NULL, $adminGroup = NULL, - $deleteGroup = NULL) + $deleteGroup = NULL, + $uniqueTitle = TRUE) { $foowd->track('foowd_object->constructor'); @@ -224,7 +225,7 @@ else $this->workspaceid = 0; - if ( !$this->isTitleUnique($this->title, $this->workspaceid, $objectid) ) + if ( $uniqueTitle && !$this->isTitleUnique($this->title, $this->workspaceid, $objectid) ) { $this->objectid = 0; return FALSE; Index: class.user.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/class.user.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -w -r1.18 -r1.19 --- class.user.php 1 May 2004 19:55:47 -0000 1.18 +++ class.user.php 28 Jun 2004 21:53:57 -0000 1.19 @@ -30,10 +30,10 @@ $USER_SOURCE = array('table' => 'smdoc_user', 'table_create' => array(getClassname(USER_CLASS_ID),'makeTable')); -setPermission('base_user', 'class','login', 'Everyone'); +setPermission('base_user', 'class','login', 'Everybody'); setPermission('base_user', 'class','logout','Registered'); -setPermission('base_user', 'class','create','Everyone'); -setPermission('base_user', 'class','list', 'Everyone'); +setPermission('base_user', 'class','create','Everybody'); +setPermission('base_user', 'class','list', 'Everybody'); setPermission('base_user', 'object', 'groups', 'Gods'); setPermission('base_user', 'object', 'clone', 'Nobody'); @@ -319,7 +319,7 @@ */ function inGroup($groupName, $creatorid = NULL) { - if ($groupName == 'Everyone') // group is everyone + if ($groupName == 'Everybody') // group is everyone return TRUE; if ($groupName == 'Nobody') // group is nobody return FALSE; Index: lib.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/lib.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -w -r1.23 -r1.24 --- lib.php 14 Apr 2004 23:57:43 -0000 1.23 +++ lib.php 28 Jun 2004 21:53:57 -0000 1.24 @@ -182,7 +182,7 @@ return constant($constName); if ($className == 'foowd_object') // none found - return 'Everyone'; + return 'Everybody'; // Recurse to look at permissions of parent return getPermission(get_parent_class($className), $methodName, $type); @@ -196,7 +196,7 @@ * @param string $methodName Name of the method. * @param string $value User group string to set the permission to. */ -function setPermission($className, $type, $methodName, $value = 'Everyone') +function setPermission($className, $type, $methodName, $value = 'Everybody') { $type = strtoupper($type); if ( $type != 'CLASS' ) Index: smdoc.class.error.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/smdoc.class.error.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -r1.16 -r1.17 --- smdoc.class.error.php 1 May 2004 19:55:47 -0000 1.16 +++ smdoc.class.error.php 28 Jun 2004 21:53:57 -0000 1.17 @@ -25,7 +25,7 @@ /** METHOD PERMISSIONS **/ -setPermission('smdoc_error', 'object', 'view', 'Everyone'); +setPermission('smdoc_error', 'object', 'view', 'Everybody'); /** * Error class. Index: smdoc.class.translation.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/smdoc.class.translation.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -r1.14 -r1.15 --- smdoc.class.translation.php 1 May 2004 19:55:47 -0000 1.14 +++ smdoc.class.translation.php 28 Jun 2004 21:53:57 -0000 1.15 @@ -17,7 +17,7 @@ /** METHOD PERMISSIONS **/ setPermission('smdoc_translation', 'class', 'create', 'Translator'); -setPermission('smdoc_translation', 'class', 'enter', 'Everyone'); +setPermission('smdoc_translation', 'class', 'enter', 'Everybody'); setPermission('smdoc_translation', 'object', 'fill', 'Translator'); setPermission('smdoc_translation', 'object', 'empty', 'Translator'); setPermission('smdoc_translation', 'object', 'export', 'Gods'); Index: smdoc.env.group.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/smdoc.env.group.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- smdoc.env.group.php 1 May 2004 19:55:48 -0000 1.9 +++ smdoc.env.group.php 28 Jun 2004 21:53:57 -0000 1.10 @@ -65,9 +65,9 @@ /* * Set Available User Groups: - * - start with basic four (Everyone, Author, Gods, Nobody) + * - start with basic four (Everybody, Author, Gods, Nobody) */ - $allgroups['Everyone'] = isset($cfg['Everyone']) ? $cfg['Everyone'] : 'Everybody'; + $allgroups['Everybody'] = isset($cfg['Everybody']) ? $cfg['Everybody'] : 'Everybody'; $allgroups['Author'] = isset($cfg['Author']) ? $cfg['Author'] : 'Author'; $allgroups['Gods'] = isset($cfg['Gods']) ? $cfg['Gods'] : 'Admin'; $allgroups['Nobody'] = isset($cfg['Nobody']) ? $cfg['Nobody'] : 'Nobody'; @@ -206,7 +206,7 @@ * of user groups as 'internal name/objectid' => 'external name'. * * If userAssignOnly is TRUE, then only groups users can be assigned - * to will be returned - meaning that groups like Everyone, Nobody, and + * to will be returned - meaning that groups like Everybody, Nobody, and * Author, which are useful for defining permissions but are not assignable * to users, will be left out. * @@ -219,7 +219,7 @@ if ( $userAssignOnly ) { - unset($session_groups->value['Everyone']); + unset($session_groups->value['Everybody']); unset($session_groups->value['Author']); unset($session_groups->value['Nobody']); unset($session_groups->value['Registered']); @@ -260,7 +260,7 @@ { case 'Author': case 'Nobody': - case 'Everyone': + case 'Everybody': case 'Registered': case 'System': return TRUE; // group is a system group Index: textism.textile.php =================================================================== RCS file: /cvsroot/squirrelmail/smdoc/lib/textism.textile.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- textism.textile.php 2 Jan 2004 16:54:56 -0000 1.2 +++ textism.textile.php 28 Jun 2004 21:53:57 -0000 1.3 @@ -329,7 +329,7 @@ { global $s,$a,$c; $tatts = pba($matches[1],'table'); - +show($matches, $tatts); foreach(preg_split("/\|$/m",$matches[2],-1,PREG_SPLIT_NO_EMPTY) as $row){ if (preg_match("/^($a$c\. )(.*)/m",$row,$rmtch)) { $ratts = pba($rmtch[1],'tr'); |