refatalsakka / framework

Core/System/Url.php

Indentation +20 added lines, -20 removed lines

@@ -4,31 +4,31 @@
 
 class Url
 {
-  protected $app;
+	protected $app;
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
-  }
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+	}
 
-  public function link($path)
-  {
-    $link = $this->app->request->link();
+	public function link($path)
+	{
+		$link = $this->app->request->link();
 
-    $path = rtrim($path, '/');
-    $path = ltrim($path, '/');
+		$path = rtrim($path, '/');
+		$path = ltrim($path, '/');
 
-    return $link . '/' . $path;
-  }
+		return $link . '/' . $path;
+	}
 
-  public function redirectTo($path, $num = 0)
-  {
-    if ($path == 'error') {
+	public function redirectTo($path, $num = 0)
+	{
+		if ($path == 'error') {
 
-      $this->app->session->set('error', true);
-    }
+			$this->app->session->set('error', true);
+		}
 
-    header('Refresh: ' . $num . '; URL=' . $this->link($path));
-    exit;
-  }
+		header('Refresh: ' . $num . '; URL=' . $this->link($path));
+		exit;
+	}
 }
\ No newline at end of file

Core/System/Http/Request.php

Indentation +99 added lines, -99 removed lines

@@ -6,144 +6,144 @@
 
 class Request
 {
-  private $app;
+	private $app;
 
-  private $url;
+	private $url;
 
-  private $baseUrl;
+	private $baseUrl;
 
-  private $files = [];
+	private $files = [];
 
-  private $link;
+	private $link;
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
-  }
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+	}
 
-  public function prepareUrl()
-  {
-    $script = dirname($this->server('SCRIPT_NAME'));
+	public function prepareUrl()
+	{
+		$script = dirname($this->server('SCRIPT_NAME'));
 
-    $requestUri = $this->server('REQUEST_URI');
+		$requestUri = $this->server('REQUEST_URI');
 
-    if (strpos($requestUri, '?')) {
+		if (strpos($requestUri, '?')) {
 
-      list($requestUri, $queryString) = explode('?', $requestUri);
-    }
+			list($requestUri, $queryString) = explode('?', $requestUri);
+		}
 
-    if (! in_array($script, ['/', '\\'])) {
+		if (! in_array($script, ['/', '\\'])) {
 
-      $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
-    } else {
+			$this->url = preg_replace('#^' . $script . '#', '', $requestUri);
+		} else {
 
-      $this->url = $requestUri;
-    }
+			$this->url = $requestUri;
+		}
 
-    if ($this->url !== '/') {
+		if ($this->url !== '/') {
 
-      $this->url = rtrim($this->url, '/');
-    }
+			$this->url = rtrim($this->url, '/');
+		}
 
-    $isSecure = false;
+		$isSecure = false;
 
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 
-      $isSecure = true;
+			$isSecure = true;
 
-    } elseif ((! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) || (! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')) {
-      $isSecure = true;
-    }
+		} elseif ((! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) || (! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')) {
+			$isSecure = true;
+		}
 
-    $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
+		$REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
 
-    $this->link = $REQUEST_PROTOCOL . '://' . $this->server('HTTP_HOST');
+		$this->link = $REQUEST_PROTOCOL . '://' . $this->server('HTTP_HOST');
 
-    $this->baseUrl = $this->link . $requestUri;
-  }
+		$this->baseUrl = $this->link . $requestUri;
+	}
 
-  public function get($key)
-  {
-    $value = array_get($_GET, $key);
+	public function get($key)
+	{
+		$value = array_get($_GET, $key);
 
-    if (is_array($value)) {
-      $value = array_filter($value);
-    } else {
-      $value = trim($value);
-    }
+		if (is_array($value)) {
+			$value = array_filter($value);
+		} else {
+			$value = trim($value);
+		}
 
-    return $value;
-  }
+		return $value;
+	}
 
-  public function post($key)
-  {
-    $value = array_get($_POST, $key);
+	public function post($key)
+	{
+		$value = array_get($_POST, $key);
 
-    if (is_array($value)) {
-      $value = array_filter($value);
-    } else {
-      $value = trim($value);
-    }
+		if (is_array($value)) {
+			$value = array_filter($value);
+		} else {
+			$value = trim($value);
+		}
 
-    return $value;
-  }
+		return $value;
+	}
 
-  public function setPost($key, $value)
-  {
-    $_POST[$key] = $value;
-  }
+	public function setPost($key, $value)
+	{
+		$_POST[$key] = $value;
+	}
 
-  public function posts()
-  {
-    return $_POST;
-  }
+	public function posts()
+	{
+		return $_POST;
+	}
 
-  public function files()
-  {
-    return $_FILES;
-  }
+	public function files()
+	{
+		return $_FILES;
+	}
 
-  public function file($input)
-  {
-    if (isset($this->files[$input])) {
+	public function file($input)
+	{
+		if (isset($this->files[$input])) {
 
-      return $this->files[$input];
-    }
+			return $this->files[$input];
+		}
 
-    $upoadedFile = new UploadeFile($this->app, $input);
+		$upoadedFile = new UploadeFile($this->app, $input);
 
-    $this->files[$input] = $upoadedFile;
+		$this->files[$input] = $upoadedFile;
 
-    return $this->files[$input];
-  }
+		return $this->files[$input];
+	}
 
-  public function server($key)
-  {
-    return array_get($_SERVER, $key);
-  }
+	public function server($key)
+	{
+		return array_get($_SERVER, $key);
+	}
 
-  public function method()
-  {
-    return $this->server('REQUEST_METHOD');
-  }
+	public function method()
+	{
+		return $this->server('REQUEST_METHOD');
+	}
 
-  public function referer()
-  {
-    return $this->server('HTTP_REFERER');
-  }
+	public function referer()
+	{
+		return $this->server('HTTP_REFERER');
+	}
 
-  public function baseUrl()
-  {
-    return $this->baseUrl;
-  }
+	public function baseUrl()
+	{
+		return $this->baseUrl;
+	}
 
-  public function url()
-  {
-    return $this->url;
-  }
+	public function url()
+	{
+		return $this->url;
+	}
 
-  public function link()
-  {
-    return $this->link;
-  }
+	public function link()
+	{
+		return $this->link;
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
       list($requestUri, $queryString) = explode('?', $requestUri);
     }
 
-    if (! in_array($script, ['/', '\\'])) {
+    if (!in_array($script, ['/', '\\'])) {
 
       $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
     } else {
@@ -51,7 +51,7 @@ 
 
       $isSecure = true;
 
-    } elseif ((! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) || (! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')) {
+    } elseif ((!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') || (!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')) {
       $isSecure = true;
     }
 

Core/System/Database.php

Indentation +258 added lines, -258 removed lines

@@ -8,403 +8,403 @@
 
 class Database
 {
-  private $app;
+	private $app;
 
-  private static $connection;
+	private static $connection;
 
-  private $table;
+	private $table;
 
-  private $rows;
+	private $rows;
 
-  private $lastId;
+	private $lastId;
 
-  private $data = [];
+	private $data = [];
 
-  private $bindings = [];
+	private $bindings = [];
 
-  private $selects = [];
+	private $selects = [];
 
-  private $joins = [];
+	private $joins = [];
 
-  private $wheres = [];
+	private $wheres = [];
 
-  private $havings = [];
+	private $havings = [];
 
-  private $orderBy = [];
+	private $orderBy = [];
 
-  private $limit;
+	private $limit;
 
-  private $offset;
+	private $offset;
 
-  private $groupBy = [];
+	private $groupBy = [];
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
 
-    if (! $this->isConnected()) {
-      $this->connect();
-    }
-  }
+		if (! $this->isConnected()) {
+			$this->connect();
+		}
+	}
 
-  private function isConnected()
-  {
-    return self::$connection instanceof PDO;
-  }
+	private function isConnected()
+	{
+		return self::$connection instanceof PDO;
+	}
 
-  private function connect()
-  {
-    $data = $this->app->config['db'];
+	private function connect()
+	{
+		$data = $this->app->config['db'];
 
-    extract($data);
+		extract($data);
 
-    try {
-      self::$connection  = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
+		try {
+			self::$connection  = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
 
-      self::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+			self::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-      self::$connection->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+			self::$connection->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
 
-      self::$connection->exec('SET NAMES utf8');
+			self::$connection->exec('SET NAMES utf8');
 
-    } catch (PDOException $e) {
+		} catch (PDOException $e) {
 
-      throw new Exception($e->getMessage());
-    }
-  }
+			throw new Exception($e->getMessage());
+		}
+	}
 
-  public function connection()
-  {
-    return self::$connection;
-  }
+	public function connection()
+	{
+		return self::$connection;
+	}
 
-  public function table($table)
-  {
-    $this->table = $table;
+	public function table($table)
+	{
+		$this->table = $table;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function select(...$select)
-  {
-    $this->selects = array_merge($this->selects, $select);
+	public function select(...$select)
+	{
+		$this->selects = array_merge($this->selects, $select);
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function join($join, $localId = null, $forginId = null)
-  {
-    if (! $localId) {
+	public function join($join, $localId = null, $forginId = null)
+	{
+		if (! $localId) {
 
-      $localId =  trim($join, 's' ). '_id';
-    }
+			$localId =  trim($join, 's' ). '_id';
+		}
 
-    if (! $forginId) {
+		if (! $forginId) {
 
-      $forginId =  'id';
-    }
+			$forginId =  'id';
+		}
 
-    $sql = $join . ' ON ' . $this->table . '.' . $localId . ' = ' . $join . '.' . $forginId;
+		$sql = $join . ' ON ' . $this->table . '.' . $localId . ' = ' . $join . '.' . $forginId;
 
-    $this->joins[] = $sql;
+		$this->joins[] = $sql;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function where(...$bindings)
-  {
-    $sql = array_shift($bindings);
+	public function where(...$bindings)
+	{
+		$sql = array_shift($bindings);
 
-    if (is_array($bindings[0])) {
+		if (is_array($bindings[0])) {
 
-      $bindings = $bindings[0];
-    }
+			$bindings = $bindings[0];
+		}
 
-    $this->addToBindings($bindings);
+		$this->addToBindings($bindings);
 
-    $this->wheres[] = $sql;
+		$this->wheres[] = $sql;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function having()
-  {
-    $bindings = func_get_args();
+	public function having()
+	{
+		$bindings = func_get_args();
 
-    $sql = array_shift($bindings);
+		$sql = array_shift($bindings);
 
-    $this->addToBindings($bindings);
+		$this->addToBindings($bindings);
 
-    $this->havings[] = $sql;
+		$this->havings[] = $sql;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function groupBy(...$arguments)
-  {
-    $this->groupBy = $arguments;
+	public function groupBy(...$arguments)
+	{
+		$this->groupBy = $arguments;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function limit($limit, $offset = 0)
-  {
-    $this->limit = $limit;
+	public function limit($limit, $offset = 0)
+	{
+		$this->limit = $limit;
 
-    $this->offset = $offset;
+		$this->offset = $offset;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function rows()
-  {
-    return $this->rows;
-  }
+	public function rows()
+	{
+		return $this->rows;
+	}
 
-  public function orderBy($orderBy, $sort = 'ASC')
-  {
-    $this->orderBy = [$orderBy, $sort];
+	public function orderBy($orderBy, $sort = 'ASC')
+	{
+		$this->orderBy = [$orderBy, $sort];
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function fetch($table = null)
-  {
-    if ($table) {
-      $this->table($table);
-    }
+	public function fetch($table = null)
+	{
+		if ($table) {
+			$this->table($table);
+		}
 
-    $sql = $this->fetchStatment();
+		$sql = $this->fetchStatment();
 
-    $query = $this->query($sql, $this->bindings);
+		$query = $this->query($sql, $this->bindings);
 
-    $result = $query->fetch();
+		$result = $query->fetch();
 
-    $this->rows = $query->rowCount();
+		$this->rows = $query->rowCount();
 
-    return $result;
-  }
+		return $result;
+	}
 
-  public function fetchAll($table = null)
-  {
-    if ($table) {
-      $this->table($table);
-    }
+	public function fetchAll($table = null)
+	{
+		if ($table) {
+			$this->table($table);
+		}
 
-    $sql = $this->fetchStatment();
+		$sql = $this->fetchStatment();
 
-    $query = $this->query($sql, $this->bindings);
+		$query = $this->query($sql, $this->bindings);
 
-    $results = $query->fetchall();
+		$results = $query->fetchall();
 
-    $this->rows = $query->rowCount();
+		$this->rows = $query->rowCount();
 
-    return $results;
-  }
+		return $results;
+	}
 
-  private function fetchStatment()
-  {
-    $sql = 'SELECT ';
+	private function fetchStatment()
+	{
+		$sql = 'SELECT ';
 
-    $sql .= $this->selects ? implode(', ', $this->selects) : '*';
+		$sql .= $this->selects ? implode(', ', $this->selects) : '*';
 
-    $sql .= ' FROM ' . $this->table . ' ';
+		$sql .= ' FROM ' . $this->table . ' ';
 
-    if (!empty($this->joins)) {
+		if (!empty($this->joins)) {
 
-      $sql .= 'LEFT JOIN ' . implode(' ', $this->joins);
-    }
+			$sql .= 'LEFT JOIN ' . implode(' ', $this->joins);
+		}
 
-    if (!empty($this->wheres)) {
+		if (!empty($this->wheres)) {
 
-      $sql .= ' WHERE ' . implode(' ', $this->wheres);
-    }
+			$sql .= ' WHERE ' . implode(' ', $this->wheres);
+		}
 
-    if (!empty($this->havings)) {
+		if (!empty($this->havings)) {
 
-      $sql .= ' HAVING ' . implode(' ', $this->havings) . ' ';
-    }
+			$sql .= ' HAVING ' . implode(' ', $this->havings) . ' ';
+		}
 
-    if (!empty($this->orderBy)) {
+		if (!empty($this->orderBy)) {
 
-      $sql .= ' ORDER BY ' . implode (' ', $this->orderBy);
-    }
+			$sql .= ' ORDER BY ' . implode (' ', $this->orderBy);
+		}
 
-    if ($this->limit) {
+		if ($this->limit) {
 
-      $sql .= ' LIMIT ' . $this->limit;
-    }
+			$sql .= ' LIMIT ' . $this->limit;
+		}
 
-    if ($this->offset) {
+		if ($this->offset) {
 
-      $sql .= ' OFFSET ' . $this->offset;
-    }
+			$sql .= ' OFFSET ' . $this->offset;
+		}
 
-    if (!empty($this->groupBy)) {
-      $sql .= ' GROUP BY ' . implode(' ' , $this->groupBy);
-    }
+		if (!empty($this->groupBy)) {
+			$sql .= ' GROUP BY ' . implode(' ' , $this->groupBy);
+		}
 
-    return $sql;
-  }
+		return $sql;
+	}
 
-  public function lastId()
-  {
-    return $this->lastId;
-  }
+	public function lastId()
+	{
+		return $this->lastId;
+	}
 
-  public function from($table)
-  {
-    return $this->table($table);
-  }
+	public function from($table)
+	{
+		return $this->table($table);
+	}
 
-  public function data($key, $value = null)
-  {
-    if (is_array($key)) {
+	public function data($key, $value = null)
+	{
+		if (is_array($key)) {
 
-      $this->data = array_merge($this->data, $key);
+			$this->data = array_merge($this->data, $key);
 
-      $this->addToBindings($key);
+			$this->addToBindings($key);
 
-    } else {
+		} else {
 
-      $this->data[$key] = $value;
+			$this->data[$key] = $value;
 
-      $this->addToBindings($value);
+			$this->addToBindings($value);
 
-    }
+		}
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function insert($table = null)
-  {
-    if ($table) {
-      $this->table($table);
-    }
+	public function insert($table = null)
+	{
+		if ($table) {
+			$this->table($table);
+		}
 
-    $sql = 'INSERT INTO ' . $this->table . ' SET ';
+		$sql = 'INSERT INTO ' . $this->table . ' SET ';
 
-    $sql .= $this->setField();
+		$sql .= $this->setField();
 
-    $this->query($sql, $this->bindings);
+		$this->query($sql, $this->bindings);
 
-    $this->lastId = $this->connection()->lastInsertId();
+		$this->lastId = $this->connection()->lastInsertId();
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function update($table = null)
-  {
-    if ($table) {
-      $this->table($table);
-    }
+	public function update($table = null)
+	{
+		if ($table) {
+			$this->table($table);
+		}
 
-    $sql = 'UPDATE ' . $this->table . ' SET ';
+		$sql = 'UPDATE ' . $this->table . ' SET ';
 
-    $sql .= $this->setField();
+		$sql .= $this->setField();
 
-    if (!empty($this->wheres)) {
-      $sql .= ' WHERE ' . implode('', $this->wheres);
-    }
+		if (!empty($this->wheres)) {
+			$sql .= ' WHERE ' . implode('', $this->wheres);
+		}
 
-    $this->query($sql, $this->bindings);
+		$this->query($sql, $this->bindings);
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function delete($table = null)
-  {
-    if ($table) {
-      $this->table($table);
-    }
+	public function delete($table = null)
+	{
+		if ($table) {
+			$this->table($table);
+		}
 
-    $sql = 'DELETE FROM ' . $this->table . ' ';
+		$sql = 'DELETE FROM ' . $this->table . ' ';
 
-    if (!empty($this->wheres)) {
-      $sql .= ' WHERE ' . implode('', $this->wheres);
-    }
+		if (!empty($this->wheres)) {
+			$sql .= ' WHERE ' . implode('', $this->wheres);
+		}
 
-    $this->query($sql, $this->bindings);
+		$this->query($sql, $this->bindings);
 
-    return $this;
-  }
+		return $this;
+	}
 
-  private function setField()
-  {
-    $sql = '';
+	private function setField()
+	{
+		$sql = '';
 
-    foreach($this->data as $key => $value) {
+		foreach($this->data as $key => $value) {
 
-      $sql .= '`' . $key . '` = ? ,';
-    }
+			$sql .= '`' . $key . '` = ? ,';
+		}
 
-    $sql = rtrim($sql, ' ,');
+		$sql = rtrim($sql, ' ,');
 
-    return $sql;
-  }
+		return $sql;
+	}
 
-  private function addToBindings($value)
-  {
-    if (is_array($value)) {
+	private function addToBindings($value)
+	{
+		if (is_array($value)) {
 
-      $this->bindings = array_merge($this->bindings, array_values($value));
-    } else {
+			$this->bindings = array_merge($this->bindings, array_values($value));
+		} else {
 
-      $this->bindings[] = $value;
-    }
-  }
+			$this->bindings[] = $value;
+		}
+	}
 
-  public function query(...$bindings)
-  {
-    $sql = array_shift($bindings);
+	public function query(...$bindings)
+	{
+		$sql = array_shift($bindings);
 
-    if (count($bindings) == 1 AND is_array($bindings[0])) {
-      $bindings = $bindings[0];
-    }
+		if (count($bindings) == 1 AND is_array($bindings[0])) {
+			$bindings = $bindings[0];
+		}
 
-    try {
-        $query = $this->connection()->prepare($sql);
+		try {
+				$query = $this->connection()->prepare($sql);
 
-        foreach ($bindings as $key => $value) {
-          $query->bindValue($key + 1, _e($value));
-        }
+				foreach ($bindings as $key => $value) {
+					$query->bindValue($key + 1, _e($value));
+				}
 
-        $query->execute();
+				$query->execute();
 
-        $this->reset();
+				$this->reset();
 
-        return $query;
+				return $query;
 
-    } catch (PDOException $e) {
+		} catch (PDOException $e) {
 
-      throw new Exception($e->getMessage());
-    }
-  }
+			throw new Exception($e->getMessage());
+		}
+	}
 
-  private function reset()
-  {
-    $this->table = null;
+	private function reset()
+	{
+		$this->table = null;
 
-    $this->rows = 0;
+		$this->rows = 0;
 
-    $this->data = [];
+		$this->data = [];
 
-    $this->bindings = [];
+		$this->bindings = [];
 
-    $this->selects = [];
+		$this->selects = [];
 
-    $this->joins = [];
+		$this->joins = [];
 
-    $this->wheres = [];
+		$this->wheres = [];
 
-    $this->havings = [];
+		$this->havings = [];
 
-    $this->orderBy = [];
+		$this->orderBy = [];
 
-    $this->limit = null;
+		$this->limit = null;
 
-    $this->offset = 0;
+		$this->offset = 0;
 
-    $this->groupBy = [];
-  }
+		$this->groupBy = [];
+	}
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
   {
     $this->app = $app;
 
-    if (! $this->isConnected()) {
+    if (!$this->isConnected()) {
       $this->connect();
     }
   }
@@ -59,7 +59,7 @@ 
     extract($data);
 
     try {
-      self::$connection  = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
+      self::$connection = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
 
       self::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
@@ -94,14 +94,14 @@ 
 
   public function join($join, $localId = null, $forginId = null)
   {
-    if (! $localId) {
+    if (!$localId) {
 
-      $localId =  trim($join, 's' ). '_id';
+      $localId = trim($join, 's') . '_id';
     }
 
-    if (! $forginId) {
+    if (!$forginId) {
 
-      $forginId =  'id';
+      $forginId = 'id';
     }
 
     $sql = $join . ' ON ' . $this->table . '.' . $localId . ' = ' . $join . '.' . $forginId;
@@ -227,7 +227,7 @@ 
 
     if (!empty($this->orderBy)) {
 
-      $sql .= ' ORDER BY ' . implode (' ', $this->orderBy);
+      $sql .= ' ORDER BY ' . implode(' ', $this->orderBy);
     }
 
     if ($this->limit) {
@@ -241,7 +241,7 @@ 
     }
 
     if (!empty($this->groupBy)) {
-      $sql .= ' GROUP BY ' . implode(' ' , $this->groupBy);
+      $sql .= ' GROUP BY ' . implode(' ', $this->groupBy);
     }
 
     return $sql;
@@ -333,7 +333,7 @@ 
   {
     $sql = '';
 
-    foreach($this->data as $key => $value) {
+    foreach ($this->data as $key => $value) {
 
       $sql .= '`' . $key . '` = ? ,';
     }

App/Models/LoginModel.php

Indentation +31 added lines, -31 removed lines

@@ -6,52 +6,52 @@
 
 class LoginModel extends Model
 {
-  protected $table = 'users';
+	protected $table = 'users';
 
-  private $user;
+	private $user;
 
-  public function isValidLogin($email, $password)
-  {
-    $user = $this->where('email=?' , $email)->fetch($this->table);
+	public function isValidLogin($email, $password)
+	{
+		$user = $this->where('email=?' , $email)->fetch($this->table);
 
-    if (! $user) {
+		if (! $user) {
 
-      return false;
-    }
+			return false;
+		}
 
-    $this->user = $user;
+		$this->user = $user;
 
-    return password_verify($password, $user->password);
-  }
+		return password_verify($password, $user->password);
+	}
 
-  public function user()
-  {
-    return $this->user;
-  }
+	public function user()
+	{
+		return $this->user;
+	}
 
-  public function isLogged()
-  {
-    if ($this->cookie->has('login')) {
+	public function isLogged()
+	{
+		if ($this->cookie->has('login')) {
 
-      $code = $this->cookie->get('login');
+			$code = $this->cookie->get('login');
 
-    } elseif ($this->session->has('login')) {
+		} elseif ($this->session->has('login')) {
 
-      $code = $this->session->get('login');
+			$code = $this->session->get('login');
 
-    } else {
+		} else {
 
-      return false;
-    }
+			return false;
+		}
 
-    $user = $this->where('code=?' , $code)->fetch($this->table);
+		$user = $this->where('code=?' , $code)->fetch($this->table);
 
-    if (! $user) {
-      return false;
-    }
+		if (! $user) {
+			return false;
+		}
 
-    $this->user = $user;
+		$this->user = $user;
 
-    return true;
-  }
+		return true;
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
 
   public function isValidLogin($email, $password)
   {
-    $user = $this->where('email=?' , $email)->fetch($this->table);
+    $user = $this->where('email=?', $email)->fetch($this->table);
 
-    if (! $user) {
+    if (!$user) {
 
       return false;
     }
@@ -44,9 +44,9 @@ 
       return false;
     }
 
-    $user = $this->where('code=?' , $code)->fetch($this->table);
+    $user = $this->where('code=?', $code)->fetch($this->table);
 
-    if (! $user) {
+    if (!$user) {
       return false;
     }
 

App/Middleware/Admin/AuthenticateMiddleware.php

Indentation +21 added lines, -21 removed lines

@@ -7,32 +7,32 @@
 
 class AuthenticateMiddleware implements Middleware
 {
-  public function handle(Application $app, $next)
-  {
-    $request = $app->request->url();
+	public function handle(Application $app, $next)
+	{
+		$request = $app->request->url();
 
-    $login = $app->load->model('Login');
+		$login = $app->load->model('Login');
 
-    $pagesWhenLogout = [
-      '/login',
-      '/login/submit',
-      '/registration',
-      '/registration/submit'
-    ];
+		$pagesWhenLogout = [
+			'/login',
+			'/login/submit',
+			'/registration',
+			'/registration/submit'
+		];
 
-    if ($login->isLogged()) {
+		if ($login->isLogged()) {
 
-      if (in_array($request, $pagesWhenLogout)) {
-        $app->url->redirectTo('/');
-      }
+			if (in_array($request, $pagesWhenLogout)) {
+				$app->url->redirectTo('/');
+			}
 
-    } else {
+		} else {
 
-      if (!in_array($request, $pagesWhenLogout)) {
-        $app->url->redirectTo('/');
-      }
-    }
+			if (!in_array($request, $pagesWhenLogout)) {
+				$app->url->redirectTo('/');
+			}
+		}
 
-    return $next;
-  }
+		return $next;
+	}
 }
\ No newline at end of file

Core/System/Session.php

Indentation +56 added lines, -56 removed lines

@@ -4,60 +4,60 @@
 
 class Session
 {
-  private $app;
-
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
-  }
-
-  public function start()
-  {
-    ini_set('session.use_only_cookies', 1);
-
-    if (!session_id()) {
-      session_start();
-    }
-  }
-
-  public function set($key, $value)
-  {
-    $_SESSION[$key] = $value;
-  }
-
-  public function get($key, $default = null)
-  {
-    return array_get($_SESSION, $key, $default);
-  }
-
-  public function pull($key)
-  {
-    $value = $this->get($key);
-
-    $this->remove($key);
-
-    return $value;
-  }
-
-  public function has($key)
-  {
-    return isset($_SESSION[$key]);
-  }
-
-  public function all()
-  {
-    return $_SESSION;
-  }
-
-  public function remove($key)
-  {
-    unset($_SESSION[$key]);
-  }
-
-  public function destroy()
-  {
-    session_destroy();
-
-    unset($_SESSION);
-  }
+	private $app;
+
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+	}
+
+	public function start()
+	{
+		ini_set('session.use_only_cookies', 1);
+
+		if (!session_id()) {
+			session_start();
+		}
+	}
+
+	public function set($key, $value)
+	{
+		$_SESSION[$key] = $value;
+	}
+
+	public function get($key, $default = null)
+	{
+		return array_get($_SESSION, $key, $default);
+	}
+
+	public function pull($key)
+	{
+		$value = $this->get($key);
+
+		$this->remove($key);
+
+		return $value;
+	}
+
+	public function has($key)
+	{
+		return isset($_SESSION[$key]);
+	}
+
+	public function all()
+	{
+		return $_SESSION;
+	}
+
+	public function remove($key)
+	{
+		unset($_SESSION[$key]);
+	}
+
+	public function destroy()
+	{
+		session_destroy();
+
+		unset($_SESSION);
+	}
 }
\ No newline at end of file

Core/System/Cookie.php

Indentation +36 added lines, -36 removed lines

@@ -4,53 +4,53 @@
 
 class Cookie
 {
-  private $app;
+	private $app;
 
-  private $path;
+	private $path;
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
 
-    $this->path = dirname($this->app->request->server('SCRIPT_NAME')) ?: '/';
-  }
+		$this->path = dirname($this->app->request->server('SCRIPT_NAME')) ?: '/';
+	}
 
-  public function set($key, $value, $hours = 1800)
-  {
-    $expireTime = $hours == -1 ? -1 : time() + $hours * 3600;
+	public function set($key, $value, $hours = 1800)
+	{
+		$expireTime = $hours == -1 ? -1 : time() + $hours * 3600;
 
-    setcookie($key, $value, $expireTime, $this->path, '', false, true);
-  }
+		setcookie($key, $value, $expireTime, $this->path, '', false, true);
+	}
 
-  public function get($key, $default = null)
-  {
-    return array_get($_COOKIE, $key, $default);
-  }
+	public function get($key, $default = null)
+	{
+		return array_get($_COOKIE, $key, $default);
+	}
 
-  public function has($key)
-  {
-    return array_key_exists($key, $_COOKIE);
-  }
+	public function has($key)
+	{
+		return array_key_exists($key, $_COOKIE);
+	}
 
-  public function remove($key)
-  {
-    $this->set($key, null, -1);
+	public function remove($key)
+	{
+		$this->set($key, null, -1);
 
-    unset($_COOKIE[$key]);
-  }
+		unset($_COOKIE[$key]);
+	}
 
-  public function all()
-  {
-    return $_COOKIE;
-  }
+	public function all()
+	{
+		return $_COOKIE;
+	}
 
-  public function destroy()
-  {
-    foreach (array_keys($this->all()) as $key) {
+	public function destroy()
+	{
+		foreach (array_keys($this->all()) as $key) {
 
-      $this->remove($key);
-    }
+			$this->remove($key);
+		}
 
-    unset($_COOKIE);
-  }
+		unset($_COOKIE);
+	}
 }
\ No newline at end of file

Core/System/Model.php

Indentation +84 added lines, -84 removed lines

@@ -4,125 +4,125 @@
 
 abstract class Model
 {
-  protected $app;
+	protected $app;
 
-  protected $table;
+	protected $table;
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
-  }
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+	}
 
-  public function __get($key)
-  {
-    return $this->app->get($key);
-  }
+	public function __get($key)
+	{
+		return $this->app->get($key);
+	}
 
-  public function __call($method, $args)
-  {
-    return call_user_func_array([$this->app->db, $method], $args);
-  }
+	public function __call($method, $args)
+	{
+		return call_user_func_array([$this->app->db, $method], $args);
+	}
 
-  public function all($limit = null)
-  {
-    return $this->orderBy('id', 'DESC')->limit($limit)->fetchAll($this->table);
-  }
+	public function all($limit = null)
+	{
+		return $this->orderBy('id', 'DESC')->limit($limit)->fetchAll($this->table);
+	}
 
-  public function allEnable($limit = null)
-  {
-    return $this->orderBy('id', 'DESC')->where('enable = ?', 1)->limit($limit)->fetchAll($this->table);
-  }
+	public function allEnable($limit = null)
+	{
+		return $this->orderBy('id', 'DESC')->where('enable = ?', 1)->limit($limit)->fetchAll($this->table);
+	}
 
-  public function get($value, $coulmn = 'id')
-  {
-    return $this->where($coulmn . ' = ?', $value)->fetch($this->table);
-  }
+	public function get($value, $coulmn = 'id')
+	{
+		return $this->where($coulmn . ' = ?', $value)->fetch($this->table);
+	}
 
-  public function getEnable($value, $coulmn = 'id')
-  {
-    return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
-  }
+	public function getEnable($value, $coulmn = 'id')
+	{
+		return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
+	}
 
-  public function selectTable($coulmn)
-  {
-    return $this->select($coulmn)->fetchAll($this->table);
-  }
+	public function selectTable($coulmn)
+	{
+		return $this->select($coulmn)->fetchAll($this->table);
+	}
 
-  public function exists($value, $key = 'id')
-  {
-    return (bool) $this->select($key)->where($key .'=?', $value)->fetch($this->table);
-  }
+	public function exists($value, $key = 'id')
+	{
+		return (bool) $this->select($key)->where($key .'=?', $value)->fetch($this->table);
+	}
 
-  public function delete($id)
-  {
-    return $this->where('id = ?', $id)->delete($this->table);
-  }
+	public function delete($id)
+	{
+		return $this->where('id = ?', $id)->delete($this->table);
+	}
 
-  public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
-  {
-    $join = rtrim($join, 'Model');
+	public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
+	{
+		$join = rtrim($join, 'Model');
 
-    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
+		$file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
 
-    $exists = $this->app->file->exists($file);
+		$exists = $this->app->file->exists($file);
 
-    if (!$exists) {
-      return $join . ' Not Found';
-    }
+		if (!$exists) {
+			return $join . ' Not Found';
+		}
 
-    $trace = debug_backtrace();
+		$trace = debug_backtrace();
 
-    $table = $trace[1]['object']->table;
+		$table = $trace[1]['object']->table;
 
-    $join = $this->load->model($join)->table;
+		$join = $this->load->model($join)->table;
 
-    return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetch();
-  }
+		return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetch();
+	}
 
-  public function hasMany($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
-  {
-    $join = rtrim($join, 'Model');
+	public function hasMany($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
+	{
+		$join = rtrim($join, 'Model');
 
-    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
+		$file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
 
-    $exists = $this->app->file->exists($file);
+		$exists = $this->app->file->exists($file);
 
-    if (!$exists) {
-      return $join . ' Not Found';
-    }
+		if (!$exists) {
+			return $join . ' Not Found';
+		}
 
-    $trace = debug_backtrace();
+		$trace = debug_backtrace();
 
-    $table = $trace[1]['object']->table;
+		$table = $trace[1]['object']->table;
 
-    $join = $this->load->model($join)->table;
+		$join = $this->load->model($join)->table;
 
-    return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetchAll();
-  }
+		return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetchAll();
+	}
 
-  public function join($join, $limit = null, $enable = null, $localId = null, $forginId = null)
-  {
-    $join = rtrim($join, 'Model');
+	public function join($join, $limit = null, $enable = null, $localId = null, $forginId = null)
+	{
+		$join = rtrim($join, 'Model');
 
-    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
+		$file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
 
-    $exists = $this->app->file->exists($file);
+		$exists = $this->app->file->exists($file);
 
-    if (!$exists) {
-      return $join . ' Not Found';
-    }
+		if (!$exists) {
+			return $join . ' Not Found';
+		}
 
-    $trace = debug_backtrace();
+		$trace = debug_backtrace();
 
-    $table = $trace[1]['object']->table;
+		$table = $trace[1]['object']->table;
 
-    $join = $this->load->model($join)->table;
+		$join = $this->load->model($join)->table;
 
-    if ($enable) {
+		if ($enable) {
 
-      return $this->db->select()->from($table)->join($join, $localId, $forginId)->where('enable = ?', 1)->limit($limit)->fetchAll();
-    }
+			return $this->db->select()->from($table)->join($join, $localId, $forginId)->where('enable = ?', 1)->limit($limit)->fetchAll();
+		}
 
-    return $this->db->select()->from($table)->join($join, $localId, $forginId)->limit($limit)->fetchAll();
-  }
+		return $this->db->select()->from($table)->join($join, $localId, $forginId)->limit($limit)->fetchAll();
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
   public function getEnable($value, $coulmn = 'id')
   {
-    return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
+    return $this->where($coulmn . ' = ? AND enable = ?', [$value, 1])->fetch($this->table);
   }
 
   public function selectTable($coulmn)
@@ -50,7 +50,7 @@ 
 
   public function exists($value, $key = 'id')
   {
-    return (bool) $this->select($key)->where($key .'=?', $value)->fetch($this->table);
+    return (bool) $this->select($key)->where($key . '=?', $value)->fetch($this->table);
   }
 
   public function delete($id)

Core/System/Loader.php

Indentation +68 added lines, -68 removed lines

@@ -6,99 +6,99 @@
 
 class Loader
 {
-  private $app;
+	private $app;
 
-  private $controllers = [];
+	private $controllers = [];
 
-  private $models = [];
+	private $models = [];
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
-  }
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+	}
 
-  public function action($controller, $method, array $arguments)
-  {
-    $object = $this->controller($controller);
+	public function action($controller, $method, array $arguments)
+	{
+		$object = $this->controller($controller);
 
-    return call_user_func([$object, $method], $arguments);
-  }
+		return call_user_func([$object, $method], $arguments);
+	}
 
-  public function controller($controller)
-  {
-    $controller = $this->getControllerName($controller);
+	public function controller($controller)
+	{
+		$controller = $this->getControllerName($controller);
 
-    if (!$this->hasController($controller)) {
-      $this->addController($controller);
-    }
+		if (!$this->hasController($controller)) {
+			$this->addController($controller);
+		}
 
-    return $this->getController($controller);
-  }
+		return $this->getController($controller);
+	}
 
-  private function hasController($controller)
-  {
-    return array_key_exists($controller, $this->controllers);
-  }
+	private function hasController($controller)
+	{
+		return array_key_exists($controller, $this->controllers);
+	}
 
-  private function addController($controller)
-  {
-    $object = new $controller($this->app);
+	private function addController($controller)
+	{
+		$object = new $controller($this->app);
 
-    $this->controllers[$controller] = $object;
-  }
+		$this->controllers[$controller] = $object;
+	}
 
-  private function getController($controller)
-  {
-    return $this->controllers[$controller];
-  }
+	private function getController($controller)
+	{
+		return $this->controllers[$controller];
+	}
 
-  private function getControllerName($controller)
-  {
-    $controller .= strpos($controller, 'Controller') ? '' : 'Controller';
+	private function getControllerName($controller)
+	{
+		$controller .= strpos($controller, 'Controller') ? '' : 'Controller';
 
-    $controller = str_replace('/', DS, $controller);
+		$controller = str_replace('/', DS, $controller);
 
-    $controller = 'App' . DS . 'Controllers' . DS . $controller;
+		$controller = 'App' . DS . 'Controllers' . DS . $controller;
 
-    return $controller;
-  }
+		return $controller;
+	}
 
-  public function model($model)
-  {
-    $model = $this->getModelName($model);
+	public function model($model)
+	{
+		$model = $this->getModelName($model);
 
-    if (!$this->hasModel($model)) {
-      $this->addModel($model);
-    }
+		if (!$this->hasModel($model)) {
+			$this->addModel($model);
+		}
 
-    return $this->getModel($model);
-  }
+		return $this->getModel($model);
+	}
 
-  private function hasModel($model)
-  {
-    return array_key_exists($model, $this->models);
-  }
+	private function hasModel($model)
+	{
+		return array_key_exists($model, $this->models);
+	}
 
-  private function addModel($model)
-  {
-    $object = new $model($this->app);
+	private function addModel($model)
+	{
+		$object = new $model($this->app);
 
-    $this->models[$model] = $object;
-  }
+		$this->models[$model] = $object;
+	}
 
-  private function getModel($model)
-  {
-    return $this->models[$model];
-  }
+	private function getModel($model)
+	{
+		return $this->models[$model];
+	}
 
-  private function getModelName($model)
-  {
-    $model .= strpos($model, 'Model') ? '' : 'Model';
+	private function getModelName($model)
+	{
+		$model .= strpos($model, 'Model') ? '' : 'Model';
 
-    $model = str_replace('/', DS, $model);
+		$model = str_replace('/', DS, $model);
 
-    $model = 'App' . DS . 'Models' . DS . $model;
+		$model = 'App' . DS . 'Models' . DS . $model;
 
-    return $model;
-  }
+		return $model;
+	}
 }
\ No newline at end of file