Skip to content

Commit 74a280a

Browse files
committed
Minor style guide fixes
1 parent 95fd1b0 commit 74a280a

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

application/libraries/Format.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,5 +521,4 @@ protected function _from_php($data)
521521
{
522522
return trim($data);
523523
}
524-
525524
}

application/libraries/REST_Controller.php

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,6 @@ public function __destruct()
589589
/**
590590
* Checks to see if we have everything we need to run this library.
591591
*
592-
* @author Chris Kacerguis
593592
* @access protected
594593
* @return Exception
595594
*/
@@ -615,8 +614,8 @@ protected function preflight_checks()
615614
* Controller method
616615
*
617616
* @access public
618-
* @param string $object_called
619-
* @param array $arguments The arguments passed to the controller method
617+
* @param string $object_called
618+
* @param array $arguments The arguments passed to the controller method
620619
*/
621620
public function _remap($object_called, $arguments = [])
622621
{
@@ -669,7 +668,7 @@ public function _remap($object_called, $arguments = [])
669668
}
670669

671670
// Sure it exists, but can they do anything with it?
672-
if (!method_exists($this, $controller_method))
671+
if (! method_exists($this, $controller_method))
673672
{
674673
$this->response([
675674
$this->config->item('rest_status_field_name') => FALSE,
@@ -1118,7 +1117,7 @@ protected function _log_request($authorized = FALSE)
11181117
* Check if the requests to a controller method exceed a limit
11191118
*
11201119
* @access protected
1121-
* @param string $controller_method The method being called
1120+
* @param string $controller_method The method being called
11221121
* @return bool TRUE the call limit is below the threshold; otherwise, FALSE
11231122
*/
11241123
protected function _check_limit($controller_method)
@@ -1694,8 +1693,8 @@ public function query($key = NULL, $xss_clean = NULL)
16941693
* prevented
16951694
*
16961695
* @access protected
1697-
* @param string $value Input data
1698-
* @param bool $xss_clean Whether to apply XSS filtering
1696+
* @param string $value Input data
1697+
* @param bool $xss_clean Whether to apply XSS filtering
16991698
* @return string
17001699
*/
17011700
protected function _xss_clean($value, $xss_clean)
@@ -1724,8 +1723,8 @@ public function validation_errors()
17241723
* Perform LDAP Authentication
17251724
*
17261725
* @access protected
1727-
* @param string $username The username to validate
1728-
* @param string $password The password to validate
1726+
* @param string $username The username to validate
1727+
* @param string $password The password to validate
17291728
* @return bool
17301729
*/
17311730
protected function _perform_ldap_auth($username = '', $password = NULL)
@@ -1819,8 +1818,8 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
18191818
* Perform Library Authentication - Override this function to change the way the library is called
18201819
*
18211820
* @access protected
1822-
* @param string $username The username to validate
1823-
* @param string $password The password to validate
1821+
* @param string $username The username to validate
1822+
* @param string $password The password to validate
18241823
* @return bool
18251824
*/
18261825
protected function _perform_library_auth($username = '', $password = NULL)
@@ -1858,8 +1857,8 @@ protected function _perform_library_auth($username = '', $password = NULL)
18581857
* Check if the user is logged in
18591858
*
18601859
* @access protected
1861-
* @param string $username The user's name
1862-
* @param bool|string $password The user's password
1860+
* @param string $username The user's name
1861+
* @param bool|string $password The user's password
18631862
* @return bool
18641863
*/
18651864
protected function _check_login($username = NULL, $password = FALSE)
@@ -2162,12 +2161,12 @@ protected function _check_access()
21622161
{
21632162
return TRUE;
21642163
}
2165-
2164+
21662165
//check if the key has all_access
21672166
$accessRow = $this->rest->db
21682167
->where('key', $this->rest->key)
21692168
->get($this->config->item('rest_access_table'))->row_array();
2170-
2169+
21712170
if (!empty($accessRow) && !empty($accessRow['all_access']))
21722171
{
21732172
return TRUE;
@@ -2235,5 +2234,4 @@ protected function _check_cors()
22352234
exit;
22362235
}
22372236
}
2238-
22392237
}

0 commit comments

Comments
 (0)