@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | # Build query |
| 22 | 22 | |
| 23 | - $this->query = ('UPDATE ' . $table . ' SET ' . $dataset . ($condition ? (' WHERE (' . $condition . ')') : '')); |
|
| 23 | + $this->query = ('UPDATE '.$table.' SET '.$dataset.($condition ? (' WHERE ('.$condition.')') : '')); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -22,9 +22,9 @@ |
||
| 22 | 22 | |
| 23 | 23 | # Build query |
| 24 | 24 | |
| 25 | - $this->query = ('SELECT ' . $selection . ' FROM ' . $table . ($condition ? (' WHERE (' . $condition . ')') : '') . |
|
| 25 | + $this->query = ('SELECT '.$selection.' FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''). |
|
| 26 | 26 | |
| 27 | - ($order ? (' ORDER BY ' . $order) : '') . ($limit ? (' LIMIT ' . $limit) : '')); |
|
| 27 | + ($order ? (' ORDER BY '.$order) : '').($limit ? (' LIMIT '.$limit) : '')); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -2,26 +2,26 @@ |
||
| 2 | 2 | |
| 3 | 3 | # Define constants |
| 4 | 4 | |
| 5 | -define('DIR_SYSTEM', (dirname(__FILE__) . '/')); |
|
| 5 | +define('DIR_SYSTEM', (dirname(__FILE__).'/')); |
|
| 6 | 6 | |
| 7 | -define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM . 'Classes/')); |
|
| 8 | -define('DIR_SYSTEM_DATA', (DIR_SYSTEM . 'Data/')); |
|
| 9 | -define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM . 'Includes/')); |
|
| 10 | -define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM . 'Languages/')); |
|
| 11 | -define('DIR_SYSTEM_PLUGINS', (DIR_SYSTEM . 'Plugins/')); |
|
| 12 | -define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM . 'Templates/')); |
|
| 7 | +define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM.'Classes/')); |
|
| 8 | +define('DIR_SYSTEM_DATA', (DIR_SYSTEM.'Data/')); |
|
| 9 | +define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM.'Includes/')); |
|
| 10 | +define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM.'Languages/')); |
|
| 11 | +define('DIR_SYSTEM_PLUGINS', (DIR_SYSTEM.'Plugins/')); |
|
| 12 | +define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM.'Templates/')); |
|
| 13 | 13 | |
| 14 | 14 | # Require classes |
| 15 | 15 | |
| 16 | -require_once (DIR_SYSTEM . 'System.php'); |
|
| 17 | -require_once (DIR_SYSTEM . 'Exception.php'); |
|
| 16 | +require_once (DIR_SYSTEM.'System.php'); |
|
| 17 | +require_once (DIR_SYSTEM.'Exception.php'); |
|
| 18 | 18 | |
| 19 | 19 | # Require configuration |
| 20 | 20 | |
| 21 | -require_once (DIR_SYSTEM_INCLUDES . 'Config.php'); |
|
| 22 | -require_once (DIR_SYSTEM_INCLUDES . 'Constants.php'); |
|
| 23 | -require_once (DIR_SYSTEM_INCLUDES . 'Regex.php'); |
|
| 24 | -require_once (DIR_SYSTEM_INCLUDES . 'Tables.php'); |
|
| 21 | +require_once (DIR_SYSTEM_INCLUDES.'Config.php'); |
|
| 22 | +require_once (DIR_SYSTEM_INCLUDES.'Constants.php'); |
|
| 23 | +require_once (DIR_SYSTEM_INCLUDES.'Regex.php'); |
|
| 24 | +require_once (DIR_SYSTEM_INCLUDES.'Tables.php'); |
|
| 25 | 25 | |
| 26 | 26 | # Process environment variables |
| 27 | 27 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | if ($this->form->handle(new Auth\Controller\Register())) { |
| 22 | 22 | |
| 23 | - Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=register'); |
|
| 23 | + Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=register'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | # ------------------------ |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | if ($this->form->handle(new Auth\Controller\Reset())) { |
| 22 | 22 | |
| 23 | - Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=reset'); |
|
| 23 | + Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=reset'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | # ------------------------ |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | if ($this->form->handle(new Auth\Controller\Login())) { |
| 22 | 22 | |
| 23 | - Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile')); |
|
| 23 | + Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile')); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | # Display success message |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | private function getFullName() { |
| 14 | 14 | |
| 15 | - return trim($this->data['first_name'] . ' ' . $this->data['last_name']); |
|
| 15 | + return trim($this->data['first_name'].' '.$this->data['last_name']); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | # Implement entity |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | |
| 36 | 36 | if ($this->form->handle(new Install\Controller\Database())) { |
| 37 | 37 | |
| 38 | - Request::redirect(INSTALL_PATH . '/admin/register'); |
|
| 38 | + Request::redirect(INSTALL_PATH.'/admin/register'); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | # ------------------------ |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | $class = ($value ? 'positive' : 'negative'); $icon = ($value ? 'check circle' : 'warning circle'); |
| 20 | 20 | |
| 21 | - $text = Language::get('INSTALL_REQUIREMENT_' . strtoupper($name) . '_' . ($value ? 'SUCCESS' : 'FAIL')); |
|
| 21 | + $text = Language::get('INSTALL_REQUIREMENT_'.strtoupper($name).'_'.($value ? 'SUCCESS' : 'FAIL')); |
|
| 22 | 22 | |
| 23 | 23 | $requirements[] = ['class' => $class, 'icon' => $icon, 'text' => $text]; |
| 24 | 24 | } |