[Obliquid-cvs] obliquid/common/classes/obliquid user.php, 1.68, 1.69
Status: Beta
Brought to you by:
slocati
Menu
▾
▴
[Obliquid-cvs] obliquid/common/classes/obliquid user.php, 1.68, 1.69
|
From: <sl...@sc...> - 2007-04-29 09:59:29
|
Update of /cvsroot/obliquid/obliquid/common/classes/obliquid In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19098/classes/obliquid Modified Files: user.php Log Message: Added support for clear text groupname Index: user.php =================================================================== RCS file: /cvsroot/obliquid/obliquid/common/classes/obliquid/user.php,v retrieving revision 1.68 retrieving revision 1.69 diff -b -u -d -r1.68 -r1.69 --- user.php 21 May 2005 16:49:50 -0000 1.68 +++ user.php 29 Apr 2007 09:59:24 -0000 1.69 @@ -46,16 +46,19 @@ if (!is_array($groupname) || !is_array($description)) return false; $has_groupname=false; $_obweb->getLanguages(); + $name_clear=""; for ($i=0; $i<count($_obweb->language); $i++) { $locale=$_obweb->language[$i]["value"]; + if ($name_clear=="") $name_clear = $groupname[$locale]; if ($groupname[$locale]!="") $has_groupname=true; } if (!$has_groupname) return false; $ok=$_obweb->mb->getSequenceNextValue($_obweb->tprefix."group", $id_group); if (!$ok) return 0; $sql="INSERT INTO ".$_obweb->tprefix - .sprintf("group (id_group, groupname, description, is_role) VALUES (%d, %s, %s, %s)", + .sprintf("group (id_group, groupname, name_clear, description, is_role) VALUES (%d, %s, %s, %s, %s)", $id_group, $_obweb->mb->GetTextFieldValue(base64_encode(serialize($groupname))), + $_obweb->mb->GetTextFieldValue($name_clear), $_obweb->mb->GetTextFieldValue(base64_encode(serialize($description))), $_obweb->mb->GetBooleanFieldValue($is_role)); $ok=$_obweb->mb->Query($sql); @@ -77,14 +80,17 @@ if (!is_array($groupname) || !is_array($description)) return false; $has_groupname=false; $_obweb->getLanguages(); + $name_clear=""; for ($i=0; $i<count($_obweb->language); $i++) { $locale=$_obweb->language[$i]["value"]; + if ($name_clear=="") $name_clear = $groupname[$locale]; if ($groupname[$locale]!="") $has_groupname=true; } if (!$has_groupname) return false; $sql="UPDATE ".$_obweb->tprefix - .sprintf("group SET groupname=%s, description=%s, is_role=%s WHERE id_group=%d", + .sprintf("group SET groupname=%s, name_clear=%s, description=%s, is_role=%s WHERE id_group=%d", $_obweb->mb->GetTextFieldValue(base64_encode(serialize($groupname))), + $_obweb->mb->GetTextFieldValue($name_clear), $_obweb->mb->GetTextFieldValue(base64_encode(serialize($description))), $_obweb->mb->GetBooleanFieldValue($is_role), $id_group); @@ -101,7 +107,6 @@ function delGroup($id_group) { global $_obweb; - //delete of associated operations $sql=sprintf("DELETE FROM %ssecurity WHERE ug='g%d'", $_obweb->tprefix, $id_group); @@ -130,7 +135,6 @@ function readGroup($id_group, &$groupname, &$description) { global $_obweb; - $sql="SELECT groupname, description FROM ".$_obweb->tprefix .sprintf("group WHERE id_group=%d", $id_group); $ok=$_obweb->mb->QueryRow($sql, $row); @@ -150,7 +154,6 @@ function groupInfo($id_group, &$groupname, &$groupdesc) { global $_obweb; - $description=""; if ($id_group=="**") { $groupname=_l("Everyone"); @@ -180,7 +183,6 @@ function groupIdToNames($groupIds) { global $_obweb; - $names=""; $group=explode(",", $groupIds); for ($j=0; $j<count($group); $j++) { @@ -198,7 +200,6 @@ function groupIds($id_person) { global $_obweb; - $sql = "SELECT id_group FROM " .$_obweb->tprefix."person_group WHERE id_person=$id_person"; $_obweb->mb->queryColumn($sql, $grps); @@ -223,7 +224,6 @@ function &listGroups($get="G") { global $_obweb; - $sql="SELECT id_group, groupname, description FROM ".$_obweb->tprefix."group "; if ($get=="G") { $sql.=sprintf("WHERE is_role=%s", $_obweb->mb->GetBooleanFieldValue(false)); @@ -286,7 +286,6 @@ function &listUserGroups($id_person) { global $_obweb; - $sql="SELECT gr.id_group, groupname, description FROM ".$_obweb->tprefix ."group AS gr, ".$_obweb->tprefix .sprintf("person_group AS pg WHERE gr.id_group=pg.id_group AND pg.id_person=%d", @@ -323,7 +322,6 @@ function peekHas($a, $b, $c, $p=0) { global $_obweb; - if ($p==0) { //If no special person, just use the normal routine return $_obweb->has($id_module,$name,$c); @@ -376,7 +374,6 @@ function has($id_module, $name, $c="") { global $_obweb; - return $_obweb->has($id_module,$name,$c); } @@ -394,7 +391,6 @@ */ function ensure_has($a, $b, $c, $t) { global $_obweb; - $secobj = $a.":".$b.":".$c; $sql = sprintf("SELECT count(id_security) FROM %ssecurity WHERE ifq='%s'", $_obweb->tprefix, $secobj); @@ -423,7 +419,6 @@ function loadRole($filename, $id_group=0, $id_security=0) { global $_obweb; - $fp = fopen($filename, "r"); $inserted=0; $line_n=0; @@ -511,7 +506,6 @@ */ function canViewUser($id_person) { global $_obweb; - //we can see the user 0 (we're probably adding a user) and ourself if ($_SESSION["_obperson"]["id_person"]==$id_person || !$id_person) return true; //if we can view any group, we can view any person @@ -535,7 +529,6 @@ */ function hasGroup($id_person, $id_group) { global $_obweb; - //build query $sql= "SELECT COUNT(id_group) FROM ".$_obweb->tprefix .sprintf("person_group WHERE id_person=%d AND id_group=%d",$id_person,$id_group); @@ -550,7 +543,6 @@ */ function delete($id_person) { global $_obweb; - $dbf =& new db_form(); $dbf->setDBConnection($_obweb->mb); $dbf->setTable("person_group", $_obweb->tprefix); @@ -596,12 +588,4 @@ { global $_obweb; - $dbf =& new db_form(); - $dbf->setDBConnection($_obweb->mb); - $dbf->setTable("person_group", $_obweb->tprefix); - $dbf->setFormValue("id_person", $id_person); - $dbf->setFormValue("id_group", $id_group); - $dbf->executeSqlDelete(false, _l("Removing a group from a user"), "user", true); - } - } |
