From 7ddd9521b3f3a397da3b0a6b56238d31414eb4be Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 28 Oct 2010 19:17:36 +0000 Subject: Standardized code in all of core, not including language files, tests, or core mods. git-svn-id: http://code.elgg.org/elgg/trunk@7124 36083f99-b078-4883-b0ff-0f9b5a30f544 --- services/api/rest_api.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'services/api') diff --git a/services/api/rest_api.php b/services/api/rest_api.php index 9665c16d3..d5f2d9734 100644 --- a/services/api/rest_api.php +++ b/services/api/rest_api.php @@ -15,10 +15,10 @@ global $CONFIG; // Register the error handler error_reporting(E_ALL); -set_error_handler('__php_api_error_handler'); +set_error_handler('_php_api_error_handler'); // Register a default exception handler -set_exception_handler('__php_api_exception_handler'); +set_exception_handler('_php_api_exception_handler'); // Check to see if the api is available if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { @@ -26,7 +26,7 @@ if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { } // plugins should return true to control what API and user authentication handlers are registered -if (trigger_plugin_hook('rest', 'init', null, false) == false) { +if (trigger_plugin_hook('rest', 'init', null, false) == false) { // for testing from a web browser, you can use the session PAM // do not use for production sites!! //register_pam_handler('pam_auth_session'); @@ -34,9 +34,9 @@ if (trigger_plugin_hook('rest', 'init', null, false) == false) { // user token can also be used for user authentication register_pam_handler('pam_auth_usertoken'); - // simple API key check + // simple API key check register_pam_handler('api_auth_key', "sufficient", "api"); - // hmac + // hmac register_pam_handler('api_auth_hmac', "sufficient", "api"); } -- cgit v1.2.3