Commit: 3c06b8fa87134b2032e56c8dd07b77c99721df9e Author: Hannes Magnusson <[email protected]> Thu, 26 Dec 2013 22:41:08 -0800 Parents: d912ba3d4c3130ce58e91a6681de422865c5d6a5 Branches: master
Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=3c06b8fa87134b2032e56c8dd07b77c99721df9e Log: Kill 'noclose'... No autoclosing of the window.. Avoids accidental clicks Changed paths: M manage/users.php Diff: diff --git a/manage/users.php b/manage/users.php index e5b2d62..c7a2552 100644 --- a/manage/users.php +++ b/manage/users.php @@ -31,7 +31,7 @@ function find_group_address_from_notes_for($id) { } define('PHP_SELF', hsc($_SERVER['PHP_SELF'])); -$valid_vars = array('search','username','id','in','unapproved','begin','max','order','full', 'action', 'noclose'); +$valid_vars = array('search','username','id','in','unapproved','begin','max','order','full', 'action'); foreach($valid_vars as $k) { $$k = isset($_REQUEST[$k]) ? $_REQUEST[$k] : false; } @@ -85,10 +85,6 @@ with your VCS account, feel free to send us a note at $mailtext. mail($userinfo['email'],"VCS Account Request: $userinfo[username]",$message,"From: PHP Group <[email protected]>", "[email protected]"); mail($mailto . ($cc ? ",$cc" : ""),"Re: VCS Account Request: $userinfo[username]","VCS Account Approved: $userinfo[username] approved by {$_SESSION["username"]} \o/","From: PHP Group <[email protected]>\nIn-Reply-To: <[email protected]>", "[email protected]"); - if (!$noclose) { - echo '<script language="javascript">window.close();</script>'; - exit; - } warn("record $id ($userinfo[username]) approved"); } else { @@ -135,10 +131,6 @@ the ability to work with others. mail($mailto . ($cc ? ",$cc" : ""),"Re: VCS Account Request: $userinfo[username]",$userinfo['cvsaccess'] ? "VCS Account Deleted: $userinfo[username] deleted by {$_SESSION["username"]} /o\\" : "VCS Account Rejected: $userinfo[username] rejected by {$_SESSION["username"]} /o\\","From: PHP Group <[email protected]>\nIn-Reply-To: <[email protected]>", "[email protected]"); db_query("DELETE FROM users_note WHERE userid=$id"); db_query("DELETE FROM users_profile WHERE userid=$id"); - if (!$noclose) { - echo '<script language="javascript">window.close();</script>'; - exit; - } warn("record $id ($userinfo[username]) removed"); } else { @@ -345,13 +337,11 @@ table.useredit tr { <tr> <form method="get" action="<?php echo PHP_SELF;?>"> <input type="hidden" name="action" value="remove" /> - <input type="hidden" name="noclose" value="1" /> <input type="hidden" name="id" value="<?php echo $id?>" /> <td><input type="submit" value="Reject" /> </form> <form method="get" action="<?php echo PHP_SELF;?>"> <input type="hidden" name="action" value="approve" /> - <input type="hidden" name="noclose" value="1" /> <input type="hidden" name="id" value="<?php echo $id?>" /> <td><input type="submit" value="Approve" /> </form> @@ -449,7 +439,7 @@ while ($row = mysql_fetch_array($res)) { <td align="center"><a href="<?php echo PHP_SELF . "?id=$row[userid]";?>">edit</a></td> <td><?php echo $row['name'];?></td> <td><?php echo $row['email'];?></td> - <td<?php if ($row['username'] && !$row['cvsaccess']) echo ' bgcolor="#ff',substr($color,2),'"';?>><?php echo hscr($row['username']);?><?php if ($row['username'] && is_admin($user)) { if (!$row['cvsaccess']) echo ' <a href="'. PHP_SELF . "?action=approve&noclose=1&id=$row[userid]\" title=\"approve\">+</a>"; echo ' <a href="'.PHP_SELF."?action=remove&noclose=1&id=$row[userid]\" title=\"remove\">×</a>"; }?></td> + <td<?php if ($row['username'] && !$row['cvsaccess']) echo ' bgcolor="#ff',substr($color,2),'"';?>><?php echo hscr($row['username']);?><?php if ($row['username'] && is_admin($user)) { if (!$row['cvsaccess']) echo ' <a href="'. PHP_SELF . "?action=approve&id=$row[userid]\" title=\"approve\">+</a>"; echo ' <a href="'.PHP_SELF."?action=remove&id=$row[userid]\" title=\"remove\">×</a>"; }?></td> </tr> <?php if ($full && !empty($row['note'])) {?> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
