bug #149

includes/account.php

@@ -1907,7 +1907,7 @@
 	}
 
 	if($oldid == 54 || ($id == 53 && $_REQUEST['action'] != "") || ($id == 54 && $_REQUEST['action'] != "" &&
-			$_REQUEST['action'] != "aliases" && $_REQUEST['action'] != "edit"))
+			$_REQUEST['action'] != "aliases" && $_REQUEST['action'] != "edit" && $_REQUEST['action'] != "add"))
 	{
 		$id = 53;
 		$ccid = intval($_REQUEST['ccid']);
@@ -1943,7 +1943,7 @@
 			unset($_REQUEST['ccid']);
 			unset($_REQUEST['locid']);
 			unset($_REQUEST['action']);
-		} else if($ccid > 0 && $_REQUEST['action'] == "add" && $name == htmlentities($name)) {
+		} else if($ccid > 0 && $_REQUEST['action'] == "add" && $name == htmlentities($name) && $name != "") {
 			$query = "insert into `regions` set `ccid`='$ccid', `name`='$name'";
 			mysql_query($query);
 			$row = mysql_fetch_assoc(mysql_query("select * from `locations` where `id`='$locid'"));

pages/index/5.php

@@ -55,7 +55,7 @@
 </table>     
 <input type="hidden" name="oldid" value="<?=$id?>">
 </form> 
-<p><?=_("Due to the increasing number of people that haven't been able to recover their passwords via the lost password form there is now 2 other options available to you. If you don't care about your account you can signup under a new account file dispute forms to recover your email accounts and domains. If you would like to recover your password via help from support staff this requires a small payment to cover time from a real person to verify your claims to ownership on an account, click the payment button below to continue.")?></p>
+<p><?=_("Due to the increasing number of people that haven't been able to recover their passwords via the lost password form there is now 2 other options available to you. If you don't care about your account you can signup under a new account file dispute forms to recover your email accounts and domains. If you would like to recover your password via help from support staff this requires a small payment to cover time from a real person to verify your claims to ownership on an account, click the payment button below to continue.")." "?><? printf(_("Alternatively visit our %sinformation page%s on this subject for more details."), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount'>", "</a>")?></p>
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="image" src="http://www.cacert.org/images/payment.png" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">