Merge branch 'jsnider2-master'
Attempt to merge
--- a/includes/mysql_functions.php
+++ b/includes/mysql_functions.php
@@ -11,6 +11,7 @@
die(_FATALERROR." "._NOTCONNECTED);
}
mysql_select_db($dbname, $mysql_access);
+ mysql_query("SET SESSION sql_mode = 'MYSQL40'");
return $mysql_access;
}
--- a/includes/mysqli_functions.php
+++ b/includes/mysqli_functions.php
@@ -9,6 +9,7 @@
include(_BASEDIR."languages/en.php"); // Because we haven't got a language set yet.
die(_FATALERROR." "._NOTCONNECTED);
}
+ mysqli_query($mysql_access, "SET SESSION sql_mode = 'MYSQL40'");
return $mysql_access;
}
--- a/install/install.php
+++ b/install/install.php
@@ -152,7 +152,7 @@
$penname = descript($_POST['newpenname']);
if((!$_POST['email']) && !isADMIN) $fail .= "<div style='text-align: center;'>"._EMAILREQUIRED." "._TRYAGAIN."</div>";
if($penname && !preg_match("!^[a-z0-9_ ]{3,30}$!i", $penname)) $fail = "<div style='text-align: center;'>"._BADUSERNAME." "._TRYAGAIN."</div>";
- if(!preg_match("/[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+/i", $_POST[email])) $fail = "<div style='text-align: center;'>"._INVALIDEMAIL." "._TRYAGAIN."</div>";
+ if(!preg_match("/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9.-]+$/", $_POST[email])) $fail = "<div style='text-align: center;'>"._INVALIDEMAIL." "._TRYAGAIN."</div>";
if($_POST['password'] == $_POST['password2']) $encryptpassword = md5($_POST[password]);
else $fail = write_message(_PASSWORDTWICE);
if(!isset($fail)) {