X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_admin.php;h=26cb82e004a773aa50f316633805acdd538abc82;hb=26a8a9033c1f6f3f801fd2be4b82134df1258dc1;hp=b4f9db6d65c69ad1a4a8ee6c94704446e1e11997;hpb=b26baaa1fd812e3c01646323119ca2b97ccdbd1d;p=gwvp-mini.git

diff --git a/gwvpmini/gwvpmini_admin.php b/gwvpmini/gwvpmini_admin.php
index b4f9db6..26cb82e 100644
--- a/gwvpmini/gwvpmini_admin.php
+++ b/gwvpmini/gwvpmini_admin.php
@@ -1,24 +1,15 @@
 <?php
 
-if(gwvpmini_isLoggedIn()) if(gwvpmini_isUserAdmin()) {
-	$MENU_ITEMS["20repos"]["text"] = "Administration";
-	$MENU_ITEMS["20repos"]["link"] = "$BASE_URL/admin";
-	$CALL_ME_FUNCTIONS["admin"] = "gwvpmini_AdminCallMe";
-}
-
 
-$reg = gwvpmini_getConfigVal("gravatarenabled");
-
-$use_gravatar = false;
-if($reg == null) {
-	gwvpmini_setConfigVal("gravatarenabled", "1");
-} else if($reg == 1) {
-	$use_gravatar = true;
-} else {
-	$use_gravatar = false;
-}
-
-global $use_gravatar;
+if($IS_WEB_REQUEST) {
+	if(gwvpmini_isLoggedIn()) if(gwvpmini_isUserAdmin()) {
+		$MENU_ITEMS["20repos"]["text"] = "Administration";
+		$MENU_ITEMS["20repos"]["link"] = "$BASE_URL/admin";
+		$CALL_ME_FUNCTIONS["admin"] = "gwvpmini_AdminCallMe";
+	}
+	
+	
+}
 
 function gwvpmini_AdminCallMe()
 {
@@ -63,6 +54,12 @@ function gwvpmini_AdminCallMe()
 					if($qspl[1] == "changegravs") {
 						return "gwvpmini_SwitchGravatars";
 					}
+					if($qspl[1] == "changessl") {
+						return "gwvpmini_SwitchForceSSL";
+					}
+					if($qspl[1] == "switchadmin") {
+						return "gwvpmini_SwitchAdmin";
+					}
 				} else {
 					error_log("i got here, where next?");
 					return "gwvpmini_AdminMainPage";
@@ -96,7 +93,7 @@ function gwvpmini_AdminMainPage()
 function gwvpmini_AdminMainPageBody()
 {
 	global $BASE_URL;
-	global $can_register, $reg_reqs_confirm, $confirm_from_address, $use_gravatar;
+	global $can_register, $reg_reqs_confirm, $confirm_from_address, $use_gravatar, $force_ssl;
 	
 	if($can_register) {
 		$register = "Registration Enabled (<a href=\"$BASE_URL/admin/changereg\">Disable</a>)";
@@ -116,10 +113,17 @@ function gwvpmini_AdminMainPageBody()
 		$usegrav = "Gravatars are disabled (<a href=\"$BASE_URL/admin/changegravs\">Enable</a>)";
 	}
 	
+	if($force_ssl) {
+		$forcessl = "Force SSL is enabled (<a href=\"$BASE_URL/admin/changessl\">Disable</a>)";
+	} else {
+		$forcessl = "Force SSL is disabled (<a href=\"$BASE_URL/admin/changessl\">Enable</a>)";
+	}
+	
+	
 	$totalusers = gwvpmini_GetNUsers();
 	echo "<table><tr valign=\"top\"><td>";
+	echo "$register<br>$regconfirm<br>$usegrav<br>$forcessl<br>";
 	echo "<h2>Users - $totalusers</h2>";
-	echo "$register<br>$regconfirm<br>$usegrav<br>";
 	echo "<form method=\"post\" action=\"$BASE_URL/admin/changefromemail\">";
 	echo "Address emails are sent from <input type=\"text\" name=\"fromemail\" value=\"$confirm_from_address\"><input type=\"submit\" name=\"Update\" value=\"Update\"><br>";
 	echo "</form>";	
@@ -138,12 +142,12 @@ function gwvpmini_AdminMainPageBody()
 		$astat = "0";
 		$cstat = "WTF";
 		$level = "WTF";
-		if($st_l == 0) $level = "User";
-		if($st_l == 1) $level = "Admin";
+		if($st_l == 0) $level = "<a href=\"$BASE_URL/admin/switchadmin/1/$id\">User</a>";
+		if($st_l == 1) $level = "<a href=\"$BASE_URL/admin/switchadmin/0/$id\">Admin</a>";
 		
 		$status = "";
 		if($st_t[0] == "1") {
-			$status = ", disabled";
+			$status = ", Disabled";
 			$astat = 0;
 			$cstat = "Enable";
 		} else if ($st_t[0] == "0") {
@@ -158,9 +162,14 @@ function gwvpmini_AdminMainPageBody()
 		$st = "$level$status";
 		
 		$unlval = "<a href=\"$BASE_URL/user/$un\">$un</a>";
-		echo "<tr><td>$unlval</td><td>$em</td><td>$fn</td><td>$ds</td><td>$st</td><td><a href=\"$BASE_URL/admin/removeuser/$id\">Remove</a> ";
-		if ($st_t[0] == "0"||$st_t[0] == "1") echo "<a href=\"$BASE_URL/admin/switchenable/$astat/$id\">$cstat</a></td></tr>";
-		else echo "</td></tr>";
+		echo "<tr><td>$unlval</td><td>$em</td><td>$fn</td><td>$ds</td><td>$st</td>";
+		if($id != $_SESSION["id"]) {
+			echo "<td><a href=\"$BASE_URL/admin/removeuser/$id\">Remove</a> ";
+			if ($st_t[0] == "0"||$st_t[0] == "1") echo "<a href=\"$BASE_URL/admin/switchenable/$astat/$id\">$cstat</a></td></tr>";
+			else echo "</td></tr>";
+		} else {
+			echo "<td> -- </td></tr>";
+		}
 	}
 	
 	
@@ -462,6 +471,37 @@ function gwvpmini_SwitchEnableUser()
 	
 }
 
+function gwvpmini_SwitchAdmin()
+{
+	global $BASE_URL;
+	
+	$uid = -1;
+	$newst = -1;
+	if(isset($_REQUEST["q"])) {
+		$query = $_REQUEST["q"];
+		$qspl = explode("/", $query);
+		if(isset($qspl[2])) {
+			$newst = $qspl[2];
+		}
+		if(isset($qspl[3])) {
+			$uid = $qspl[3];
+		}
+	}
+	
+
+	if($uid > 0 && $newst >= 0) {
+		gwvpmini_SetUserStatusAdmin($uid, $newst);
+		if($newst == 0) {
+			gwvpmini_SendMessage("info", "User is no longer an admin");
+		} else {
+			gwvpmini_SendMessage("info", "User is now an admin");
+		}
+	} else gwvpmini_SendMessage("error", "Invalid user id");
+	
+	
+	header("Location: $BASE_URL/admin");
+}
+
 function gwvpmini_SwitchEnableRepo()
 {
 	global $BASE_URL;
@@ -511,4 +551,23 @@ function gwvpmini_SwitchGravatars()
 	
 	header("Location: $BASE_URL/admin");
 }
+
+function gwvpmini_SwitchForceSSL()
+{
+	global $BASE_URL, $force_ssl;
+	
+	if($newst == 1) $stat = "disabled";
+	else $stat = "enabled";
+	
+	if($force_ssl) {
+		gwvpmini_setConfigVal("forcessl", "0");
+	} else {
+		gwvpmini_setConfigVal("forcessl", "1");
+	}
+	
+	gwvpmini_SendMessage("info", "forcessl $stat");
+	
+	header("Location: $BASE_URL/admin");
+	
+}
 ?>
\ No newline at end of file