CW Cyrix's Git Repository Mirror
Browse code

Merge branch 'master' of https://github.com/jsnider2/efiction_v3_stable into jsnider2-master

Conflicts:
install/install.php

Rainer Volkrodt authored on 2017/01/28 09:18:27
Showing 3 changed files
includes/mysql_functions.php
History View file @ 072174d
... ... 
@@ -11,6 +11,7 @@ function dbconnect($dbhost, $dbuser, $dbpass, $dbname ) {
11 11 
 		die(_FATALERROR." "._NOTCONNECTED);
12 12 
 	}
13 13 
 	mysql_select_db($dbname, $mysql_access);
14 
+	mysql_query("SET SESSION sql_mode = 'MYSQL40'");
14 15 
 	return $mysql_access;
15 16 
 }
16 17
includes/mysqli_functions.php
History View file @ 072174d
... ... 
@@ -9,6 +9,7 @@ function dbconnect($dbhost, $dbuser, $dbpass, $dbname ) {
9 9 
 		include(_BASEDIR."languages/en.php"); // Because we haven't got a language set yet.
10 10 
 		die(_FATALERROR." "._NOTCONNECTED);
11 11 
 	}
12 
+	mysqli_query($mysql_access, "SET SESSION sql_mode = 'MYSQL40'");
12 13 
 	return $mysql_access;
13 14 
 }
14 15
install/install.php
History View file @ 072174d
... ... 
@@ -152,7 +152,9 @@ switch($_GET['step']) {
152 152 
 			$penname = descript($_POST['newpenname']);
153 153 
 			if((!$_POST['email']) && !isADMIN) $fail .= "<div style='text-align: center;'>"._EMAILREQUIRED." "._TRYAGAIN."</div>";
154 154 
 			if($penname && !preg_match("!^[a-z0-9_ ]{3,30}$!i", $penname)) $fail = "<div style='text-align: center;'>"._BADUSERNAME." "._TRYAGAIN."</div>";
155 
-			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>";
155 
+<<<<<<< HEAD
156 
+			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>";
157 
+>>>>>>> 94417774241deeaf340c9434135fed42b738a15d
156 158 
 			if($_POST['password'] == $_POST['password2']) $encryptpassword = md5($_POST[password]);
157 159 
 			else $fail =  write_message(_PASSWORDTWICE);
158 160 
 			if(!isset($fail)) {