DakuTree / manga-tracker

Completed

Push — master ( 477aa2...0a4bb5 )

by Angus

created 2019-07-29 17:44 UTC

Status

Category

Toggle Patches

application/config/user_agents.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	/*
5	5	\| -------------------------------------------------------------------

Please login to merge, or discard this patch.

application/config/routes.php 2 patches

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	/*
4	4	\| -------------------------------------------------------------------------

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -96,7 +96,7 @@
 block discarded – undo
 $route['ajax/hide_notice']['post']     = 'Ajax/TrackerInline/hide_notice';
 $route['ajax/set_mal_id']['post']      = 'Ajax/TrackerInline/set_mal_id';
 
-$route['export_list']                 = 'Ajax/TrackerInline/export';
+$route['export_list'] = 'Ajax/TrackerInline/export';
 //$route['import_list']['post']         = 'Ajax/TrackerInline/import';
 
 $route['import_amr'] = 'Import_AMR';

Please login to merge, or discard this patch.

application/config/mimes.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -76,7 +76,7 @@
 block discarded – undo
 	'jpeg'	=>	array('image/jpeg', 'image/pjpeg'),
 	'jpg'	=>	array('image/jpeg', 'image/pjpeg'),
 	'jpe'	=>	array('image/jpeg', 'image/pjpeg'),
-	'png'	=>	array('image/png',  'image/x-png'),
+	'png'	=>	array('image/png', 'image/x-png'),
 	'tiff'	=>	'image/tiff',
 	'tif'	=>	'image/tiff',
 	'css'	=>	array('text/css', 'text/plain'),

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	/*
4	4	\| -------------------------------------------------------------------

Please login to merge, or discard this patch.

application/config/doctypes.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
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 $_doctypes = array(
 	'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

Please login to merge, or discard this patch.

application/config/smileys.php 2 patches

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

		@@ -17,48 +17,48 @@
		block discarded – undo
17	17
18	18	// smiley image name width height alt
19	19
20		- ':-)' => array('grin.gif', '19', '19', 'grin'),
21		- ':lol:' => array('lol.gif', '19', '19', 'LOL'),
22		- ':cheese:' => array('cheese.gif', '19', '19', 'cheese'),
23		- ':)' => array('smile.gif', '19', '19', 'smile'),
24		- ';-)' => array('wink.gif', '19', '19', 'wink'),
25		- ';)' => array('wink.gif', '19', '19', 'wink'),
26		- ':smirk:' => array('smirk.gif', '19', '19', 'smirk'),
27		- ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'),
28		- ':-S' => array('confused.gif', '19', '19', 'confused'),
29		- ':wow:' => array('surprise.gif', '19', '19', 'surprised'),
30		- ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'),
31		- ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'),
32		- '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'),
33		- ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'),
34		- ':P' => array('raspberry.gif', '19', '19', 'raspberry'),
35		- ':blank:' => array('blank.gif', '19', '19', 'blank stare'),
36		- ':long:' => array('longface.gif', '19', '19', 'long face'),
37		- ':ohh:' => array('ohh.gif', '19', '19', 'ohh'),
38		- ':grrr:' => array('grrr.gif', '19', '19', 'grrr'),
39		- ':gulp:' => array('gulp.gif', '19', '19', 'gulp'),
40		- '8-/' => array('ohoh.gif', '19', '19', 'oh oh'),
41		- ':down:' => array('downer.gif', '19', '19', 'downer'),
42		- ':red:' => array('embarrassed.gif', '19', '19', 'red face'),
43		- ':sick:' => array('sick.gif', '19', '19', 'sick'),
44		- ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'),
45		- ':-/' => array('hmm.gif', '19', '19', 'hmmm'),
46		- '>:(' => array('mad.gif', '19', '19', 'mad'),
47		- ':mad:' => array('mad.gif', '19', '19', 'mad'),
48		- '>:-(' => array('angry.gif', '19', '19', 'angry'),
49		- ':angry:' => array('angry.gif', '19', '19', 'angry'),
50		- ':zip:' => array('zip.gif', '19', '19', 'zipper'),
51		- ':kiss:' => array('kiss.gif', '19', '19', 'kiss'),
52		- ':ahhh:' => array('shock.gif', '19', '19', 'shock'),
53		- ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'),
54		- ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'),
55		- ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'),
56		- ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'),
57		- ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'),
58		- ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'),
59		- ':vampire:' => array('vampire.gif', '19', '19', 'vampire'),
60		- ':snake:' => array('snake.gif', '19', '19', 'snake'),
61		- ':exclaim:' => array('exclaim.gif', '19', '19', 'exclaim'),
62		- ':question:' => array('question.gif', '19', '19', 'question')
	20	+ ':-)' => array('grin.gif', '19', '19', 'grin'),
	21	+ ':lol:' => array('lol.gif', '19', '19', 'LOL'),
	22	+ ':cheese:' => array('cheese.gif', '19', '19', 'cheese'),
	23	+ ':)' => array('smile.gif', '19', '19', 'smile'),
	24	+ ';-)' => array('wink.gif', '19', '19', 'wink'),
	25	+ ';)' => array('wink.gif', '19', '19', 'wink'),
	26	+ ':smirk:' => array('smirk.gif', '19', '19', 'smirk'),
	27	+ ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'),
	28	+ ':-S' => array('confused.gif', '19', '19', 'confused'),
	29	+ ':wow:' => array('surprise.gif', '19', '19', 'surprised'),
	30	+ ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'),
	31	+ ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'),
	32	+ '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'),
	33	+ ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'),
	34	+ ':P' => array('raspberry.gif', '19', '19', 'raspberry'),
	35	+ ':blank:' => array('blank.gif', '19', '19', 'blank stare'),
	36	+ ':long:' => array('longface.gif', '19', '19', 'long face'),
	37	+ ':ohh:' => array('ohh.gif', '19', '19', 'ohh'),
	38	+ ':grrr:' => array('grrr.gif', '19', '19', 'grrr'),
	39	+ ':gulp:' => array('gulp.gif', '19', '19', 'gulp'),
	40	+ '8-/' => array('ohoh.gif', '19', '19', 'oh oh'),
	41	+ ':down:' => array('downer.gif', '19', '19', 'downer'),
	42	+ ':red:' => array('embarrassed.gif', '19', '19', 'red face'),
	43	+ ':sick:' => array('sick.gif', '19', '19', 'sick'),
	44	+ ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'),
	45	+ ':-/' => array('hmm.gif', '19', '19', 'hmmm'),
	46	+ '>:(' => array('mad.gif', '19', '19', 'mad'),
	47	+ ':mad:' => array('mad.gif', '19', '19', 'mad'),
	48	+ '>:-(' => array('angry.gif', '19', '19', 'angry'),
	49	+ ':angry:' => array('angry.gif', '19', '19', 'angry'),
	50	+ ':zip:' => array('zip.gif', '19', '19', 'zipper'),
	51	+ ':kiss:' => array('kiss.gif', '19', '19', 'kiss'),
	52	+ ':ahhh:' => array('shock.gif', '19', '19', 'shock'),
	53	+ ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'),
	54	+ ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'),
	55	+ ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'),
	56	+ ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'),
	57	+ ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'),
	58	+ ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'),
	59	+ ':vampire:' => array('vampire.gif', '19', '19', 'vampire'),
	60	+ ':snake:' => array('snake.gif', '19', '19', 'snake'),
	61	+ ':exclaim:' => array('exclaim.gif', '19', '19', 'exclaim'),
	62	+ ':question:' => array('question.gif', '19', '19', 'question')
63	63
64	64	);

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	\| -------------------------------------------------------------------

Please login to merge, or discard this patch.

application/libraries/MY_DB_cache.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -245,7 +245,7 @@
 block discarded – undo
 	}
 
 	/**
-	 * @param $md5
+	 * @param string $md5
 	 *
 	 * @return array
 	 */

Please login to merge, or discard this patch.

Upper-Lower-Casing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
  * @since        Version 1.0.0
  * @filesource
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * Database Cache Class
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
 		$last_key   = 0;
 		$last_value = 0;
 
-		foreach($this->CI->config->item('multi_level_cache_folders') AS $key => $value) {
+		foreach($this->CI->config->item('multi_level_cache_folders') as $key => $value) {
 			if($key != 0) {
 				$key = $last_key + $last_value;
 			}

Please login to merge, or discard this patch.

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -74,8 +74,8 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 
 		// 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();
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
 		// 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 . '/' . trim(implode('/', $layer), '/') . '/' . $uri_md5;
+			$filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(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 @@  discard block
 block discarded – undo
 		// 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 . '/' . trim(implode('/', $layer), '/') . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/';
 
 			if(!is_dir($dir_path)) {
 				$old = umask(0);
@@ -188,18 +188,18 @@  discard block
 block discarded – undo
 				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;
 	}
 
@@ -223,11 +223,11 @@  discard block
 block discarded – undo
 		}
 
 		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 . '/' . trim(implode('/', $layer), '/') . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(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);
 	}

Please login to merge, or discard this patch.

application/core/MY_Loader.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@
 block discarded – undo
 		// 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

Please login to merge, or discard this patch.

application/models/User_Options_Model.php 4 patches

Braces +10 added lines, -3 removed lines patch added patch discarded remove patch

@@ -137,7 +137,9 @@  discard block
 block discarded – undo
 				}
 
 				$success = $this->set_db($idData, $valueData);
-				if($success) $this->session->unset_tempdata("option_{$option}");
+				if($success) {
+					$this->session->unset_tempdata("option_{$option}");
+				}
 			} else {
 				$success = FALSE;
 			}
@@ -164,7 +166,9 @@  discard block
 block discarded – undo
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -215,7 +219,10 @@  discard block
 block discarded – undo
 				//This should never happen.
 				break;
 		}
-		if(!isset($value)) $value = FALSE; //FIXME: This won't play nice with BOOL type false?
+		if(!isset($value)) {
+			$value = FALSE;
+		}
+		//FIXME: This won't play nice with BOOL type false?
 
 		return $value;
 	}

Please login to merge, or discard this patch.

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -114,7 +114,7 @@
 block discarded – undo
 	 * @param string   $option
 	 * @param int|null $userID
 	 *
-	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
+	 * @return string Returns option value as STRING, or FALSE if option does not exist.
 	 */
 	public function get(string $option, ?int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);

Please login to merge, or discard this patch.

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -188,18 +188,18 @@
 block discarded – undo
 		//FIXME: Query duplication.
 		if($this->User->id !== $userID) {
 			$query = $this->db->select('value_str, value_int')
-			                  ->from('user_options')
-			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
-			                  ->limit(1);
+							  ->from('user_options')
+							  ->where('user_id', $userID)
+							  ->where('name',    $option)
+							  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
 			if(!($data = $this->session->tempdata("option_{$option}"))) {
 				$query = $this->db->select('value_str, value_int')
-				                  ->from('user_options')
-				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
-				                  ->limit(1);
+								  ->from('user_options')
+								  ->where('user_id', $userID)
+								  ->where('name',    $option)
+								  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
 			}

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -200,7 +200,7 @@  discard block
 block discarded – undo
 			$query = $this->db->select('value_str, value_int')
 			                  ->from('user_options')
 			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
+			                  ->where('name', $option)
 			                  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
 				$query = $this->db->select('value_str, value_int')
 				                  ->from('user_options')
 				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
+				                  ->where('name', $option)
 				                  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
 			);
 			//FIXME: Get a better solution than str_replace for removing special characters
 			$elements = array();
-			foreach (array_values($this->options[$option]['valid_options']) as $valid_option) {
+			foreach(array_values($this->options[$option]['valid_options']) as $valid_option) {
 				$elements[$option.'_'.str_replace(',', '_', $valid_option)] = array_merge($base_attributes, array(
 					'value' => $valid_option
 				));

Please login to merge, or discard this patch.

application/models/Tracker/Tracker_Tag_Model.php 2 patches

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -9,9 +9,9 @@
 block discarded – undo
 		$success = FALSE;
 		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) {
 			$success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL])
-			                           ->where('user_id', $userID)
-			                           ->where('id', $chapterID)
-			                           ->update('tracker_chapters');
+									   ->where('user_id', $userID)
+									   ->where('id', $chapterID)
+									   ->update('tracker_chapters');
 		}
 
 		if($success) {

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 declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
	1	+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
2	2
3	3	class Tracker_Tag_Model extends Tracker_Base_Model {
4	4	public function __construct() {

Please login to merge, or discard this patch.