DakuTree / manga-tracker

application/config/smileys.php

Spacing +43 added lines, -43 removed lines

@@ -17,48 +17,48 @@
 
 //	smiley			image name						width	height	alt
 
-	':-)'			=>	array('grin.gif',			'19',	'19',	'grin'),
-	':lol:'			=>	array('lol.gif',			'19',	'19',	'LOL'),
-	':cheese:'		=>	array('cheese.gif',			'19',	'19',	'cheese'),
-	':)'			=>	array('smile.gif',			'19',	'19',	'smile'),
-	';-)'			=>	array('wink.gif',			'19',	'19',	'wink'),
-	';)'			=>	array('wink.gif',			'19',	'19',	'wink'),
-	':smirk:'		=>	array('smirk.gif',			'19',	'19',	'smirk'),
-	':roll:'		=>	array('rolleyes.gif',		'19',	'19',	'rolleyes'),
-	':-S'			=>	array('confused.gif',		'19',	'19',	'confused'),
-	':wow:'			=>	array('surprise.gif',		'19',	'19',	'surprised'),
-	':bug:'			=>	array('bigsurprise.gif',	'19',	'19',	'big surprise'),
-	':-P'			=>	array('tongue_laugh.gif',	'19',	'19',	'tongue laugh'),
-	'%-P'			=>	array('tongue_rolleye.gif',	'19',	'19',	'tongue rolleye'),
-	';-P'			=>	array('tongue_wink.gif',	'19',	'19',	'tongue wink'),
-	':P'			=>	array('raspberry.gif',		'19',	'19',	'raspberry'),
-	':blank:'		=>	array('blank.gif',			'19',	'19',	'blank stare'),
-	':long:'		=>	array('longface.gif',		'19',	'19',	'long face'),
-	':ohh:'			=>	array('ohh.gif',			'19',	'19',	'ohh'),
-	':grrr:'		=>	array('grrr.gif',			'19',	'19',	'grrr'),
-	':gulp:'		=>	array('gulp.gif',			'19',	'19',	'gulp'),
-	'8-/'			=>	array('ohoh.gif',			'19',	'19',	'oh oh'),
-	':down:'		=>	array('downer.gif',			'19',	'19',	'downer'),
-	':red:'			=>	array('embarrassed.gif',	'19',	'19',	'red face'),
-	':sick:'		=>	array('sick.gif',			'19',	'19',	'sick'),
-	':shut:'		=>	array('shuteye.gif',		'19',	'19',	'shut eye'),
-	':-/'			=>	array('hmm.gif',			'19',	'19',	'hmmm'),
-	'>:('			=>	array('mad.gif',			'19',	'19',	'mad'),
-	':mad:'			=>	array('mad.gif',			'19',	'19',	'mad'),
-	'>:-('			=>	array('angry.gif',			'19',	'19',	'angry'),
-	':angry:'		=>	array('angry.gif',			'19',	'19',	'angry'),
-	':zip:'			=>	array('zip.gif',			'19',	'19',	'zipper'),
-	':kiss:'		=>	array('kiss.gif',			'19',	'19',	'kiss'),
-	':ahhh:'		=>	array('shock.gif',			'19',	'19',	'shock'),
-	':coolsmile:'	=>	array('shade_smile.gif',	'19',	'19',	'cool smile'),
-	':coolsmirk:'	=>	array('shade_smirk.gif',	'19',	'19',	'cool smirk'),
-	':coolgrin:'	=>	array('shade_grin.gif',		'19',	'19',	'cool grin'),
-	':coolhmm:'		=>	array('shade_hmm.gif',		'19',	'19',	'cool hmm'),
-	':coolmad:'		=>	array('shade_mad.gif',		'19',	'19',	'cool mad'),
-	':coolcheese:'	=>	array('shade_cheese.gif',	'19',	'19',	'cool cheese'),
-	':vampire:'		=>	array('vampire.gif',		'19',	'19',	'vampire'),
-	':snake:'		=>	array('snake.gif',			'19',	'19',	'snake'),
-	':exclaim:'		=>	array('exclaim.gif',		'19',	'19',	'exclaim'),
-	':question:'	=>	array('question.gif',		'19',	'19',	'question')
+	':-)'			=>	array('grin.gif', '19', '19', 'grin'),
+	':lol:'			=>	array('lol.gif', '19', '19', 'LOL'),
+	':cheese:'		=>	array('cheese.gif', '19', '19', 'cheese'),
+	':)'			=>	array('smile.gif', '19', '19', 'smile'),
+	';-)'			=>	array('wink.gif', '19', '19', 'wink'),
+	';)'			=>	array('wink.gif', '19', '19', 'wink'),
+	':smirk:'		=>	array('smirk.gif', '19', '19', 'smirk'),
+	':roll:'		=>	array('rolleyes.gif', '19', '19', 'rolleyes'),
+	':-S'			=>	array('confused.gif', '19', '19', 'confused'),
+	':wow:'			=>	array('surprise.gif', '19', '19', 'surprised'),
+	':bug:'			=>	array('bigsurprise.gif', '19', '19', 'big surprise'),
+	':-P'			=>	array('tongue_laugh.gif', '19', '19', 'tongue laugh'),
+	'%-P'			=>	array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'),
+	';-P'			=>	array('tongue_wink.gif', '19', '19', 'tongue wink'),
+	':P'			=>	array('raspberry.gif', '19', '19', 'raspberry'),
+	':blank:'		=>	array('blank.gif', '19', '19', 'blank stare'),
+	':long:'		=>	array('longface.gif', '19', '19', 'long face'),
+	':ohh:'			=>	array('ohh.gif', '19', '19', 'ohh'),
+	':grrr:'		=>	array('grrr.gif', '19', '19', 'grrr'),
+	':gulp:'		=>	array('gulp.gif', '19', '19', 'gulp'),
+	'8-/'			=>	array('ohoh.gif', '19', '19', 'oh oh'),
+	':down:'		=>	array('downer.gif', '19', '19', 'downer'),
+	':red:'			=>	array('embarrassed.gif', '19', '19', 'red face'),
+	':sick:'		=>	array('sick.gif', '19', '19', 'sick'),
+	':shut:'		=>	array('shuteye.gif', '19', '19', 'shut eye'),
+	':-/'			=>	array('hmm.gif', '19', '19', 'hmmm'),
+	'>:('			=>	array('mad.gif', '19', '19', 'mad'),
+	':mad:'			=>	array('mad.gif', '19', '19', 'mad'),
+	'>:-('			=>	array('angry.gif', '19', '19', 'angry'),
+	':angry:'		=>	array('angry.gif', '19', '19', 'angry'),
+	':zip:'			=>	array('zip.gif', '19', '19', 'zipper'),
+	':kiss:'		=>	array('kiss.gif', '19', '19', 'kiss'),
+	':ahhh:'		=>	array('shock.gif', '19', '19', 'shock'),
+	':coolsmile:'	=>	array('shade_smile.gif', '19', '19', 'cool smile'),
+	':coolsmirk:'	=>	array('shade_smirk.gif', '19', '19', 'cool smirk'),
+	':coolgrin:'	=>	array('shade_grin.gif', '19', '19', 'cool grin'),
+	':coolhmm:'		=>	array('shade_hmm.gif', '19', '19', 'cool hmm'),
+	':coolmad:'		=>	array('shade_mad.gif', '19', '19', 'cool mad'),
+	':coolcheese:'	=>	array('shade_cheese.gif', '19', '19', 'cool cheese'),
+	':vampire:'		=>	array('vampire.gif', '19', '19', 'vampire'),
+	':snake:'		=>	array('snake.gif', '19', '19', 'snake'),
+	':exclaim:'		=>	array('exclaim.gif', '19', '19', 'exclaim'),
+	':question:'	=>	array('question.gif', '19', '19', 'question')
 
 );

application/libraries/MY_DB_cache.php

Spacing +17 added lines, -17 removed lines

@@ -74,8 +74,8 @@ 
 	 */
 	public function __construct(&$db) {
 		// Assign the main CI object to $this->CI and load the file helper since we use it a lot
-		$this->CI =& get_instance();
-		$this->db =& $db;
+		$this->CI = & get_instance();
+		$this->db = & $db;
 		$this->CI->load->helper('file');
 
 		$this->check_path();
@@ -102,18 +102,18 @@ 
 
 		// Add a trailing slash to the path if needed
 		$path = realpath($path)
-			? rtrim(realpath($path), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR
-			: rtrim($path, '/') . '/';
+			? rtrim(realpath($path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR
+			: rtrim($path, '/').'/';
 
 		if(!is_dir($path)) {
-			log_message('debug', 'DB cache path error: ' . $path);
+			log_message('debug', 'DB cache path error: '.$path);
 
 			// If the path is wrong we'll turn off caching
 			return $this->db->cache_off();
 		}
 
 		if(!is_really_writable($path)) {
-			log_message('debug', 'DB cache dir not writable: ' . $path);
+			log_message('debug', 'DB cache dir not writable: '.$path);
 
 			// If the path is not really writable we'll turn off caching
 			return $this->db->cache_off();
@@ -144,11 +144,11 @@ 
 		// BEGIN --- modification for supporting multi-level cache folders
 
 		if(is_array($this->CI->config->item('multi_level_cache_folders'))) {
-			$uri_md5  = md5($segment_one . '+' . $segment_two);
+			$uri_md5  = md5($segment_one.'+'.$segment_two);
 			$layer    = $this->get_folder_layers($uri_md5);
-			$filepath = $this->db->cachedir . $segment_one.'/'.$segment_two . '/' . implode('/', $layer) . '/' . $uri_md5;
+			$filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.implode('/', $layer).'/'.$uri_md5;
 		} else {
-			$filepath = $this->db->cachedir . $segment_one.'/'. $segment_two . '/' . md5($sql);
+			$filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.md5($sql);
 		}
 
 		// END --- modification for supporting multi-level cache folders
@@ -178,9 +178,9 @@ 
 		// BEGIN --- modification for supporting multi-level cache folders
 
 		if(is_array($this->CI->config->item('multi_level_cache_folders'))) {
-			$uri_md5  = md5($segment_one . '+' . $segment_two);
+			$uri_md5  = md5($segment_one.'+'.$segment_two);
 			$layer    = $this->get_folder_layers($uri_md5);
-			$dir_path = $this->db->cachedir . $segment_one.'/'.$segment_two . '/' . implode('/', $layer) . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.implode('/', $layer).'/';
 
 			if(!is_dir($dir_path)) {
 				$old = umask(0);
@@ -188,18 +188,18 @@ 
 				umask($old);
 			}
 		} else {
-			$dir_path = $this->db->cachedir . $segment_one.'/'. $segment_two . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/';
 		}
 
 		$filename = md5($sql);
 
 		// END --- modification for supporting multi-level cache folders
 
-		if(write_file($dir_path . $filename, serialize($object)) === FALSE) {
+		if(write_file($dir_path.$filename, serialize($object)) === FALSE) {
 			return FALSE;
 		}
 
-		chmod($dir_path . $filename, 0640);
+		chmod($dir_path.$filename, 0640);
 
 		return TRUE;
 	}
@@ -224,11 +224,11 @@ 
 		}
 
 		if(is_array($this->CI->config->item('multi_level_cache_folders'))) {
-			$uri_md5  = md5($segment_one . '+' . $segment_two);
+			$uri_md5  = md5($segment_one.'+'.$segment_two);
 			$layer    = $this->get_folder_layers($uri_md5);
-			$dir_path = $this->db->cachedir . $segment_one.'/'.$segment_two . '/' . implode('/', $layer) . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.implode('/', $layer).'/';
 		} else {
-			$dir_path = $this->db->cachedir . $segment_one.'/'. $segment_two . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/';
 		}
 		delete_files($dir_path, TRUE);
 	}

application/core/MY_Loader.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		// if this class is already loaded before instantiating it. Loading it now
 		// makes sure our version is used when a controller enables query caching
 		if(!class_exists('CI_DB_Cache')) {
-			@include(APPPATH . 'libraries/MY_DB_cache.php');
+			@include(APPPATH.'libraries/MY_DB_cache.php');
 		}
 
 		// call the parent method to retain the CI functionality

application/views/User/Reset_Password.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 			<div class="row">
 				<div class="col-xs-12 col-md-12">
-					<?=form_submit($form_submit);?>
+					<?=form_submit($form_submit); ?>
 				</div>
 			</div>
 		</form>

application/views/User/Signup_Continued.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 			<div class="row">
 				<div class="col-xs-12 col-md-12">
-					<?=form_submit($form_submit);?>
+					<?=form_submit($form_submit); ?>
 				</div>
 			</div>
 		</form>

application/controllers/User/Options.php

Spacing +9 added lines, -9 removed lines

@@ -16,16 +16,16 @@ 
 		$usedCategories   = $this->Tracker->category->getUsed($this->User->id);
 
 		//NOTE: The checkbox validation is handled in run()
-		$this->form_validation->set_rules('category_custom_1_text',  'Custom Category 1 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_2_text',  'Custom Category 2 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_3_text',  'Custom Category 3 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
 		$this->form_validation->set_rules('default_series_category', 'Default Series Category', 'required|is_valid_option_value[default_series_category]');
-		$this->form_validation->set_rules('list_sort_type',          'List Sort Type',          'required|is_valid_option_value[list_sort_type]');
-		$this->form_validation->set_rules('list_sort_order',         'List Sort Order',         'required|is_valid_option_value[list_sort_order]');
-		$this->form_validation->set_rules('theme',                   'Theme',                   'required|is_valid_option_value[theme]');
-		$this->form_validation->set_rules('mal_sync',                'MAL Sync',                'required|is_valid_option_value[mal_sync]');
+		$this->form_validation->set_rules('list_sort_type', 'List Sort Type', 'required|is_valid_option_value[list_sort_type]');
+		$this->form_validation->set_rules('list_sort_order', 'List Sort Order', 'required|is_valid_option_value[list_sort_order]');
+		$this->form_validation->set_rules('theme', 'Theme', 'required|is_valid_option_value[theme]');
+		$this->form_validation->set_rules('mal_sync', 'MAL Sync', 'required|is_valid_option_value[mal_sync]');
 
-		if ($isValid = $this->form_validation->run() === TRUE) {
+		if($isValid = $this->form_validation->run() === TRUE) {
 			foreach($customCategories as $categoryK => $category) {
 				if(!in_array($categoryK, $usedCategories)) {
 					$this->User_Options->set($category, $this->input->post($category) ? 'enabled' : 'disabled');
@@ -38,7 +38,7 @@ 
 
 			$this->User_Options->set('enable_live_countdown_timer', $this->input->post('enable_live_countdown_timer'));
 
-			$this->User_Options->set('list_sort_type',  $this->input->post('list_sort_type'));
+			$this->User_Options->set('list_sort_type', $this->input->post('list_sort_type'));
 			$this->User_Options->set('list_sort_order', $this->input->post('list_sort_order'));
 			
 			$this->User_Options->set('theme', $this->input->post('theme'));

application/controllers/Ajax/TrackerInline.php

Spacing +8 added lines, -8 removed lines

@@ -26,8 +26,8 @@ 
 	 * URL:        /ajax/update_inline
 	 */
 	public function update() : void {
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
 
 		if($this->form_validation->run() === TRUE) {
 			$success = $this->Tracker->list->updateByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -122,7 +122,7 @@ 
 	 * URL:        /tag_update
 	 */
 	public function tag_update() : void {
-		$this->form_validation->set_rules('id',         'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
 		$this->form_validation->set_rules('tag_string', 'Tag String', 'max_length[255]|is_valid_tag_string|not_equals[none]');
 
 		if($this->form_validation->run() === TRUE) {
@@ -169,7 +169,7 @@ 
 	 * URL:        /set_category
 	 */
 	public function set_category() : void {
-		$this->form_validation->set_rules('id[]',     'List of IDs',   'required|ctype_digit');
+		$this->form_validation->set_rules('id[]', 'List of IDs', 'required|ctype_digit');
 		$this->form_validation->set_rules('category', 'Category Name', 'required|is_valid_category');
 
 		if($this->form_validation->run() === TRUE) {
@@ -215,8 +215,8 @@ 
 	 * URL:        /ajax/ignore_inline
 	 */
 	public function ignore() : void {
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
 
 		if($this->form_validation->run() === TRUE) {
 			$success = $this->Tracker->list->ignoreByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -238,8 +238,8 @@ 
 	 * URL:        /set_mal_id
 	 */
 	public function set_mal_id() : void {
-		$this->form_validation->set_rules('id',     'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('mal_id', 'MAL ID',     'regex_match[/^[0-9]*$/]');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('mal_id', 'MAL ID', 'regex_match[/^[0-9]*$/]');
 
 		if($this->form_validation->run() === TRUE) {
 			$malID = (is_numeric($this->input->post('mal_id')) ? $this->input->post('mal_id') : NULL);

application/controllers/User/Auth/Forgot_Password.php

Spacing +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@ 
 		$this->header_data['page']  = "forgot_password";
 
 		//TODO (RESEARCH): Should we allow username here too?
-		$this->form_validation->set_rules('email', 'Email',  'required|valid_email', array(
+		$this->form_validation->set_rules('email', 'Email', 'required|valid_email', array(
 			'required'    => 'Please enter your email.',
 			'valid_email' => 'The email your entered is invalid.'
 		));
 
-		if ($this->form_validation->run() === TRUE) {
+		if($this->form_validation->run() === TRUE) {
 			//form is valid
 
 			$identity = $this->ion_auth->where('email', $this->input->post('email'))->users()->row();
@@ -71,21 +71,21 @@ 
 		$this->header_data['page'] = "reset-password";
 
 		$user = $this->ion_auth->forgotten_password_check($code);
-		if ($user) {
+		if($user) {
 			//code is valid, show reset form or process reset
 			$min_password_length = $this->config->item('min_password_length', 'ion_auth');
 			$max_password_length = $this->config->item('max_password_length', 'ion_auth');
-			$this->form_validation->set_rules('new_password',         "Password",         'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']');
+			$this->form_validation->set_rules('new_password', "Password", 'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']');
 			$this->form_validation->set_rules('new_password_confirm', "Password Confirm", 'required|matches[new_password]');
 
-			if ($this->form_validation->run() === TRUE) {
+			if($this->form_validation->run() === TRUE) {
 				//form is valid, process the password reset request
 				//TODO (Research): The original ion_auth auth.php sent the userid to the form, then matched it on return, is there any point to this?
 
 				$identity = $user->{'email'};
 				$change   = $this->ion_auth->reset_password($identity, $this->input->post('new_password'));
 
-				if ($change) {
+				if($change) {
 					//password changed successfully, redirect to login
 					$this->session->set_flashdata('notices', $this->ion_auth->messages());
 					redirect("user/login", 'refresh');

application/controllers/User/PublicList.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 				//	break;
 
 				case 'html':
-					$this->body_data['trackerData']  = $trackerData['series'];
+					$this->body_data['trackerData'] = $trackerData['series'];
 
 					$this->header_data['show_header'] = FALSE;
 					$this->footer_data['show_footer'] = FALSE;
@@ -62,12 +62,12 @@ 
 		if($show_404) show_404();
 	}
 
-	private function _walk_recursive_remove (array $array, callable $callback) : array {
-		foreach ($array as $k => $v) {
-			if (is_array($v)) {
+	private function _walk_recursive_remove(array $array, callable $callback) : array {
+		foreach($array as $k => $v) {
+			if(is_array($v)) {
 				$array[$k] = $this->_walk_recursive_remove($v, $callback);
 			} else {
-				if ($callback($v, $k)) {
+				if($callback($v, $k)) {
 					unset($array[$k]);
 				}
 			}