Completed
Push — master ( 6612f8...4145fd )
by Angus
04:09
created
application/controllers/User/Auth/Login.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,17 +15,17 @@  discard block
 block discarded – undo
15 15
 		$this->header_data['title'] = "Login";
16 16
 		$this->header_data['page']  = "login";
17 17
 
18
-		$this->form_validation->set_rules('identity', 'Identity',  'required|max_length[254]', array(
18
+		$this->form_validation->set_rules('identity', 'Identity', 'required|max_length[254]', array(
19 19
 			'required'   => 'Please enter your username or email.',
20 20
 			'max_length' => 'Invalid username.'
21 21
 
22 22
 		));
23
-		$this->form_validation->set_rules('password', 'Password',  'required|max_length[64]', array(
23
+		$this->form_validation->set_rules('password', 'Password', 'required|max_length[64]', array(
24 24
 			'required'   => 'Please enter your password.',
25 25
 			'max_length' => 'Invalid password.'
26 26
 		));
27 27
 
28
-		if ($isValid = $this->form_validation->run() === TRUE) {
28
+		if($isValid = $this->form_validation->run() === TRUE) {
29 29
 			//form is valid
30 30
 
31 31
 			//check if identity is email, if not then attempt to use grab from DB
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			$this->body_data['notices'] = validation_errors() ? validation_errors() : $this->session->flashdata('notices');
64 64
 			//$errors = $this->form_validation->error_array();
65 65
 
66
-			$this->body_data['form_create'] = array (
66
+			$this->body_data['form_create'] = array(
67 67
 				'action' => 'user/login',
68 68
 
69 69
 				'role'   => 'form'
Please login to merge, or discard this patch.
application/controllers/User/Auth/Signup.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 			'is_unique_email' => 'Email already exists.'
42 42
 		));
43 43
 
44
-		if ($isValid = $this->form_validation->run() === TRUE) {
44
+		if($isValid = $this->form_validation->run() === TRUE) {
45 45
 			$email = $this->Auth->parse_email($this->input->post('email'));
46 46
 
47 47
 			$this->body_data['email'] = $email;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 		}
55 55
 
56 56
 		//login wasn't valid, failed, or this is a fresh login attempt
57
-		if(!$isValid){
57
+		if(!$isValid) {
58 58
 			//display the email validation form
59 59
 
60 60
 			$this->global_data['notices'] = (validation_errors() ? validation_errors() : ($this->ion_auth->errors() ? $this->ion_auth->errors() : $this->session->flashdata('message')));
@@ -92,14 +92,14 @@  discard block
 block discarded – undo
92 92
 		if(!($email = $this->Auth->verification_check($verificationCode))) redirect('user/signup');
93 93
 
94 94
 		//validation is valid, proceed as normal
95
-		$this->form_validation->set_rules('username',         'Username',           'required|min_length[4]|max_length[15]|valid_username|is_unique_username');
96
-		$this->form_validation->set_rules('password',         'Password',           'required|valid_password');
97
-		$this->form_validation->set_rules('password_confirm', 'Confirm Password',   'required|matches[password]');
98
-		$this->form_validation->set_rules('terms',            'Terms & Conditions', 'required');
95
+		$this->form_validation->set_rules('username', 'Username', 'required|min_length[4]|max_length[15]|valid_username|is_unique_username');
96
+		$this->form_validation->set_rules('password', 'Password', 'required|valid_password');
97
+		$this->form_validation->set_rules('password_confirm', 'Confirm Password', 'required|matches[password]');
98
+		$this->form_validation->set_rules('terms', 'Terms & Conditions', 'required');
99 99
 		//TODO: timezone
100 100
 		//TODO: receive email
101 101
 
102
-		if ($isValid = $this->form_validation->run() === TRUE) {
102
+		if($isValid = $this->form_validation->run() === TRUE) {
103 103
 			$username = $this->input->post('username');
104 104
 			$password = $this->input->post('password');
105 105
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		}
124 124
 
125 125
 		//signup wasn't valid, failed, or this is a fresh signup attempt
126
-		if(!$isValid){
126
+		if(!$isValid) {
127 127
 			//display the create user form
128 128
 
129 129
 			$this->global_data['notices'] = (validation_errors() ? validation_errors() : ($this->ion_auth->errors() ? $this->ion_auth->errors() : $this->session->flashdata('message')));
Please login to merge, or discard this patch.
application/controllers/Ajax/Userscript.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 	public function report_bug() {
69 69
 		$this->load->library('user_agent');
70 70
 		if($this->output->is_custom_header_set()) { $this->output->reset_status_header(); return; }
71
-		$this->form_validation->set_rules('bug[url]',  'Bug [URL]',  'required');
71
+		$this->form_validation->set_rules('bug[url]', 'Bug [URL]', 'required');
72 72
 		$this->form_validation->set_rules('bug[text]', 'Bug [Text]', 'required');
73 73
 
74 74
 		if($this->form_validation->run() === TRUE) {
Please login to merge, or discard this patch.
application/controllers/Ajax/TrackerInline.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 * URL:        /ajax/update_tracker_inline
27 27
 	 */
28 28
 	public function update() {
29
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
30
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
29
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
30
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
31 31
 
32 32
 		if($this->form_validation->run() === TRUE) {
33 33
 			$success = $this->Tracker->updateTrackerByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 * URL:        /tag_update
123 123
 	 */
124 124
 	public function tag_update() {
125
-		$this->form_validation->set_rules('id',         'Chapter ID', 'required|ctype_digit');
125
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
126 126
 		$this->form_validation->set_rules('tag_string', 'Tag String', 'max_length[255]|is_valid_tag_string|not_contains[none]');
127 127
 
128 128
 		if($this->form_validation->run() === TRUE) {
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 * URL:        /set_category
147 147
 	 */
148 148
 	public function set_category() {
149
-		$this->form_validation->set_rules('id[]',     'List of IDs',   'required|ctype_digit');
149
+		$this->form_validation->set_rules('id[]', 'List of IDs', 'required|ctype_digit');
150 150
 		$this->form_validation->set_rules('category', 'Category Name', 'required|is_valid_category');
151 151
 
152 152
 		if($this->form_validation->run() === TRUE) {
Please login to merge, or discard this patch.
application/controllers/ReportBug.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@
 block discarded – undo
12 12
 		$this->header_data['page']  = "report-bug";
13 13
 
14 14
 		$this->form_validation->set_rules('bug_description', 'Description', 'required|max_length[255]');
15
-		$this->form_validation->set_rules('bug_url',         'URL',         '');
15
+		$this->form_validation->set_rules('bug_url', 'URL', '');
16 16
 
17 17
 		$this->body_data['bug_submitted'] = FALSE;
18
-		if ($isValid = $this->form_validation->run() === TRUE) {
18
+		if($isValid = $this->form_validation->run() === TRUE) {
19 19
 			//send report
20 20
 			$this->body_data['bug_submitted'] = $this->Tracker->reportBug($this->input->post('bug_description'), NULL, $this->input->post('bug_url'));
21 21
 		}
Please login to merge, or discard this patch.
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/User/Signup_Continued.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 
50 50
 			<div class="row">
51 51
 				<div class="col-xs-12 col-md-12">
52
-					<?=form_submit($form_submit);?>
52
+					<?=form_submit($form_submit); ?>
53 53
 				</div>
54 54
 			</div>
55 55
 		</form>
Please login to merge, or discard this patch.
application/views/User/Signup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 			<hr class="colorgraph">
21 21
 
22 22
 			<div class="row">
23
-				<?=form_submit($form_submit);?>
23
+				<?=form_submit($form_submit); ?>
24 24
 			</div>
25 25
 		</form>
26 26
 	</div>
Please login to merge, or discard this patch.
application/views/errors/html/error_php.php 1 patch
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.