ankitjain28may / registration-module

source/Session.php

Doc Comments +3 added lines

@@ -5,6 +5,9 @@
 
 class Session{
 
+    /**
+     * @param string $key
+     */
     public static function put($key, $value){
         $_SESSION[$key] = $value;
     }

Indentation +9 added lines, -9 removed lines

@@ -5,16 +5,16 @@
 
 class Session{
 
-    public static function put($key, $value){
-        $_SESSION[$key] = $value;
-    }
+	public static function put($key, $value){
+		$_SESSION[$key] = $value;
+	}
 
-    public static function get($key){
-        return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
-    }
+	public static function get($key){
+		return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
+	}
 
-    public static function forget($key){
-        unset($_SESSION[$key]);
-    }
+	public static function forget($key){
+		unset($_SESSION[$key]);
+	}
 }
 ?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -3,17 +3,17 @@
 namespace AnkitJain\RegistrationModule;
 @session_start();
 
-class Session{
+class Session {
 
-    public static function put($key, $value){
+    public static function put($key, $value) {
         $_SESSION[$key] = $value;
     }
 
-    public static function get($key){
+    public static function get($key) {
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }
 
-    public static function forget($key){
+    public static function forget($key) {
         unset($_SESSION[$key]);
     }
 }

source/Validate.php

Doc Comments +6 added lines

@@ -11,6 +11,9 @@ 
 		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
 	}
 
+	/**
+	 * @param string $email
+	 */
 	function validateEmailInDb($email)
 	{
 		$query = "SELECT login_id FROM login WHERE email = '$email'";
@@ -24,6 +27,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $username
+	 */
 	function validateUsernameInDb($username)
 	{
 		$query = "SELECT login_id FROM login WHERE username = '$username'";

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 namespace AnkitJain\RegistrationModule;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 
 class Validate
 {

Braces +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 		{
 			if ($result->num_rows > 0) {
 				return 1;
+			} else {
+							return 0;
 			}
-			else
-				return 0;
 		}
 	}
 
@@ -30,9 +30,9 @@ 
 		if ($result = $this->connect->query($query)) {
 			if ($result->num_rows > 0) {
 				return 1;
+			} else {
+							return 0;
 			}
-			else
-				return 0;
 		}
 	}
 }

logout.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 namespace AnkitJain\RegistrationModule;
-require (dirname(__DIR__) . '/registration-module/vendor/autoload.php');
+require (dirname(__DIR__).'/registration-module/vendor/autoload.php');
 use AnkitJain\RegistrationModule\Session;
 
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
 	Session::forget('start');
 	header('Location: index.php');

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 {
 	Session::forget('start');
 	header('Location: index.php');
-}
-else
+} else
 {
 	echo "Please Login";
 }

config/database.example.php

Indentation +10 added lines, -10 removed lines

@@ -8,15 +8,15 @@
 
    function URL()
   {
-    $http = "http://";
-    @$host = $_SERVER['SERVER_NAME'];
-    @$port = $_SERVER['SERVER_PORT'];
-    $fol = "";
-    if(@$_SERVER['SERVER_ADDR']!=NULL)
-    {
-        $fol = "/".explode('/', $_SERVER['PHP_SELF'])[1];
-    }
-    $url = $http.$host.":".$port.$fol;
-    return $url;
+	$http = "http://";
+	@$host = $_SERVER['SERVER_NAME'];
+	@$port = $_SERVER['SERVER_PORT'];
+	$fol = "";
+	if(@$_SERVER['SERVER_ADDR']!=NULL)
+	{
+		$fol = "/".explode('/', $_SERVER['PHP_SELF'])[1];
+	}
+	$url = $http.$host.":".$port.$fol;
+	return $url;
   }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
   // Define database connection constants
   define('DB_HOST', 'localhost');
   define('DB_USER', 'root');
-  define('DB_PASSWORD','');
+  define('DB_PASSWORD', '');
   define('DB_NAME', 'account');
   define('URL', URL());
 
@@ -12,7 +12,7 @@ 
     @$host = $_SERVER['SERVER_NAME'];
     @$port = $_SERVER['SERVER_PORT'];
     $fol = "";
-    if(@$_SERVER['SERVER_ADDR']!=NULL)
+    if (@$_SERVER['SERVER_ADDR'] != NULL)
     {
         $fol = "/".explode('/', $_SERVER['PHP_SELF'])[1];
     }

index.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 session_start();
 if(isset($_SESSION['start']))
 {
-    header("Location: account.php");
+	header("Location: account.php");
 }
 ?>
   <!Doctype html>

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 session_start();
-if(isset($_SESSION['start']))
+if (isset($_SESSION['start']))
 {
     header("Location: account.php");
 }

ajax/validate_register.php

Spacing +3 added lines, -3 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
 namespace AnkitJain\RegistrationModule;
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use AnkitJain\RegistrationModule\Register;
 @session_start();
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
 	$registerField = json_decode($_POST['q']);
 	$name = $registerField->name;
@@ -15,7 +15,7 @@ 
 	$password = $registerField->password;
 	$obRegister = new Register();
 	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -15,9 +15,10 @@
 	$password = $registerField->password;
 	$obRegister = new Register();
 	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}
 ?>

ajax/validate_login.php

Spacing +3 added lines, -3 removed lines

@@ -1,18 +1,18 @@
 <?php
 
 namespace AnkitJain\RegistrationModule;
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use AnkitJain\RegistrationModule\Login;
 @session_start();
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
 	$loginField = json_decode($_POST['q']);
 	$login = $loginField->login;
 	$password = $loginField->password;
 	$obLogin = new Login();
 	$result = $obLogin->authLogin($login, $password);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -12,9 +12,10 @@
 	$password = $loginField->password;
 	$obLogin = new Login();
 	$result = $obLogin->authLogin($login, $password);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}
 ?>

source/Register.php

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 namespace AnkitJain\RegistrationModule;
 use AnkitJain\RegistrationModule\Validate;
 use AnkitJain\RegistrationModule\Session;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 
 class Register
 {
@@ -38,42 +38,42 @@ 
 			$this->error = array_merge($this->error, ["name" => " *Enter the name"]);
 		}
 
-		if(empty($this->email)) {
+		if (empty($this->email)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["email" => " *Enter the email address"]);
 		}
-		elseif(filter_var($this->email, FILTER_VALIDATE_EMAIL) == false) {
+		elseif (filter_var($this->email, FILTER_VALIDATE_EMAIL) == false) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["email" => " *Enter correct Email address"]);
 		}
 		else
 		{
-			if($this->obValidate->validateEmailInDb($this->email))
+			if ($this->obValidate->validateEmailInDb($this->email))
 			{
 				$this->key = 1;
 				$this->error = array_merge($this->error, ["email" => " *Email is already registered"]);
 			}
 		}
 
-		if(empty($this->username)) {
+		if (empty($this->username)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["username" => " *Enter the username"]);
 		}
 		else
 		{
-			if($this->obValidate->validateUsernameInDb($this->username))
+			if ($this->obValidate->validateUsernameInDb($this->username))
 			{
 				$this->key = 1;
 				$this->error = array_merge($this->error, ["username" => " *Username is already registered"]);
 			}
 		}
 
-		if(empty($this->password)) {
+		if (empty($this->password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
 		}
 
-		if(empty($this->mob)) {
+		if (empty($this->mob)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["mob" => " *Enter the Mobile Number"]);
 		}
@@ -82,7 +82,7 @@ 
 			$this->error = array_merge($this->error, ["mob" => " *Enter correct Mobile Number"]);
 		}
 
-		if($this->key == 1)
+		if ($this->key == 1)
 		{
 			return json_encode($this->error);
 		}
@@ -91,19 +91,19 @@ 
 			$this->key = 0;
 			$pass = md5($this->password);
 			$query = "INSERT INTO register VALUES(null, '$this->email', '$this->username', '$pass')";
-			if(!$this->connect->query($query)) {
+			if (!$this->connect->query($query)) {
 				$this->key = 1;
 				echo "You are not registered || Error in registration2";
 			}
 			else
 			{
 				$query = "SELECT id FROM register WHERE email = '$this->email'";
-				if($result = $this->connect->query($query)) {
+				if ($result = $this->connect->query($query)) {
 					$row = $result->fetch_assoc();
 					$UserId = $row['id'];
 
 					$query = "INSERT INTO login VALUES('$UserId', '$this->name', '$this->email', '$this->username', '$this->mob')";
-					if(!$this->connect->query($query)) {
+					if (!$this->connect->query($query)) {
 						$this->key = 1;
 						echo "You are not registered || Error in registration1";
 					}

Braces +7 added lines, -14 removed lines

@@ -41,12 +41,10 @@ 
 		if(empty($this->email)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["email" => " *Enter the email address"]);
-		}
-		elseif(filter_var($this->email, FILTER_VALIDATE_EMAIL) == false) {
+		} elseif(filter_var($this->email, FILTER_VALIDATE_EMAIL) == false) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["email" => " *Enter correct Email address"]);
-		}
-		else
+		} else
 		{
 			if($this->obValidate->validateEmailInDb($this->email))
 			{
@@ -58,8 +56,7 @@ 
 		if(empty($this->username)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["username" => " *Enter the username"]);
-		}
-		else
+		} else
 		{
 			if($this->obValidate->validateUsernameInDb($this->username))
 			{
@@ -76,8 +73,7 @@ 
 		if(empty($this->mob)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["mob" => " *Enter the Mobile Number"]);
-		}
-		elseif (!preg_match("/^[0-9]{10}$/", $this->mob)) {
+		} elseif (!preg_match("/^[0-9]{10}$/", $this->mob)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["mob" => " *Enter correct Mobile Number"]);
 		}
@@ -85,8 +81,7 @@ 
 		if($this->key == 1)
 		{
 			return json_encode($this->error);
-		}
-		else
+		} else
 		{
 			$this->key = 0;
 			$pass = md5($this->password);
@@ -94,8 +89,7 @@ 
 			if(!$this->connect->query($query)) {
 				$this->key = 1;
 				echo "You are not registered || Error in registration2";
-			}
-			else
+			} else
 			{
 				$query = "SELECT id FROM register WHERE email = '$this->email'";
 				if($result = $this->connect->query($query)) {
@@ -115,8 +109,7 @@ 
 			return json_encode([
 				"location" => URL."/account.php"
 			]);
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}

source/Login.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace AnkitJain\RegistrationModule;
 use AnkitJain\RegistrationModule\Session;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 
 class Login
 {
@@ -25,20 +25,20 @@ 
 		$this->login = trim($login);
 		$this->password = trim($password);
 
-		if(empty($this->login))
+		if (empty($this->login))
 		{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
 		}
 		elseif (preg_match("/^[@]{1}$/", $this->login))
 		{
-			if(filter_var($this->email, FILTER_VALIDATE_EMAIL) == false)
+			if (filter_var($this->email, FILTER_VALIDATE_EMAIL) == false)
 			{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
 			}
 		}
-		if(empty($this->password)) {
+		if (empty($this->password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
 		}
@@ -47,7 +47,7 @@ 
 			$pass = md5($this->password);
 		}
 
-		if($this->key == 0)
+		if ($this->key == 0)
 		{
 			$query = "SELECT * FROM login WHERE email = '$this->login' or username = '$this->login'";
 			if ($result = $this->connect->query($query))
@@ -57,7 +57,7 @@ 
 					$row = $result->fetch_assoc();
 					$loginID = $row['login_id'];
 					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$pass'";
-					if($result = $this->connect->query($query))
+					if ($result = $this->connect->query($query))
 					{
 						if ($result->num_rows > 0)
 						{

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
 		{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
-		}
-		elseif (preg_match("/^[@]{1}$/", $this->login))
+		} elseif (preg_match("/^[@]{1}$/", $this->login))
 		{
 			if(filter_var($this->email, FILTER_VALIDATE_EMAIL) == false)
 			{
@@ -41,8 +40,7 @@ 
 		if(empty($this->password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
-		}
-		else
+		} else
 		{
 			$pass = md5($this->password);
 		}
@@ -65,23 +63,20 @@ 
 							return json_encode([
 								"location" => URL."/account.php"
 							]);
-						}
-						else
+						} else
 						{
 							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
 							return json_encode($this->error);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
 					return json_encode($this->error);
 				}
 			}
 
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}