login fixes

pipedot · May 3, 2015 · a101286 · a101286
1 parent 7156cac
commit a101286
Show file tree

Hide file tree

Showing 33 changed files with 148 additions and 965 deletions.
diff --git a/get/main/menu/settings.php b/get/main/menu/settings.php
@@ -21,25 +21,13 @@
 	die("not an admin");
 }
 
-$themes = array();
-$a = fs_dir("$doc_root/www/theme");
-for ($i = 0; $i < count($a); $i++) {
-	if (is_dir("$doc_root/www/theme/$a[$i]")) {
-		$themes[] = $a[$i];
-	}
-}
-
 print_header("Settings");
 beg_main();
 beg_form();
 writeln('<h1>Settings</h1>');
 
-//beg_tab("Appearance");
-//print_row(array("caption" => "Theme", "option_key" => "theme", "option_list" => $themes, "option_value" => $server_conf["theme"]));
-//end_tab();
-
 beg_tab("Features");
-print_row(array("caption" => "Allow Sign Up", "check_key" => "sign_up_enabled", "checked" => $server_conf["sign_up_enabled"]));
+print_row(array("caption" => "Allow Register", "check_key" => "register_enabled", "checked" => $server_conf["register_enabled"]));
 print_row(array("caption" => "Allow Story Submissions", "check_key" => "submit_enabled", "checked" => $server_conf["submit_enabled"]));
 end_tab();
 

diff --git a/get/main/register.php b/get/main/register.php
@@ -20,100 +20,51 @@
 include("captcha.php");
 include("mail.php");
 
+require_https($https_enabled);
+
 if (!$server_conf["register_enabled"]) {
 	die("register not enabled");
 }
 
-/*$verify = http_get_string("verify", array("required" => false, "len" => 64, "valid" => "[0-9]abcdef"));
-if (strlen($verify) != 0 && strlen($verify) != 64) {
-	die("invalid verify hash");
-}
-if ($verify != "") {
-	$email_challenge = db_get_rec("email_challenge", array("challenge" => $verify));
-	$zid = strtolower($email_challenge["username"]) . "@$server_name";
-	if (is_local_user($zid)) {
-		die("username already exists [$zid]");
-	}
-}
-
-if ($verify != "") {
-	print_header("Email Validated");
-	writeln('<hr>');
-	beg_main();
-	if ($https_enabled) {
-		beg_form("https://$server_name/sign_up?verify=$verify");
-	} else {
-		beg_form("/sign_up?verify=$verify");
-	}
-	writeln('<h1>Email Validated</h1>');
-	writeln('<table>');
-	writeln('	<tr>');
-	writeln('		<td colspan="2">Please choose a password.</td>');
-	writeln('	</tr>');
-	writeln('	<tr>');
-	writeln('		<td style="padding-top: 8px; text-align: right">Password</td>');
-	writeln('		<td style="padding-top: 8px"><input name="password_1" type="password"></td>');
-	writeln('	</tr>');
-	writeln('	<tr>');
-	writeln('		<td style="padding-bottom: 8px; text-align: right">Password (again)</td>');
-	writeln('		<td style="padding-bottom: 8px"><input name="password_2" type="password"></td>');
-	writeln('	</tr>');
-	writeln('</table>');
-	box_left("Finish");
-	end_form();
-	end_main();
-	print_footer();
-
-	die();
-}
-*/
-
 print_header("Register");
 writeln('<hr>');
 beg_main();
+beg_form();
 
-if ($https_enabled) {
-	beg_form("https://$server_name/register");
-} else {
-	beg_form("/register");
-}
-
-?>
-<h1>Create Account</h1>
-<table>
-	<tr>
-		<td class="top">
-			<table>
-				<tr>
-					<td colspan="2"><h3>Enter your information:</h3></td>
-				</tr>
-				<tr>
-					<td class="right">Username</td>
-					<td><input name="username" type="text" placeholder="Only a-z,0-9" autofocus required></td>
-				</tr>
-				<tr>
-					<td class="right">Email</td>
-					<td><input name="mail_1" type="email" size="40" required></td>
-				</tr>
-				<tr>
-					<td class="right">Email (again)</td>
-					<td><input name="mail_2" type="email" size="40" required></td>
-				</tr>
-			</table>
-		</td>
-		<td class="top">
-			<table>
-				<tr>
-					<td><h3>Prove yourself:</h3></td>
-				</tr>
-				<tr>
-					<td><table><tr><td><?= captcha_challenge(); ?></td><td><input name="answer" type="text"></td></tr></table></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-<?
+writeln('<h1>Create Account</h1>');
+writeln('<table>');
+writeln('	<tr>');
+writeln('		<td class="top">');
+writeln('			<table>');
+writeln('				<tr>');
+writeln('					<td colspan="2"><h3>Enter your information:</h3></td>');
+writeln('				</tr>');
+writeln('				<tr>');
+writeln('					<td class="right">Username</td>');
+writeln('					<td><input name="username" type="text" placeholder="Only a-z,0-9" autofocus required></td>');
+writeln('				</tr>');
+writeln('				<tr>');
+writeln('					<td class="right">Email</td>');
+writeln('					<td><input name="mail_1" type="email" size="40" required></td>');
+writeln('				</tr>');
+writeln('				<tr>');
+writeln('					<td class="right">Email (again)</td>');
+writeln('					<td><input name="mail_2" type="email" size="40" required></td>');
+writeln('				</tr>');
+writeln('			</table>');
+writeln('		</td>');
+writeln('		<td class="top">');
+writeln('			<table>');
+writeln('				<tr>');
+writeln('					<td><h3>Prove yourself:</h3></td>');
+writeln('				</tr>');
+writeln('				<tr>');
+writeln('					<td><table><tr><td>' . captcha_challenge() . '</td><td><input name="answer" type="text"></td></tr></table></td>');
+writeln('				</tr>');
+writeln('			</table>');
+writeln('		</td>');
+writeln('	</tr>');
+writeln('</table>');
 
 box_left("Register");
 

diff --git a/get/main/reset.php b/get/main/reset.php
diff --git a/get/main/sign_in.php b/get/main/sign_in.php
diff --git a/get/main/sign_out.php b/get/main/sign_out.php