Skip to content

Commit

Permalink
Fixed issue #7173: Creating user added to user group with no option t…
Browse files Browse the repository at this point in the history 
…o remove self
  • Loading branch information
@c-schmitz
c-schmitz committed Jan 13, 2013
1 parent ef8b901 commit 8b3a523
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 45 deletions.
65 changes: 27 additions & 38 deletions application/controllers/admin/usergroups.php
View file
Expand Up @@ -128,39 +128,33 @@ public function mail($ugid)
* Function responsible to delete a user group.
* @return void
*/
public function delete()
public function delete($ugid)
{
$clang = Yii::app()->lang;
$action = $_POST['action'];
$ugid = $_POST['ugid'];
$aViewUrls = array();
$aData = array();

if ($action == "delusergroup") {

if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1) {
if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1) {

if (!empty($ugid) && ($ugid > -1)) {
$result = User_groups::model()->requestEditGroup($ugid, Yii::app()->session["loginID"]);
if ($result->count() > 0) { // OK - AR count
$delquery_result = User_groups::model()->deleteGroup($ugid, Yii::app()->session["loginID"]);
if (!empty($ugid) && ($ugid > -1)) {
$result = User_groups::model()->requestEditGroup($ugid, Yii::app()->session["loginID"]);
if ($result->count() > 0) { // OK - AR count
$delquery_result = User_groups::model()->deleteGroup($ugid, Yii::app()->session["loginID"]);

if ($delquery_result) //Checked)
{
list($aViewUrls, $aData) = $this->index(false, array("type" => "success", "message" => $clang->gT("Success!")));
}
else
{
list($aViewUrls, $aData) = $this->index(false, array("type" => "warning", "message" => $clang->gT("Could not delete user group.")));
}
if ($delquery_result) //Checked)
{
list($aViewUrls, $aData) = $this->index(false, array("type" => "success", "message" => $clang->gT("Success!")));
}
else
{
list($aViewUrls, $aData) = $this->index(false, array("type" => "warning", "message" => $clang->gT("Could not delete user group.")));
}
}
else
{
list($aViewUrls, $aData) = $this->index($ugid, array("type" => "warning", "message" => $clang->gT("Could not delete user group. No group selected.")));
}
}

else
{
list($aViewUrls, $aData) = $this->index($ugid, array("type" => "warning", "message" => $clang->gT("Could not delete user group. No group selected.")));
}
}

$this->_renderWrappedTemplate('usergroup', $aViewUrls, $aData);
Expand Down Expand Up @@ -308,23 +302,18 @@ public function index($ugid = false, $header = false)
$bgcc = "evenrow";
}
$userloop[$row]["userid"] = $egurow['uid'];
if ($egurow['uid'] == $crow['owner_id']) {
$userloop[$row]["username"] = "<strong>{$egurow['users_name']}</strong>";
$userloop[$row]["email"] = "<strong>{$egurow['email']}</strong>";
$userloop[$row]["rowclass"] = $bgcc;
$userloop[$row]["displayactions"] = false;
} else {
// output users
$userloop[$row]["rowclass"] = $bgcc;
if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1) {
$userloop[$row]["displayactions"] = true;
} else {
$userloop[$row]["displayactions"] = false;
}

$userloop[$row]["username"] = $egurow['users_name'];
$userloop[$row]["email"] = $egurow['email'];
// output users
$userloop[$row]["rowclass"] = $bgcc;
if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1) {
$userloop[$row]["displayactions"] = true;
} else {
$userloop[$row]["displayactions"] = false;
}

$userloop[$row]["username"] = $egurow['users_name'];
$userloop[$row]["email"] = $egurow['email'];

$row++;
}
$aData["userloop"] = $userloop;
Expand Down
12 changes: 5 additions & 7 deletions application/views/admin/usergroup/usergroupbar_view.php
View file
Expand Up @@ -5,13 +5,11 @@
{
echo "{$grow['name']}";
} ?>


</div>
<div class='menubar-main'>
<div class='menubar-left'>
<img src='<?php echo $imageurl; ?>blank.gif' alt='' width='55' height='20' />
<img src='<?php echo $imageurl; ?>separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>separator.gif' class='separator' alt='' />

<?php if($ugid && $grpresultcount > 0)
{ ?>
Expand All @@ -23,7 +21,7 @@
<img src='<?php echo $imageurl; ?>blank.gif' alt='' width='40' height='20' />
<?php } ?>
<img src='<?php echo $imageurl; ?>blank.gif' alt='' width='78' height='20' />
<img src='<?php echo $imageurl; ?>separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>separator.gif' class='separator' alt='' />

<?php if($ugid && $grpresultcount > 0 && (Yii::app()->session['loginID'] == $grow['owner_id'] || hasGlobalPermission('USER_RIGHT_SUPERADMIN')))
{ ?>
Expand All @@ -38,15 +36,15 @@
if($ugid && $grpresultcount > 0 && (Yii::app()->session['loginID'] == $grow['owner_id'] || hasGlobalPermission('USER_RIGHT_SUPERADMIN')))
{ ?>

<a href='#' onclick="if (confirm('<?php $clang->eT("Are you sure you want to delete this entry?","js"); ?>')) { <?php echo convertGETtoPOST($this->createUrl('admin/usergroups/sa/delete')."?action=delusergroup&amp;ugid=$ugid"); ?>}">
<a href='#' onclick="if (confirm('<?php $clang->eT("Are you sure you want to delete this entry?","js"); ?>')) { <?php echo convertGETtoPOST($this->createUrl('admin/usergroups/sa/delete/ugid/'.$ugid)); ?>}">
<img src='<?php echo $imageurl; ?>delete.png' alt='<?php $clang->eT("Delete current user group"); ?>' name='DeleteUserGroup' /></a>
<?php }
else
{ ?>
<img src='<?php echo $imageurl; ?>blank.gif' alt='' width='40' height='20' />
<?php } ?>
<img src='<?php echo $imageurl; ?>blank.gif' alt='' width='92' height='20' />
<img src='<?php echo $imageurl; ?>separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>separator.gif' class='separator' alt='' />
</div>
<div class='menubar-right'>
<label for="ugid"><?php $clang->eT("User groups"); ?>:</label> <select name='ugid' id='ugid' onchange="window.location=this.options[this.selectedIndex].value">
Expand All @@ -57,7 +55,7 @@
<a href='<?php echo $this->createUrl("admin/usergroups/sa/add"); ?>'>
<img src='<?php echo $imageurl; ?>add.png' alt='<?php $clang->eT("Add new user group"); ?>' /></a>
<?php } ?>
<img src='<?php echo $imageurl; ?>separator.gif' alt='' />
<img src='<?php echo $imageurl; ?>separator.gif' class='separator' alt='' />
<img src='<?php echo $imageurl; ?>blank.gif' alt='' width='82' height='20' />
</div></div>
</div>
Expand Down

0 comments on commit 8b3a523

Please sign in to comment.