Merge pull request #41 from nguyenanhung/v3.2.0-develop

V3.2.0 develop

Author: hungnguyenhp

hungng/HungNG_Custom_Based_model.php

@@ -224,8 +224,10 @@ public function getTableName()
 		 */
 		public function bindDBPrefix($table)
 		{
-			if (strpos($table, $this->db->dbprefix)) {
-				return $table;
+			if (!empty($this->db->dbprefix)) {
+				if (strpos($table, $this->db->dbprefix)) {
+					return $table;
+				}
 			}
 
 			return $this->db->dbprefix($table);

thirdParty/REST/Format.php

@@ -383,7 +383,7 @@ public function to_json($data = null)
 		if (empty($callback) === true) {
 			return json_encode($data, JSON_UNESCAPED_UNICODE);
 		} // We only honour a jsonp callback which are valid javascript identifiers
-		elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback)) {
+		if (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback)) {
 			// Return the data as encoded json with a callback
 			return $callback . '(' . json_encode($data, JSON_UNESCAPED_UNICODE) . ');';
 		}

thirdParty/REST/Request.php

@@ -96,7 +96,7 @@ public function getBodyParams()
 
 			$contentType = $this->getContentType();
 
-			if (strcasecmp($contentType, 'application/json') == 0) {
+			if (strcasecmp($contentType, 'application/json') === 0) {
 				// JSON content type
 				$this->_bodyParams = json_decode($this->getRawBody(), true);
 			} elseif ($this->getMethod() === 'POST') {
@@ -131,7 +131,7 @@ public function input()
 	 */
 	public function getAuthCredentialsWithBasic()
 	{
-		if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+		if (isset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
 
 			return [$_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']];
 		}
@@ -166,12 +166,9 @@ public function getAuthCredentialsWithBearer()
 	{
 		$b64token = null;
 
-		if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
+		if (isset($_SERVER['HTTP_AUTHORIZATION']) && strpos(bear_str_to_lower($_SERVER['HTTP_AUTHORIZATION']), 'bearer ') === 0) {
 
-			if (strpos(bear_str_to_lower($_SERVER['HTTP_AUTHORIZATION']), 'bearer ') === 0) {
-
-				$b64token = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
-			}
+			$b64token = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
 		}
 
 		return $b64token;

thirdParty/REST/Response.php

@@ -87,7 +87,7 @@ public function __construct()
 	/**
 	 * Set Response Format into CI_Output
 	 *
-	 * @param string Response format
+	 * @param string $format Response format
 	 */
 	public function setFormat($format)
 	{
@@ -105,7 +105,7 @@ public function setFormat($format)
 	 *
 	 * @todo    Format data before send
 	 *
-	 * @param mixed Response data
+	 * @param mixed $data Response data
 	 *
 	 * @return object self
 	 */
@@ -189,10 +189,10 @@ public function send()
 	}
 
 	/**
-	 * Common format funciton by format types. {FORMAT}Format()
+	 * Common format function by format types. {FORMAT}Format()
 	 *
-	 * @param array  Pre-handle array data
-	 * @param string Format
+	 * @param array  $data Pre-handle array data
+	 * @param string $format Format
 	 *
 	 * @return string Formatted data by specified formatter
 	 */
@@ -207,16 +207,16 @@ public function format($data, $format)
 			$data = $this->{$formatFunc}($data);
 		} elseif (is_array($data)) {
 			// Use JSON while the Formatter not found and the data is array
-			$data = $this->formatJson($data);
+			$data = self::formatJson($data);
 		}
 
 		return $data;
 	}
 
 	/**
-	 * Common format funciton by format types. {FORMAT}Format()
+	 * Common format function by format types. {FORMAT}Format()
 	 *
-	 * @param array Pre-handle array data
+	 * @param array $data Pre-handle array data
 	 *
 	 * @return string Formatted data
 	 */
@@ -228,10 +228,10 @@ public static function formatJson($data)
 	/**
 	 * JSON output shortcut
 	 *
-	 * @param array|mixed Callback data body, false will remove body key
-	 * @param int Callback status code
+	 * @param array|mixed $data Callback data body, false will remove body key
+	 * @param int $statusCode Callback status code
 	 *
-	 * @return string Response body data
+	 * @return string|void Response body data
 	 * @throws \Exception
 	 */
 	public function json($data, $statusCode = null)
@@ -241,7 +241,7 @@ public function json($data, $statusCode = null)
 			$this->setStatusCode($statusCode);
 		}
 
-		$this->setFormat(Response::FORMAT_JSON);
+		$this->setFormat(self::FORMAT_JSON);
 
 		if (!is_null($data)) {
 			$this->setData($data);