commit before joe fucks shit

git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@401 c5b2fb0a-d05d-0410-98c8-828840a80ff6

2 files changed, 10 insertions, 6 deletions

diff --git a/admin/admins/functions.php b/admin/admins/functions.php
index 68b9bc7..8987322 100644
--- a/admin/admins/functions.php
+++ b/admin/admins/functions.php
@@ -43,7 +43,7 @@
  function ListAdmins()

  {

  	  global $db;

-	  $result = $db->Query("SELECT `user_id`, `username`, `level` FROM `bayonet_users` ORDER BY `level` DESC");

+	  $result = $db->Query("SELECT `user_id`, `username`, `level` FROM `bayonet_users` ORDER BY `level` DESC, `username` ASC");

 	  while(($rows = $db->fetch($result))!=false)

 	  {

 	    $admins[] = $rows;

@@ -51,9 +51,13 @@
 	  

 	  $num = 1;

 	  OpenTable("300px");

-	  echo "<tr><th></th><th>Username</th><th>Level</th></tr>";

+	  echo "<tr><th></th><th style=\"text-align:left;\">Username</th><th style=\"text-align:left;\">Level</th></tr>";

 	  foreach($admins as $admin)

 	  {

+	  	if($admin['level'] != $level){

+	  		$level = $admin['level'];

+	  		echo "<tr><td colspan=\"3\"><hr /></td></tr>";

+  		}

 	  	echo "<tr><td>{$num}.</td><td><a href=\"?op=admins&edit={$admin['user_id']}\">{$admin['username']}</a></td><td>{$admin['level']}</td></tr>";

 	  	$num++;

 	  }

@@ -127,10 +131,10 @@
 <center>

 		<form method="POST" action="<?php $_SERVER['PHP_SELF']?>">

 		<table>

-			<tr><th>Username:</th><td><input type="text" value="" name="username" /></td></tr>

+			<tr><th>Username:</th><td><input type="text" value="" name="username" />*</td></tr>

 			<tr><th>First Name:</th><td><input type="text" value="" name="first" /></td></tr>

 			<tr><th>Last Name:</th><td><input type="text" value="" name="last" /></td></tr>

-			<tr><th>Email Address:</th><td><input type="text" value="" name="email" /></td></tr>

+			<tr><th>Email Address:</th><td><input type="text" value="" name="email" />*</td></tr>

 			<tr>

 				<th>Level:</th>

 				<td>

diff --git a/admin/pages/functions.php b/admin/pages/functions.php
index c4d4369..15b1f0c 100644
--- a/admin/pages/functions.php
+++ b/admin/pages/functions.php
@@ -377,9 +377,9 @@ function DeletePage($page_id)
   
   ?>
 
-  <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">
+  <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
   <table>
-  <th>Are you <u>SURE</u> you want to delete the page titled: '<?php echo $page['title']?>'?<br />All articles attached to this page will be deleted as well.</th>
+  <th>Are you <u>SURE</u> you want to delete the page titled: '<?php echo $page['title'];?>'?<br />All articles attached to this page will be deleted as well.</th>
   <tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>
   </table>
   </form>