DakuTree / manga-tracker

application/models/Tracker/Tracker_List_Model.php

Indentation +26 added lines, -26 removed lines

@@ -171,14 +171,14 @@ 
 			}
 
 			$idQuery = $this->db->select('id')
-			                    ->where('user_id', $userID)
-			                    ->where('title_id', $titleID)
-			                    ->get('tracker_chapters');
+								->where('user_id', $userID)
+								->where('title_id', $titleID)
+								->get('tracker_chapters');
 			if($idQuery->num_rows() > 0) {
 				$success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL, 'ignore_chapter' => NULL])
-				                           ->where('user_id', $userID)
-				                           ->where('title_id', $titleID)
-				                           ->update('tracker_chapters');
+										   ->where('user_id', $userID)
+										   ->where('title_id', $titleID)
+										   ->update('tracker_chapters');
 
 				if($success) {
 					$idQueryRow = $idQuery->row();
@@ -204,9 +204,9 @@ 
 	}
 	public function updateByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['current_chapter' => $chapter, '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) {
 			$this->History->userUpdateTitle($chapterID, $chapter);
@@ -216,9 +216,9 @@ 
 
 	public function ignoreByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['ignore_chapter' => $chapter, '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) {
 			$this->History->userIgnoreTitle($chapterID, $chapter);
@@ -231,9 +231,9 @@ 
 		//This is to allow user history to function properly.
 
 		$success = $this->db->set(['active' => 'N', 'last_updated' => NULL])
-		                    ->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->update('tracker_chapters');
+							->where('user_id', $userID)
+							->where('id', $chapterID)
+							->update('tracker_chapters');
 
 		return (bool) $success;
 	}
@@ -263,9 +263,9 @@ 
 		//TODO: OPTION, USE BACKEND MAL ID DB WHERE POSSIBLE (DEFAULT TRUE)
 
 		$queryC = $this->db->select('mal_id')
-		                   ->where('user_id', $userID)
-		                   ->where('title_id', $titleID)
-		                   ->get('tracker_chapters');
+						   ->where('user_id', $userID)
+						   ->where('title_id', $titleID)
+						   ->get('tracker_chapters');
 
 		if($queryC->num_rows() > 0 && ($rowC = $queryC->row())) {
 			$malIDArr = [
@@ -274,8 +274,8 @@ 
 			];
 		} else {
 			$queryT = $this->db->select('mal_id')
-			                   ->where('title_id', $titleID)
-			                   ->get('tracker_titles');
+							   ->where('title_id', $titleID)
+							   ->get('tracker_titles');
 
 			if($queryT->num_rows() > 0 && ($rowT = $queryT->row())) {
 				$malIDArr = [
@@ -289,9 +289,9 @@ 
 		//TODO: Remove after a few weeks!
 		if(is_null($malIDArr)) {
 			$queryC2 = $this->db->select('tags')
-			                  ->where('user_id', $userID)
-			                  ->where('title_id', $titleID)
-			                  ->get('tracker_chapters');
+							  ->where('user_id', $userID)
+							  ->where('title_id', $titleID)
+							  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
 				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
@@ -309,9 +309,9 @@ 
 	public function setMalID(int $userID, int $chapterID, ?int $malID) : bool {
 		//TODO: Handle NULL?
 		$success = (bool) $this->db->set(['mal_id' => $malID, '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) {
 			//MAL id update was successful, update history

application/controllers/AdminPanel.php

Indentation +12 added lines, -12 removed lines

@@ -44,12 +44,12 @@ 
 
 	private function _list_complete_titles() {
 		$query = $this->db->select('tracker_titles.id, tracker_sites.site_class, tracker_titles.title, tracker_titles.title_url')
-		                  ->from('tracker_chapters')
-		                  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->like('tracker_chapters.tags', 'complete')
-		                  ->where('tracker_titles.status', 0)
-		                  ->get();
+						  ->from('tracker_chapters')
+						  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->like('tracker_chapters.tags', 'complete')
+						  ->where('tracker_titles.status', 0)
+						  ->get();
 
 		$completeList = [];
 		if($query->num_rows() > 0) {
@@ -68,10 +68,10 @@ 
 
 	private function _update_mal_id() : void {
 		$query = $this->db->select('id, tags')
-		                  ->from('tracker_chapters')
-		                  ->where('tags REGEXP "[[:<:]]mal:([0-9]+|none)[[:>:]]"', NULL, FALSE)
-		                  ->where('mal_id', NULL)
-		                  ->get();
+						  ->from('tracker_chapters')
+						  ->where('tags REGEXP "[[:<:]]mal:([0-9]+|none)[[:>:]]"', NULL, FALSE)
+						  ->where('mal_id', NULL)
+						  ->get();
 
 
 		if($query->num_rows() > 0) {
@@ -83,8 +83,8 @@ 
 					$new_tags = implode(',', array_diff( explode(',', $row->tags), [$matches[0]]));
 
 					$this->db->set(['mal_id' => $malID, 'tags' => $new_tags, 'last_updated' => NULL])
-					         ->where('id', $row->id)
-					         ->update('tracker_chapters');
+							 ->where('id', $row->id)
+							 ->update('tracker_chapters');
 				}
 			}
 		}

application/controllers/Ajax/Userscript.php

Indentation +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 				];
 
 				$this->output
-				     ->set_status_header('200')
-				     ->set_content_type('application/json', 'utf-8')
-				     ->set_output(json_encode($json));
+					 ->set_status_header('200')
+					 ->set_content_type('application/json', 'utf-8')
+					 ->set_output(json_encode($json));
 			} else {
 				//TODO: We should probably try and have more verbose errors here. Return via JSON or something.
 				$this->output->set_status_header('400', 'Unable to update?');

application/models/Tracker/Tracker_Title_Model.php

Indentation +22 added lines, -22 removed lines

@@ -15,11 +15,11 @@ 
 	 */
 	public function getID(string $titleURL, int $siteID, bool $create = TRUE, bool $returnData = FALSE) {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title, tracker_titles.title_url, tracker_titles.latest_chapter, tracker_titles.status, tracker_sites.site_class, (tracker_titles.last_checked > DATE_SUB(NOW(), INTERVAL 3 DAY)) AS active', FALSE)
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.title_url', $titleURL)
-		                  ->where('tracker_titles.site_id', $siteID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.title_url', $titleURL)
+						  ->where('tracker_titles.site_id', $siteID)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$id = (int) $query->row('id');
@@ -32,8 +32,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $id)
-						         ->update('tracker_titles');
+								 ->where('id', $id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$query->row('title')} failed to update successfully");
@@ -73,9 +73,9 @@ 
 	 */
 	private function addTitle(string $titleURL, int $siteID) : int {
 		$query = $this->db->select('site, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('id', $siteID)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('id', $siteID)
+						  ->get();
 
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL, TRUE);
 
@@ -101,20 +101,20 @@ 
 	public function updateByID(int $titleID, string $latestChapter) : bool {
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
 		$query = $this->db->select('latest_chapter AS current_chapter')
-		                  ->from('tracker_titles')
-		                  ->where('id', $titleID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $titleID)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter, 'failed_checks' => 0]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		if($this->db->affected_rows() > 0) {
 			//Clear hidden latest chapter
 			$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
-			         ->where('title_id', $titleID)
-			         ->update('tracker_chapters');
+					 ->where('title_id', $titleID)
+					 ->update('tracker_chapters');
 		}
 
 		//Update History
@@ -127,8 +127,8 @@ 
 
 	public function updateFailedChecksByID(int $titleID) : bool {
 		$success = $this->db->set('failed_checks', 'failed_checks + 1', FALSE)
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		return $success;
 	}
@@ -140,9 +140,9 @@ 
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		return $query->row();
 	}

application/models/Tracker/Tracker_Favourites_Model.php

Indentation +10 added lines, -10 removed lines

@@ -71,32 +71,32 @@
 
 			////We need the series to be tracked
 			$idCQuery = $this->db->select('id')
-			                     ->where('user_id', $userID)
-			                     ->where('title_id', $titleID)
-			                     ->get('tracker_chapters');
+								 ->where('user_id', $userID)
+								 ->where('title_id', $titleID)
+								 ->get('tracker_chapters');
 			if(!($idCQuery->num_rows() > 0)) {
 				//NOTE: This pretty much repeats a lot of what we already did above. Is there a better way to do this?
 				$this->Tracker->list->update($userID, $site, $title, $chapter, FALSE);
 
 				$idCQuery = $this->db->select('id')
-				                     ->where('user_id', $userID)
-				                     ->where('title_id', $titleID)
-				                     ->get('tracker_chapters');
+									 ->where('user_id', $userID)
+									 ->where('title_id', $titleID)
+									 ->get('tracker_chapters');
 			}
 			if($idCQuery->num_rows() > 0) {
 				$idCQueryRow = $idCQuery->row();
 
 				//Check if it is already favourited
 				$idFQuery = $this->db->select('id')
-				                     ->where('chapter_id', $idCQueryRow->id)
-				                     ->where('chapter', $chapter)
-				                     ->get('tracker_favourites');
+									 ->where('chapter_id', $idCQueryRow->id)
+									 ->where('chapter', $chapter)
+									 ->get('tracker_favourites');
 				if($idFQuery->num_rows() > 0) {
 					//Chapter is already favourited, so remove it from DB
 					$idFQueryRow = $idFQuery->row();
 
 					$isSuccess = (bool) $this->db->where('id', $idFQueryRow->id)
-					                             ->delete('tracker_favourites');
+												 ->delete('tracker_favourites');
 
 					if($isSuccess) {
 						$success = array(

application/models/Tracker/Tracker_Admin_Model.php

Indentation +23 added lines, -23 removed lines

@@ -74,8 +74,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateByID?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->title_id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->title_id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					} else {
@@ -152,8 +152,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateByID?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->title_id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->title_id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					} else {
@@ -177,10 +177,10 @@ 
 	 */
 	public function updateCustom() {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('status', 'enabled')
-		                  ->where('tracker_sites.use_custom', 'Y')
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('status', 'enabled')
+						  ->where('tracker_sites.use_custom', 'Y')
+						  ->get();
 
 		$sites = $query->result_array();
 		foreach ($sites as $site) {
@@ -196,8 +196,8 @@ 
 									//Make sure last_checked is always updated on successful run.
 									//CHECK: Is there a reason we aren't just doing this in updateByID?
 									$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-									         ->where('id', $titleID)
-									         ->update('tracker_titles');
+											 ->where('id', $titleID)
+											 ->update('tracker_titles');
 
 									print " - ({$titleData['latest_chapter']})\n";
 								} else {
@@ -224,13 +224,13 @@ 
 
 	public function refollowCustom() {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class')
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.followed','N')
-		                  ->where('tracker_titles !=', '255')
-		                  ->where('tracker_sites.status', 'enabled')
-		                  ->where('tracker_sites.use_custom', 'Y')
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.followed','N')
+						  ->where('tracker_titles !=', '255')
+						  ->where('tracker_sites.status', 'enabled')
+						  ->where('tracker_sites.use_custom', 'Y')
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			foreach($query->result() as $row) {
@@ -241,8 +241,8 @@ 
 
 					if(!empty($titleData)) {
 						$this->db->set($titleData)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print "> {$row->site_class}:{$row->id}:{$row->title_url} FOLLOWED\n";
 					} else {
@@ -290,8 +290,8 @@ 
 				if($titleData['title'] && is_array($titleData) && !is_null($titleData['latest_chapter'])) {
 					if($titleData['title'] !== $row->title) {
 						$this->db->set('title', $titleData['title'])
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 						//TODO: Add to history somehow?
 						print " - NEW TITLE ({$titleData['title']})\n";
 					} else {
@@ -301,8 +301,8 @@ 
 					//We might as well try to update as well.
 					if($this->Tracker->title->updateByID((int) $row->id, $titleData['latest_chapter'])) {
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$row->title} failed to update title successfully");

application/third_party/Codeigniter-Recaptcha/libraries/Recaptcha.php

Indentation +2 added lines, -2 removed lines

@@ -21,11 +21,11 @@
 		$this->ci->load->config('recaptcha', TRUE);
 		if ($this->ci->config->item('recaptcha_secretkey', 'recaptcha') == NULL || $this->ci->config->item('recaptcha_secretkey', 'recaptcha') == "") {
 			die("To use reCAPTCHA you must get an API key from <a href='"
-			    . $this->signup_url . "'>" . $this->signup_url . "</a>");
+				. $this->signup_url . "'>" . $this->signup_url . "</a>");
 		}
 		if ($this->ci->config->item('recaptcha_sitekey', 'recaptcha') == NULL || $this->ci->config->item('recaptcha_sitekey', 'recaptcha') == "") {
 			die("To use reCAPTCHA you must get an API key from <a href='"
-			    . $this->signup_url . "'>" . $this->signup_url . "</a>");
+				. $this->signup_url . "'>" . $this->signup_url . "</a>");
 		}
 		$this->_secret = $this->ci->config->item('recaptcha_secretkey', 'recaptcha');
 		$this->_sitekey = $this->ci->config->item('recaptcha_sitekey', 'recaptcha');

application/third_party/Limiter/libraries/Limiter.php

Indentation +219 added lines, -219 removed lines

@@ -12,223 +12,223 @@
 
 class Limiter {
 
-    /** @type CI_Controller */
-    protected $CI;
-    protected $table      = 'rate_limit';
-    protected $base_limit = 0; // infinite
-    protected $whitelist  = array('127.0.0.1');
-    protected $header_show        = TRUE;
-    protected $checksum_algorithm = 'md4';
-    protected $header_prefix      = 'X-RateLimit-';
-    protected $flush_on_abort     = FALSE;
-
-    protected $user_data = array();
-    protected $user_hash = FALSE;
-
-    private $_truncated  = FALSE;
-    private $_info_cache = array();
-
-    private $_sql_truncate  = 'DELETE FROM `RATE_TABLE` WHERE `start` < (NOW() - INTERVAL 1 HOUR)';
-    private $_sql_info      = 'SELECT `count`, `start`, (`start` + INTERVAL (1 - TIMESTAMPDIFF(HOUR, UTC_TIMESTAMP(), NOW())) HOUR) \'reset_epoch\' FROM `RATE_TABLE` WHERE `client` = ? AND `target` = ?';
-    private $_sql_update    = 'INSERT INTO `RATE_TABLE` (`client`, `target`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `count` = `count` + 1';
-    private $_config_fields = array(
-        'table', 'base_limit', 'checksum_algorithm',
-        'header', 'header_prefix', 'flush_on_abort'
-    );
-
-    public function __construct($config = array()) {
-        $this->CI = &get_instance();
-
-        if(!is_array($config)) {
-            $config = array();
-        }
-
-        foreach($this->_config_fields as $field) {
-            if(array_key_exists($field, $config)) {
-                $this->{$field} = $config[$field];
-            }
-        }
-
-        $sql = array('truncate', 'info', 'update');
-        foreach($sql as $s) {
-            $this->{"_sql_$s"} = str_replace('RATE_TABLE', $this->table, $this->{"_sql_$s"});
-        }
-
-        $this->add_user_data($this->CI->input->ip_address());
-
-        log_message('debug', 'Limiter Class Initialized');
-    }
-
-    /**
-     * Rate limits the amount of requests that can be sent by a client.
-     *
-     * @param string $target
-     * @param int $req_per_hour Overrides base_limit setting if set
-     * @param bool $flush_on_abort Overrides flush_on_abort setting if set
-     * @param bool $show_header Overrides header_show setting if set
-     * @return bool Should request be aborted
-     */
-    public function limit($target = '_global', $req_per_hour = null, $flush_on_abort = null, $show_header = null) {
-        $req_per_hour   = $req_per_hour !== null ? $req_per_hour : $this->base_limit;
-        $flush_on_abort = $flush_on_abort !== null ? $flush_on_abort : $this->flush_on_abort;
-        $show_header    = $show_header !== null ? $show_header : $this->header_show;
-
-        $truncated = $this->_truncate();
-        if(!$truncated) {
-            log_message('DEBUG', 'WARN: Could not truncate rate limit table');
-        }
-
-        if($this->is_whitelisted()) {
-            $req_per_hour = 0;
-        }
-
-        $abort = FALSE;
-        if($req_per_hour > 0) {
-            $info = $this->get_limit_info($target);
-
-            if($info === FALSE) {
-                $info              = new stdClass();
-                $info->count       = 0;
-                $info->reset_epoch = gmdate('d M Y H:i:s', time() + (60 * 60));
-                $info->start       = date('d M Y H:i:s');
-            }
-
-            if($req_per_hour - $info->count > 0) {
-                $data = array('client' => $this->get_hash(), 'target' => $target);
-                $this->CI->db->query($this->_sql_update, $data);
-                $info->count++;
-            } else {
-                $abort = TRUE;
-            }
-
-            if($show_header === TRUE) {
-                $headers = array(
-                    'Limit' => $req_per_hour,
-                    'Remaining' => $req_per_hour - $info->count,
-                    'Reset' => strtotime($info->reset_epoch),
-                );
-
-                foreach(array_keys($headers) as $h) {
-                    $this->CI->output->set_header("$this->header_prefix$h: $headers[$h]");
-                }
-            }
-
-            $this->_info_cache[$target] = $info;
-
-
-            if($abort) {
-                $retry_seconds = strtotime($info->reset_epoch) - strtotime(gmdate('d M Y H:i:s'));
-                $this->CI->output->set_header("Retry-After: $retry_seconds");
-                $this->CI->output->set_status_header(503, 'Rate limit reached');
-
-                if($flush_on_abort) {
-                    $this->CI->output->_display();
-                    exit;
-                }
-            }
-        }
-
-        return $abort;
-    }
-
-    /**
-     * Forget the client ever visited $target.
-     *
-     * @param string $target
-     */
-    public function reset_rate($target = '_global') {
-        $this->CI->db->delete($this->table, array(
-            'client' => $this->get_hash(),
-            'target' => $target
-        ));
-    }
-
-    /**
-     * Forgets all rate limits attached to the client.
-     */
-    public function forget_client() {
-        $this->CI->db->delete($this->table, array('client' => $this->get_hash()));
-    }
-
-    /**
-     * Used to obtain the client hash.
-     *
-     * Returns false if hash generation failed
-     * @return string
-     */
-    public function get_hash() {
-        if($this->user_hash === FALSE) {
-            $this->user_hash = $this->_generate_hash();
-        }
-        return $this->user_hash;
-    }
-
-    /**
-     * Adds entropy to the client hash. Make
-     * sure that this is some sort of static
-     * data such as a username/id.
-     *
-     * @param string $data Any seeding data
-     */
-    public function add_user_data($data) {
-        array_push($this->user_data, (string) $data);
-
-        if(count($this->_info_cache) !== 0) {
-            log_message('DEBUG', 'WARN: Emptying info cache due to user data changing');
-            $this->_info_cache = array(); // Empty cache
-        }
-
-        if($this->user_hash !== FALSE) {
-            log_message('DEBUG', 'WARN: Adding user data after hash was generated');
-            $this->user_hash = $this->_generate_hash();
-        }
-    }
-
-    /**
-     * Get target rate info
-     *
-     * @param string $target
-     * @return stdClass|false Info object, returns false if no info is present
-     */
-    public function get_limit_info($target = '_global') {
-        if(!array_key_exists($target, $this->_info_cache)) {
-            $data = array('client' => $this->get_hash(), 'target' => $target);
-            $info = $this->CI->db->query($this->_sql_info, $data)->row();
-
-            $this->_info_cache[$target] = $info;
-        } else {
-            $info = $this->_info_cache[$target];
-        }
-
-        $valid_data = isset($info->count);
-        return $valid_data ? $info : FALSE;
-    }
-
-    /**
-     * @param $target
-     * @return integer Amount of attempts
-     */
-    public function get_attempts($target) {
-        return $this->get_limit_info($target)->count;
-    }
-
-    /**
-     * @param null $ip If null current IP
-     * @return bool Is whitelisted
-     */
-    public function is_whitelisted($ip = null) {
-        $ip = $ip ?:  $this->CI->input->ip_address();
-        return in_array($ip, $this->whitelist);
-    }
-
-    private function _truncate() {
-        if(!$this->_truncated) {
-            $this->_truncated = $this->CI->db->query($this->_sql_truncate);
-        }
-        return $this->_truncated;
-    }
-
-    private function _generate_hash() {
-        return hash($this->checksum_algorithm, join('%', $this->user_data));
-    }
+	/** @type CI_Controller */
+	protected $CI;
+	protected $table      = 'rate_limit';
+	protected $base_limit = 0; // infinite
+	protected $whitelist  = array('127.0.0.1');
+	protected $header_show        = TRUE;
+	protected $checksum_algorithm = 'md4';
+	protected $header_prefix      = 'X-RateLimit-';
+	protected $flush_on_abort     = FALSE;
+
+	protected $user_data = array();
+	protected $user_hash = FALSE;
+
+	private $_truncated  = FALSE;
+	private $_info_cache = array();
+
+	private $_sql_truncate  = 'DELETE FROM `RATE_TABLE` WHERE `start` < (NOW() - INTERVAL 1 HOUR)';
+	private $_sql_info      = 'SELECT `count`, `start`, (`start` + INTERVAL (1 - TIMESTAMPDIFF(HOUR, UTC_TIMESTAMP(), NOW())) HOUR) \'reset_epoch\' FROM `RATE_TABLE` WHERE `client` = ? AND `target` = ?';
+	private $_sql_update    = 'INSERT INTO `RATE_TABLE` (`client`, `target`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `count` = `count` + 1';
+	private $_config_fields = array(
+		'table', 'base_limit', 'checksum_algorithm',
+		'header', 'header_prefix', 'flush_on_abort'
+	);
+
+	public function __construct($config = array()) {
+		$this->CI = &get_instance();
+
+		if(!is_array($config)) {
+			$config = array();
+		}
+
+		foreach($this->_config_fields as $field) {
+			if(array_key_exists($field, $config)) {
+				$this->{$field} = $config[$field];
+			}
+		}
+
+		$sql = array('truncate', 'info', 'update');
+		foreach($sql as $s) {
+			$this->{"_sql_$s"} = str_replace('RATE_TABLE', $this->table, $this->{"_sql_$s"});
+		}
+
+		$this->add_user_data($this->CI->input->ip_address());
+
+		log_message('debug', 'Limiter Class Initialized');
+	}
+
+	/**
+	 * Rate limits the amount of requests that can be sent by a client.
+	 *
+	 * @param string $target
+	 * @param int $req_per_hour Overrides base_limit setting if set
+	 * @param bool $flush_on_abort Overrides flush_on_abort setting if set
+	 * @param bool $show_header Overrides header_show setting if set
+	 * @return bool Should request be aborted
+	 */
+	public function limit($target = '_global', $req_per_hour = null, $flush_on_abort = null, $show_header = null) {
+		$req_per_hour   = $req_per_hour !== null ? $req_per_hour : $this->base_limit;
+		$flush_on_abort = $flush_on_abort !== null ? $flush_on_abort : $this->flush_on_abort;
+		$show_header    = $show_header !== null ? $show_header : $this->header_show;
+
+		$truncated = $this->_truncate();
+		if(!$truncated) {
+			log_message('DEBUG', 'WARN: Could not truncate rate limit table');
+		}
+
+		if($this->is_whitelisted()) {
+			$req_per_hour = 0;
+		}
+
+		$abort = FALSE;
+		if($req_per_hour > 0) {
+			$info = $this->get_limit_info($target);
+
+			if($info === FALSE) {
+				$info              = new stdClass();
+				$info->count       = 0;
+				$info->reset_epoch = gmdate('d M Y H:i:s', time() + (60 * 60));
+				$info->start       = date('d M Y H:i:s');
+			}
+
+			if($req_per_hour - $info->count > 0) {
+				$data = array('client' => $this->get_hash(), 'target' => $target);
+				$this->CI->db->query($this->_sql_update, $data);
+				$info->count++;
+			} else {
+				$abort = TRUE;
+			}
+
+			if($show_header === TRUE) {
+				$headers = array(
+					'Limit' => $req_per_hour,
+					'Remaining' => $req_per_hour - $info->count,
+					'Reset' => strtotime($info->reset_epoch),
+				);
+
+				foreach(array_keys($headers) as $h) {
+					$this->CI->output->set_header("$this->header_prefix$h: $headers[$h]");
+				}
+			}
+
+			$this->_info_cache[$target] = $info;
+
+
+			if($abort) {
+				$retry_seconds = strtotime($info->reset_epoch) - strtotime(gmdate('d M Y H:i:s'));
+				$this->CI->output->set_header("Retry-After: $retry_seconds");
+				$this->CI->output->set_status_header(503, 'Rate limit reached');
+
+				if($flush_on_abort) {
+					$this->CI->output->_display();
+					exit;
+				}
+			}
+		}
+
+		return $abort;
+	}
+
+	/**
+	 * Forget the client ever visited $target.
+	 *
+	 * @param string $target
+	 */
+	public function reset_rate($target = '_global') {
+		$this->CI->db->delete($this->table, array(
+			'client' => $this->get_hash(),
+			'target' => $target
+		));
+	}
+
+	/**
+	 * Forgets all rate limits attached to the client.
+	 */
+	public function forget_client() {
+		$this->CI->db->delete($this->table, array('client' => $this->get_hash()));
+	}
+
+	/**
+	 * Used to obtain the client hash.
+	 *
+	 * Returns false if hash generation failed
+	 * @return string
+	 */
+	public function get_hash() {
+		if($this->user_hash === FALSE) {
+			$this->user_hash = $this->_generate_hash();
+		}
+		return $this->user_hash;
+	}
+
+	/**
+	 * Adds entropy to the client hash. Make
+	 * sure that this is some sort of static
+	 * data such as a username/id.
+	 *
+	 * @param string $data Any seeding data
+	 */
+	public function add_user_data($data) {
+		array_push($this->user_data, (string) $data);
+
+		if(count($this->_info_cache) !== 0) {
+			log_message('DEBUG', 'WARN: Emptying info cache due to user data changing');
+			$this->_info_cache = array(); // Empty cache
+		}
+
+		if($this->user_hash !== FALSE) {
+			log_message('DEBUG', 'WARN: Adding user data after hash was generated');
+			$this->user_hash = $this->_generate_hash();
+		}
+	}
+
+	/**
+	 * Get target rate info
+	 *
+	 * @param string $target
+	 * @return stdClass|false Info object, returns false if no info is present
+	 */
+	public function get_limit_info($target = '_global') {
+		if(!array_key_exists($target, $this->_info_cache)) {
+			$data = array('client' => $this->get_hash(), 'target' => $target);
+			$info = $this->CI->db->query($this->_sql_info, $data)->row();
+
+			$this->_info_cache[$target] = $info;
+		} else {
+			$info = $this->_info_cache[$target];
+		}
+
+		$valid_data = isset($info->count);
+		return $valid_data ? $info : FALSE;
+	}
+
+	/**
+	 * @param $target
+	 * @return integer Amount of attempts
+	 */
+	public function get_attempts($target) {
+		return $this->get_limit_info($target)->count;
+	}
+
+	/**
+	 * @param null $ip If null current IP
+	 * @return bool Is whitelisted
+	 */
+	public function is_whitelisted($ip = null) {
+		$ip = $ip ?:  $this->CI->input->ip_address();
+		return in_array($ip, $this->whitelist);
+	}
+
+	private function _truncate() {
+		if(!$this->_truncated) {
+			$this->_truncated = $this->CI->db->query($this->_sql_truncate);
+		}
+		return $this->_truncated;
+	}
+
+	private function _generate_hash() {
+		return hash($this->checksum_algorithm, join('%', $this->user_data));
+	}
 }

application/third_party/Ion-Auth/language/zh_tw/ion_auth_lang.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if (! defined('BASEPATH')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 /**