/** Entry point */
function wfSpecialUserlevels($par=null) {
global $wgRequest;
+ # Debug statement
// print_r($_POST);
$form = new UserlevelsForm($wgRequest);
$form->execute();
if($this->mRequest->getCheck('savegroup')) {
$this->saveGroup($this->mRequest->getVal('editgroup-name'),
$this->mRequest->getVal('editgroup-oldname'),
- $this->mRequest->getVal('editgroup-description'));
+ $this->mRequest->getVal('editgroup-description'),
+ $this->mRequest->getVal('editgroup-getrights'));
} elseif($this->mRequest->getCheck('saveusergroups')) {
$this->saveUserGroups($this->mRequest->getVal('user-editname'),
* @param string $newname Group name.
* @param string $oldname Old (current) group name.
* @param string $description Group description.
- * @todo FIXME : doesnt validate anything.
+ *
+ * @todo FIXME : doesnt validate anything. Log is incorrect.
*/
- function saveGroup($newname, $oldname, $description) {
+ function saveGroup($newname, $oldname, $description, $rights) {
$newame = trim($newname);
if($oldname == '') {
// save stuff
$g->setName($newname);
$g->setDescription($description);
+ if(isset($rights)) { $g->setRights( implode(',',$rights) ); }
+
$g->save();
+
+ $log = new LogPage( 'rights' );
+ $log->addEntry( 'rights', Title::makeTitle( NS_SPECIAL, $g->getName()) , ' '.$g->getRights() );
+
}
/**
* @param string $username Username to apply changes to.
* @param array $removegroup id of groups to be removed.
* @param array $addgroup id of groups to be added.
+ *
+ * @todo Log groupname instead of group id.
*/
function saveUserGroups($username,$removegroup,$addgroup) {
$u = User::NewFromName($username);
-
- print "ADD:\n";
- print_r($addgroup);
- print "DEL:\n";
- print_r($removegroup);
-
+
if(is_null($u)) {
$wgOut->addHTML('<p>'.wfMsg('nosuchusershort',$username).'</p>');
return;
$u->setID( $id );
$groups = $u->getGroups();
+ $logcomment = ' ';
// remove then add groups
- $groups = array_diff($groups, $removegroup);
- $groups = array_merge($groups, $addgroup);
+ if(isset($removegroup)) {
+ $groups = array_diff($groups, $removegroup);
+ $logcomment .= implode( ' -', $removegroup);
+ }
+ if(isset($addgroup)) {
+ $groups = array_merge($groups, $addgroup);
+ $logcomment .= implode( ' +', $addgroup );
+ }
// save groups in user object and database
$u->setGroups($groups);
$u->saveSettings();
+
+ $log = new LogPage( 'rights' );
+ $log->addEntry( 'rights', Title::makeTitle( NS_USER, $u->getName() ), $logcomment );
}
/**
global $wgOut;
// group selection
- $wgOut->addHTML( "<form name=\"ulgroup\" action=\"$this->action\" method=\"post\">" );
+ $wgOut->addHTML( "<form name=\"ulgroup\" action=\"$this->action\" method=\"post\">\n" );
$wgOut->addHTML( $this->fieldset( 'lookup-group',
$this->HTMLSelectGroups('group-edit', array(0 => $this->mRequest->getVal($this->mName.'-group-edit')) ) .
- ' <input type="submit" name="seditgroup" value="'.wfMsg('editgroup').'">' .
- '<br /><input type="submit" name="saddgroup" value="'.wfMsg('addgroup').'">'
+ ' <input type="submit" name="seditgroup" value="'.wfMsg('editgroup').'" />' .
+ '<br /><input type="submit" name="saddgroup" value="'.wfMsg('addgroup').'" />'
));
- $wgOut->addHTML( "</form>" );
+ $wgOut->addHTML( "</form>\n" );
// user selection
- $wgOut->addHTML( "<form name=\"uluser\" action=\"$this->action\" method=\"post\">" );
+ $wgOut->addHTML( "<form name=\"uluser\" action=\"$this->action\" method=\"post\">\n" );
$wgOut->addHTML( $this->fieldset( 'lookup-user',
$this->textbox( 'user-editname' ) .
- '<input type="submit" name="ssearchuser" value="'.wfMsg('editusergroup').'">'
+ '<input type="submit" name="ssearchuser" value="'.wfMsg('editusergroup').'" />'
));
- $wgOut->addHTML( "</form>" );
+ $wgOut->addHTML( "</form>\n" );
}
/**
*/
function editGroupForm($groupID = 0) {
global $wgOut;
-
+
if($this->mRequest->getVal('seditgroup')) {
// fetch data if we edit a group
$g = Group::newFromID($groupID);
- $gName = $g->getName();
- $gDescription = $g->getDescription();
$fieldname = 'editgroup';
} else {
// default datas when we add a group
- $gName = '';
- $gDescription = '';
+ $g = new group();
$fieldname = 'addgroup';
}
- $wgOut->addHTML( "<form name=\"editGroup\" action=\"$this->action\" method=\"post\">".
- '<input type="hidden" name="editgroup-oldname" value="'.$gName.'">');
+ $gName = $g->getName();
+ $gDescription = $g->getDescription();
+
+
+ $wgOut->addHTML( "<form name=\"editGroup\" action=\"$this->action\" method=\"post\">\n".
+ '<input type="hidden" name="editgroup-oldname" value="'.$gName.'" />');
$wgOut->addHTML( $this->fieldset( $fieldname,
$this->textbox( 'editgroup-name', $gName ) .
$this->textareabox( 'editgroup-description', $gDescription ) .
- '<input type="submit" name="savegroup" value="'.wfMsg('savegroup').'">'
+ '<br /><table border="0" align="center"><tr><td>'.
+ $this->HTMLSelectRights($g->getRights()).
+ '</td></tr></table>'."\n".
+ '<input type="submit" name="savegroup" value="'.wfMsg('savegroup').'" />'
));
- $wgOut->addHTML( "</form>" );
+
+ $wgOut->addHTML( "</form>\n" );
}
/**
$groups = $user->getGroups();
- $wgOut->addHTML( "<form name=\"editGroup\" action=\"$this->action\" method=\"post\">".
- '<input type="hidden" name="user-editname" value="'.$username.'">');
+ $wgOut->addHTML( "<form name=\"editGroup\" action=\"$this->action\" method=\"post\">\n".
+ '<input type="hidden" name="user-editname" value="'.$username.'" />');
$wgOut->addHTML( $this->fieldset( 'editusergroup',
- wfMsg('editing', $this->mRequest->getVal('user-editname')).'.<br />' .
- '<table border="0"><tr><td>'.
+ wfMsg('editing', $this->mRequest->getVal('user-editname')).".<br />\n" .
+ '<table border="0" align="center"><tr><td>'.
$this->HTMLSelectGroups('groupsmember', $groups,true,6).
'</td><td>'.
$this->HTMLSelectGroups('groupsavailable', $groups,true,6,true).
- '</td></tr></table>'.
- '<p>'.wfMsg('userlevels-groupshelp').'</p>'.
- '<input type="submit" name="saveusergroups" value="'.wfMsg('saveusergroups').'">'
+ '</td></tr></table>'."\n".
+ '<p>'.wfMsg('userlevels-groupshelp').'</p>'."\n".
+ '<input type="submit" name="saveusergroups" value="'.wfMsg('saveusergroups').'" />'
));
- $wgOut->addHTML( "</form>" );
+ $wgOut->addHTML( "</form>\n" );
}
function HTMLSelectGroups($selectname, $selected=array(), $multiple=false, $size=6, $reverse=false) {
$selectname = $this->mName.'-'.$selectname;
$dbr =& wfGetDB( DB_SLAVE );
- $sql = 'SELECT group_id, group_name FROM `group`';
+ $group = $dbr->tableName( 'group' );
+ $sql = "SELECT group_id, group_name FROM $group";
$res = $dbr->query($sql,'wfSpecialAdmin');
$out = wfMsg($selectname);
$out .= '<select name="'.$selectname;
- if($multiple) { $out.='[]" multiple size="'.$size; }
- $out.='">';
+ if($multiple) { $out.='[]" multiple="multiple" size="'.$size; }
+ $out.= "\">\n";
while($g = $dbr->fetchObject( $res ) ) {
if($multiple) {
// for multiple will only show the things we want
if(in_array($g->group_id, $selected) xor $reverse) {
- $out .= '<option value="'.$g->group_id.'">'.$g->group_name.'</option>';
+ $out .= '<option value="'.$g->group_id.'">'.$g->group_name."</option>\n";
}
} else {
$out .= '<option ';
- if(in_array($g->group_id, $selected)) { $out .= 'selected '; }
- $out .= 'value="'.$g->group_id.'">'.$g->group_name.'</option>';
+ if(in_array($g->group_id, $selected)) { $out .= 'selected="selected" '; }
+ $out .= 'value="'.$g->group_id.'">'.$g->group_name."</option>\n";
}
}
-
- $out .= '</select>';
+ $out .= "</select>\n";
+ return $out;
+ }
+
+ function HTMLSelectRights($selected='') {
+ global $wgAvailableRights;
+ $out = '<select name="editgroup-getrights[]" multiple="multiple">';
+ $groupRights = explode(',',$selected);
+
+ foreach($wgAvailableRights as $right) {
+
+ // check box when right exist
+ if(in_array($right, $groupRights)) { $selected = 'selected="selected" '; }
+ else { $selected = ''; }
+
+ $out .= '<option value="'.$right.'" '.$selected.'>'.$right."</option>\n";
+ }
+ $out .= "</select>\n";
return $out;
}
-
}
?>
dépôts / lhc / web / wiklou.git / blobdiff