Completed
Push — master ( 3ee909...1f6bf8 )
by Angus
03:33
created
application/views/User/Login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 
26 26
 				<div class="row">
27 27
 					<div class="col-xs-6 col-sm-6 col-md-6">
28
-						<?=form_submit($form_submit);?>
28
+						<?=form_submit($form_submit); ?>
29 29
 					</div>
30 30
 					<div class="col-xs-6 col-sm-6 col-md-6">
31 31
 						<a href="<?=base_url('user/signup')?>" class="btn btn-lg btn-primary btn-block">Create an account</a>
Please login to merge, or discard this patch.
application/views/errors/html/error_404.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 ?><!DOCTYPE html>
4 4
 <html lang="en">
5 5
 <head>
Please login to merge, or discard this patch.
application/views/errors/html/error_php.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,12 +11,12 @@
 block discarded – undo
11 11
 <p>Filename: <?php echo $filepath; ?></p>
12 12
 <p>Line Number: <?php echo $line; ?></p>
13 13
 
14
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
14
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
15 15
 
16 16
 	<p>Backtrace:</p>
17
-	<?php foreach (debug_backtrace() as $error): ?>
17
+	<?php foreach(debug_backtrace() as $error): ?>
18 18
 
19
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
19
+		<?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
20 20
 
21 21
 			<p style="margin-left:10px">
22 22
 			File: <?php echo $error['file'] ?><br />
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 ?>
4 4
 
5 5
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
Please login to merge, or discard this patch.
application/views/errors/html/error_exception.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,12 +11,12 @@
 block discarded – undo
11 11
 <p>Filename: <?php echo $exception->getFile(); ?></p>
12 12
 <p>Line Number: <?php echo $exception->getLine(); ?></p>
13 13
 
14
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
14
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
15 15
 
16 16
 	<p>Backtrace:</p>
17
-	<?php foreach ($exception->getTrace() as $error): ?>
17
+	<?php foreach($exception->getTrace() as $error): ?>
18 18
 
19
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
19
+		<?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
20 20
 
21 21
 			<p style="margin-left:10px">
22 22
 			File: <?php echo $error['file']; ?><br />
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 ?>
4 4
 
5 5
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
Please login to merge, or discard this patch.
application/views/errors/cli/error_404.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 
4 4
 echo "\nERROR: ",
5 5
 	$heading,
Please login to merge, or discard this patch.
application/views/errors/cli/error_php.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,11 +7,11 @@
 block discarded – undo
7 7
 Filename:    <?php echo $filepath, "\n"; ?>
8 8
 Line Number: <?php echo $line; ?>
9 9
 
10
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
10
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
11 11
 
12 12
 Backtrace:
13
-<?php	foreach (debug_backtrace() as $error): ?>
14
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
13
+<?php	foreach(debug_backtrace() as $error): ?>
14
+<?php		if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
15 15
 	File: <?php echo $error['file'], "\n"; ?>
16 16
 	Line: <?php echo $error['line'], "\n"; ?>
17 17
 	Function: <?php echo $error['function'], "\n\n"; ?>
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
1
+<?php defined('BASEPATH') or exit('No direct script access allowed'); ?>
2 2
 
3 3
 A PHP Error was encountered
4 4
 
Please login to merge, or discard this patch.
application/views/errors/cli/error_exception.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,11 +7,11 @@
 block discarded – undo
7 7
 Filename:    <?php echo $exception->getFile(), "\n"; ?>
8 8
 Line Number: <?php echo $exception->getLine(); ?>
9 9
 
10
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
10
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
11 11
 
12 12
 Backtrace:
13
-<?php	foreach ($exception->getTrace() as $error): ?>
14
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
13
+<?php	foreach($exception->getTrace() as $error): ?>
14
+<?php		if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
15 15
 	File: <?php echo $error['file'], "\n"; ?>
16 16
 	Line: <?php echo $error['line'], "\n"; ?>
17 17
 	Function: <?php echo $error['function'], "\n\n"; ?>
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
1
+<?php defined('BASEPATH') or exit('No direct script access allowed'); ?>
2 2
 
3 3
 An uncaught Exception was encountered
4 4
 
Please login to merge, or discard this patch.
application/views/errors/cli/error_db.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 
4 4
 echo "\nDatabase error: ",
5 5
 	$heading,
Please login to merge, or discard this patch.
application/core/MY_Controller.php 3 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 	protected $footer_data = array();
7 7
 	public    $global_data = array();
8 8
 
9
-	public function __construct(){
9
+	public function __construct() {
10 10
 		parent::__construct();
11 11
 
12 12
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -80,7 +80,9 @@  discard block
 block discarded – undo
80 80
 	public function __construct() {
81 81
 		parent::__construct();
82 82
 
83
-		if($this->ion_auth->logged_in()) redirect('/');
83
+		if($this->ion_auth->logged_in()) {
84
+			redirect('/');
85
+		}
84 86
 	}
85 87
 }
86 88
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class MY_Controller extends CI_Controller {
4 4
 	protected $header_data = array();
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 	protected $footer_data = array();
7 7
 	public    $global_data = array();
8 8
 
9
-	public function __construct(){
9
+	public function __construct() {
10 10
 		parent::__construct();
11 11
 
12 12
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 
19 19
 		$this->global_data['theme'] = $this->User_Options->get('theme');
20 20
 		$css_path = "css/main.{$this->User_Options->get('theme')}";
21
-		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css";
21
+		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css";
22 22
 
23 23
 		$js_path = 'js/compiled.min';
24
-		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js";
24
+		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js";
25 25
 	}
26 26
 
27 27
 	public function _render_page(/*(array) $paths*/) : void {
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		$json = is_array($json_input) ? json_encode($json_input) : $json_input;
46 46
 
47 47
 		$this->output->set_content_type('application/json', 'utf-8');
48
-		$this->_render_content($json ?? '{}','json', $download, $filenamePrefix);
48
+		$this->_render_content($json ?? '{}', 'json', $download, $filenamePrefix);
49 49
 	}
50 50
 	public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void {
51 51
 		if($download) {
Please login to merge, or discard this patch.