Style cleanup

diff --git a/engine/lib/access.php b/engine/lib/access.php
index e8b3b0d529a2342f31e20a0331d8ac8a42b58e46..3b2b7aeaa24a1ac6544549a13ba927bfc17c3511 100644 (file)
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -88,11 +88,7 @@ function get_access_array($user_id = 0, $site_id = 0, $flush = false) {
 
        // @todo everything from the db is cached.
        // this cache might be redundant. But db cache is flushed on every db write.
-       static $access_array;
-
-       if (!isset($access_array)) {
-               $access_array = array();
-       }
+       static $access_array = array();
 
        if ($user_id == 0) {
                $user_id = elgg_get_logged_in_user_guid();
@@ -476,7 +472,7 @@ function can_edit_access_collection($collection_id, $user_guid = null) {
                return false;
        }
 
-       $write_access = get_write_access_array($user->getGUID(), null, true);
+       $write_access = get_write_access_array($user->getGUID(), 0, true);
 
        // don't ignore access when checking users.
        if ($user_guid) {
@@ -560,8 +556,6 @@ function create_access_collection($name, $owner_guid = 0, $site_guid = 0) {
  * @see remove_user_from_access_collection()
  */
 function update_access_collection($collection_id, $members) {
-       global $CONFIG;
-
        $acl = get_access_collection($collection_id);
 
        if (!$acl) {
@@ -1018,6 +1012,7 @@ function elgg_override_permissions($hook, $type, $value, $params) {
  */
 function access_test($hook, $type, $value, $params) {
        global $CONFIG;
+
        $value[] = $CONFIG->path . 'engine/tests/api/access_collections.php';
        return $value;
 }

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 85610f0c2dca2198a11bb52b948757c3d9005686..974f38aadf12676d4abc29e078225d995002abe2 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -671,7 +671,7 @@ function elgg_register_event_handler($event, $object_type, $callback, $priority
        global $CONFIG;
 
        if (empty($event) || empty($object_type)) {
-               return FALSE;
+               return false;
        }
 
        if (!isset($CONFIG->events)) {
@@ -685,7 +685,7 @@ function elgg_register_event_handler($event, $object_type, $callback, $priority
        }
 
        if (!is_callable($callback, true)) {
-               return FALSE;
+               return false;
        }
 
        $priority = max((int) $priority, 0);
@@ -695,7 +695,7 @@ function elgg_register_event_handler($event, $object_type, $callback, $priority
        }
        $CONFIG->events[$event][$object_type][$priority] = $callback;
        ksort($CONFIG->events[$event][$object_type]);
-       return TRUE;
+       return true;
 }
 
 /**
@@ -770,14 +770,14 @@ function elgg_trigger_event($event, $object_type, $object = null) {
        foreach ($events as $callback_list) {
                if (is_array($callback_list)) {
                        foreach ($callback_list as $callback) {
-                               if (is_callable($callback) && (call_user_func_array($callback, $args) === FALSE)) {
-                                       return FALSE;
+                               if (is_callable($callback) && (call_user_func_array($callback, $args) === false)) {
+                                       return false;
                                }
                        }
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 /**
@@ -850,7 +850,7 @@ function elgg_register_plugin_hook_handler($hook, $type, $callback, $priority =
        global $CONFIG;
 
        if (empty($hook) || empty($type)) {
-               return FALSE;
+               return false;
        }
 
        if (!isset($CONFIG->hooks)) {
@@ -864,7 +864,7 @@ function elgg_register_plugin_hook_handler($hook, $type, $callback, $priority =
        }
 
        if (!is_callable($callback, true)) {
-               return FALSE;
+               return false;
        }
 
        $priority = max((int) $priority, 0);
@@ -874,7 +874,7 @@ function elgg_register_plugin_hook_handler($hook, $type, $callback, $priority =
        }
        $CONFIG->hooks[$hook][$type][$priority] = $callback;
        ksort($CONFIG->hooks[$hook][$type]);
-       return TRUE;
+       return true;
 }
 
 /**

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 5a5906b1f32548a2de0ced5bb0b5ee00fea45837..a14160e14c18bb73371d448867829be28d0111e0 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1838,7 +1838,7 @@ function oddentity_to_elggentity(ODDEntity $element) {
 function import_entity_plugin_hook($hook, $entity_type, $returnvalue, $params) {
        $element = $params['element'];
 
-       $tmp = NULL;
+       $tmp = null;
 
        if ($element instanceof ODDEntity) {
                $tmp = oddentity_to_elggentity($element);

diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index 636b711ea165c564f47f440ac44d00eae675a3ce..538f601e1f2cdbc933434b4887c18e8874e4830e 100644 (file)
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -141,9 +141,10 @@ function can_edit_extender($extender_id, $type, $user_guid = 0) {
                return false;
        }
 
-       if (!is_a($extender, "ElggExtender")) {
+       if (!($extender instanceof ElggExtender)) {
                return false;
        }
+       /* @var ElggExtender $extender */
 
        // If the owner is the specified user, great! They can edit.
        if ($extender->getOwnerGUID() == $user->getGUID()) {

diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index a53506812f6587a8d57ad0170c33ae9422ff2daa..0cf99b6fe8548bb20b70f37dc8d54150be0fbe3d 100644 (file)
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -83,6 +83,7 @@ function page_handler($handler, $page) {
  */
 function elgg_register_page_handler($handler, $function) {
        global $CONFIG;
+
        if (!isset($CONFIG->pagehandler)) {
                $CONFIG->pagehandler = array();
        }

diff --git a/engine/lib/views.php b/engine/lib/views.php
index e43c29cb2e7b9021b2e98e0f2945a01967d845be..8a0642c2b8eafa5e094d090a941ca65bc5bcc669 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1403,6 +1403,7 @@ function elgg_view_access_collections($owner_guid) {
  */
 function set_template_handler($function_name) {
        global $CONFIG;
+
        if (is_callable($function_name)) {
                $CONFIG->template_handler = $function_name;
                return true;

diff --git a/engine/lib/web_services.php b/engine/lib/web_services.php
index 39fb0dc4451ab49df2728700e37261230311a76f..c8e4a13cc1ccede4462b816b0ad9ec539792f85b 100644 (file)
--- a/engine/lib/web_services.php
+++ b/engine/lib/web_services.php
@@ -1195,6 +1195,8 @@ $ERRORS = array();
  *
  * @return void
  * @access private
+ * 
+ * @throws Exception
  */
 function _php_api_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
        global $ERRORS;
@@ -1300,6 +1302,7 @@ function service_handler($handler, $request) {
  */
 function register_service_handler($handler, $function) {
        global $CONFIG;
+
        if (!isset($CONFIG->servicehandler)) {
                $CONFIG->servicehandler = array();
        }
@@ -1318,11 +1321,13 @@ function register_service_handler($handler, $function) {
  *
  * @param string $handler web services type
  *
- * @return 1.7.0
+ * @return void
+ * @since 1.7.0
  */
 function unregister_service_handler($handler) {
        global $CONFIG;
-       if (isset($CONFIG->servicehandler) && isset($CONFIG->servicehandler[$handler])) {
+
+       if (isset($CONFIG->servicehandler, $CONFIG->servicehandler[$handler])) {
                unset($CONFIG->servicehandler[$handler]);
        }
 }
@@ -1332,6 +1337,8 @@ function unregister_service_handler($handler) {
  *
  * @return void
  * @access private
+ *
+ * @throws SecurityException|APIException
  */
 function rest_handler() {
        global $CONFIG;
@@ -1386,7 +1393,7 @@ function rest_handler() {
 /**
  * Unit tests for API
  *
- * @param sting  $hook   unit_test
+ * @param string  $hook   unit_test
  * @param string $type   system
  * @param mixed  $value  Array of tests
  * @param mixed  $params Params
@@ -1396,6 +1403,7 @@ function rest_handler() {
  */
 function api_unit_test($hook, $type, $value, $params) {
        global $CONFIG;
+
        $value[] = $CONFIG->path . 'engine/tests/services/api.php';
        return $value;
 }
@@ -1417,15 +1425,18 @@ function api_init() {
        elgg_echo("system.api.list"), "GET", false, false);
 
        // The authentication token api
-       expose_function("auth.gettoken",
-                                       "auth_gettoken", array(
-                                                                                       'username' => array ('type' => 'string'),
-                                                                                       'password' => array ('type' => 'string'),
-                                                                                       ),
-                                       elgg_echo('auth.gettoken'),
-                                       'POST',
-                                       false,
-                                       false);
+       expose_function(
+               "auth.gettoken",
+               "auth_gettoken",
+               array(
+                       'username' => array ('type' => 'string'),
+                       'password' => array ('type' => 'string'),
+               ),
+               elgg_echo('auth.gettoken'),
+               'POST',
+               false,
+               false
+       );
 }