Index: servers/xmlrpc_server/xmlrpc_server.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/servers/xmlrpc_server/Attic/xmlrpc_server.module,v retrieving revision 1.6.2.14.2.2 diff -u -r1.6.2.14.2.2 xmlrpc_server.module --- servers/xmlrpc_server/xmlrpc_server.module 13 Jun 2009 22:43:44 -0000 1.6.2.14.2.2 +++ servers/xmlrpc_server/xmlrpc_server.module 28 Oct 2009 03:03:18 -0000 @@ -25,7 +25,7 @@ function xmlrpc_server_xmlrpc() { $callbacks = array(); foreach (services_get_all() as $method) { - $callbacks[$method['#method']] = 'xmlrpc_server_call_wrapper'; + $callbacks[$method['method']] = 'xmlrpc_server_call_wrapper'; } return $callbacks; } Index: services.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/Attic/services.module,v retrieving revision 1.8.2.88.2.8 diff -u -r1.8.2.88.2.8 services.module --- services.module 15 Oct 2009 03:59:55 -0000 1.8.2.88.2.8 +++ services.module 28 Oct 2009 03:03:18 -0000 @@ -117,7 +117,9 @@ // Find which module the server is part of foreach (module_implements('server_info') as $module) { $info = module_invoke($module, 'server_info'); - if ($info['#path'] == $server_path) { + services_strip_hashes($info); + + if ($info['path'] == $server_path) { // call the server services_set_server_info($module); @@ -236,7 +238,7 @@ // Get information about the current auth module $func = services_auth_info($method, $module); if ($func) { - if ($file = services_auth_info('#file')) { + if ($file = services_auth_info('file')) { require_once(drupal_get_path('module', $module) . '/' . $file); } @@ -256,7 +258,7 @@ // Get information about the auth module $func = services_auth_info($method, $module); if ($func) { - if ($file = services_auth_info('#file', $module)) { + if ($file = services_auth_info('file', $module)) { require_once(drupal_get_path('module', $module) . '/' . $file); } @@ -276,7 +278,7 @@ * This is the magic function through which all remote method calls must pass. */ function services_method_call($method_name, $args = array(), $browsing = FALSE) { - if (is_array($method_name) && isset($method_name['#callback'])) { + if (is_array($method_name) && isset($method_name['callback'])) { $method = $method_name; } else { @@ -290,8 +292,8 @@ // Check for missing args $hash_parameters = array(); - foreach ($method['#args'] as $key => $arg) { - if (!$arg['#optional']) { + foreach ($method['args'] as $key => $arg) { + if (!$arg['optional']) { if (!isset($args[$key]) && !is_array($args[$key]) && !is_bool($args[$key])) { return services_error(t('Missing required arguments.'), 406); } @@ -309,16 +311,16 @@ } // Load the proper file. - if ($file = $method['#file']) { + if ($file = $method['file']) { // Initialize file name if not given. $file += array('file name' => ''); module_load_include($file['file'], $file['module'], $file['file name']); } // Construct access arguments array - if (isset($method['#access arguments'])) { - $access_arguments = $method['#access arguments']; - if (isset($method['#access arguments append']) && $method['#access arguments append']) { + if (isset($method['access arguments'])) { + $access_arguments = $method['access arguments']; + if (isset($method['access arguments append']) && $method['access arguments append']) { $access_arguments[] = $args; } } @@ -328,7 +330,7 @@ } // Call default or custom access callback - if (call_user_func_array($method['#access callback'], $access_arguments) != TRUE) { + if (call_user_func_array($method['access callback'], $access_arguments) != TRUE) { return services_error(t('Access denied'), 401); } @@ -339,7 +341,7 @@ if ($server_info) { chdir($server_info->drupal_path); } - $result = call_user_func_array($method['#callback'], $args); + $result = call_user_func_array($method['callback'], $args); if ($server_info) { chdir($server_root); } @@ -399,21 +401,22 @@ else { $resources = module_invoke_all('service_resource'); drupal_alter('service_resources', $resources); + services_strip_hashes($resources); $controllers = array(); services_process_resources($resources, $controllers); foreach ($controllers as &$controller) { - if (!isset($controller['#access callback'])) { - $controller['#access callback'] = 'services_access_menu'; + if (!isset($controller['access callback'])) { + $controller['access callback'] = 'services_access_menu'; } - if (!isset($controller['#auth'])) { - $controller['#auth'] = TRUE; + if (!isset($controller['auth'])) { + $controller['auth'] = TRUE; } - if (!isset($controller['#key'])) { - $controller['#key'] = TRUE; + if (!isset($controller['key'])) { + $controller['key'] = TRUE; } } @@ -458,54 +461,54 @@ function _services_process_resource($name, &$resource, &$controllers) { $path = join($name, '/'); - $resource['#name'] = $path; + $resource['name'] = $path; - $keys = array('#retrieve','#create','#update','#delete'); + $keys = array('retrieve', 'create', 'update', 'delete'); foreach ($keys as $key) { if (isset($resource[$key])) { $controllers[$path . '/' . $key] = &$resource[$key]; } } - if (isset($resource['#index'])) { - $controllers[$path . '/#index'] = &$resource['#index']; + if (isset($resource['index'])) { + $controllers[$path . '/index'] = &$resource['index']; } - if (isset($resource['#relationships'])) { - foreach ($resource['#relationships'] as $relname => $rel) { + if (isset($resource['relationships'])) { + foreach ($resource['relationships'] as $relname => $rel) { // Run some inheritance logic - if (isset($resource['#retrieve'])) { - if (empty($rel['#args']) || $rel['#args'][0]['#name'] !== $resource['#retrieve']['#args'][0]['#name']) { - array_unshift($rel['#args'], $resource['#retrieve']['#args'][0]); + if (isset($resource['retrieve'])) { + if (empty($rel['args']) || $rel['args'][0]['name'] !== $resource['retrieve']['args'][0]['name']) { + array_unshift($rel['args'], $resource['retrieve']['args'][0]); } - $resource['#relationships'][$relname] = array_merge($resource['#retrieve'], $rel); + $resource['relationships'][$relname] = array_merge($resource['retrieve'], $rel); } - $controllers[$path . '/relationship/' . $relname] = &$resource['#relationships'][$relname]; + $controllers[$path . '/relationship/' . $relname] = &$resource['relationships'][$relname]; } } - if (isset($resource['#actions'])) { - foreach ($resource['#actions'] as $actname => $act) { + if (isset($resource['actions'])) { + foreach ($resource['actions'] as $actname => $act) { // Run some inheritance logic - if (isset($resource['#update'])) { - $up = $resource['#update']; - unset($up['#args']); - $resource['#actions'][$actname] = array_merge($up, $act); + if (isset($resource['update'])) { + $up = $resource['update']; + unset($up['args']); + $resource['actions'][$actname] = array_merge($up, $act); } - $controllers[$path . '/action/' . $actname] = &$resource['#actions'][$actname]; + $controllers[$path . '/action/' . $actname] = &$resource['actions'][$actname]; } } - if (isset($resource['#targeted actions'])) { - foreach ($resource['#targeted actions'] as $actname => $act) { + if (isset($resource['targeted actions'])) { + foreach ($resource['targeted actions'] as $actname => $act) { // Run some inheritance logic - if (isset($resource['#update'])) { - if (empty($act['#args']) || $act['#args'][0]['#name'] !== $resource['#update']['#args'][0]['#name']) { - array_unshift($act['#args'], $resource['#update']['#args'][0]); + if (isset($resource['update'])) { + if (empty($act['args']) || $act['args'][0]['name'] !== $resource['update']['args'][0]['name']) { + array_unshift($act['args'], $resource['update']['args'][0]); } - $resource['#targeted actions'][$actname] = array_merge($resource['#update'], $act); + $resource['targeted actions'][$actname] = array_merge($resource['update'], $act); } - $controllers[$path . '/targeted_action/' . $actname] = &$resource['#actions'][$actname]; + $controllers[$path . '/targeted_action/' . $actname] = &$resource['actions'][$actname]; } } } @@ -532,34 +535,35 @@ } else { $methods = module_invoke_all('service'); + services_strip_hashes($methods); foreach ($methods as $key => $method) { - if (!isset($methods[$key]['#access callback'])) { - $methods[$key]['#access callback'] = 'services_access_menu'; + if (!isset($methods[$key]['access callback'])) { + $methods[$key]['access callback'] = 'services_access_menu'; } - if (!isset($methods[$key]['#args'])) { - $methods[$key]['#args'] = array(); + if (!isset($methods[$key]['args'])) { + $methods[$key]['args'] = array(); } // set defaults for args - foreach ($methods[$key]['#args'] as $arg_key => $arg) { + foreach ($methods[$key]['args'] as $arg_key => $arg) { if (is_array($arg)) { - if (!isset($arg['#optional'])) { - $methods[$key]['#args'][$arg_key]['#optional'] = FALSE; + if (!isset($arg['optional'])) { + $methods[$key]['args'][$arg_key]['optional'] = FALSE; } } else { $arr_arg = array(); - $arr_arg['#name'] = t('unnamed'); - $arr_arg['#type'] = $arg; - $arr_arg['#description'] = t('No description given.'); - $arr_arg['#optional'] = FALSE; - $methods[$key]['#args'][$arg_key] = $arr_arg; + $arr_arg['name'] = t('unnamed'); + $arr_arg['type'] = $arg; + $arr_arg['description'] = t('No description given.'); + $arr_arg['optional'] = FALSE; + $methods[$key]['args'][$arg_key] = $arr_arg; } } - reset($methods[$key]['#args']); + reset($methods[$key]['args']); } // Allow auth module to alter the methods @@ -600,7 +604,7 @@ static $method_cache; if (!isset($method_cache[$method_name])) { foreach (services_get_all() as $method) { - if ($method_name == $method['#method']) { + if ($method_name == $method['method']) { $method_cache[$method_name] = $method; break; } @@ -609,6 +613,21 @@ return $method_cache[$method_name]; } + /** ++ * Cleanup function to remove unnecessary hashes from service definitions. ++ */ +function services_strip_hashes(&$array) { + foreach ($array as $key => $value) { + if (is_array($value)) { + services_strip_hashes($array[$key]); + } + if (strpos($key, '#') === 0) { + $array[substr($key, 1)] = $array[$key]; + unset($array[$key]); + } + } +} + /** * Make any changes we might want to make to node. */ Index: services_admin_browse.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/Attic/services_admin_browse.inc,v retrieving revision 1.5.2.45.2.2 diff -u -r1.5.2.45.2.2 services_admin_browse.inc --- services_admin_browse.inc 5 Sep 2009 13:57:58 -0000 1.5.2.45.2.2 +++ services_admin_browse.inc 28 Oct 2009 03:03:18 -0000 @@ -20,8 +20,10 @@ $output .= ''; @@ -36,7 +38,7 @@ // group namespaces $services = array(); foreach ($methods as $method) { - $namespace = drupal_substr($method['#method'], 0, strrpos($method['#method'], '.')); + $namespace = drupal_substr($method['method'], 0, strrpos($method['method'], '.')); $services[$namespace][] = $method; } @@ -45,7 +47,7 @@ $output .= '

'. $namespace .'

'; $output .= ''; } @@ -62,18 +64,18 @@ $output = ''; - $output .= '

'. $method['#method'] .'

'; - $output .= '

'. $method['#help'] .'

'; + $output .= '

'. $method['method'] .'

'; + $output .= '

'. $method['help'] .'

'; // List arguments. - $output .= '

'. t('Arguments') .' ('. count($method['#args']) .')

'; + $output .= '

'. t('Arguments') .' ('. count($method['args']) .')

'; $output .= '
'; $count = 0; - foreach ($method['#args'] as $arg) { + foreach ($method['args'] as $arg) { $count++; - $output .= '
'. $arg['#type'] .''. - $arg['#name'] .' ('. (($arg['#optional']) ? t('optional') : t('required')) .')
'; - $output .= '
'. $arg['#description'] .'
'; + $output .= '
'. $arg['type'] .''. + $arg['name'] .' ('. (($arg['optional']) ? t('optional') : t('required')) .')
'; + $output .= '
'. $arg['description'] .'
'; } $output .= '
'; @@ -100,15 +102,15 @@ $form['arg'] = array('#tree' => TRUE); $form['format'] = array('#tree' => TRUE); - foreach ($method['#args'] as $key => $arg) { + foreach ($method['args'] as $key => $arg) { $form['name'][$key] = array( - '#value' => $arg['#name'] + '#value' => $arg['name'] ); $form['optional'][$key] = array( - '#value' => ($arg['#optional']) ? t('optional') : t('required') + '#value' => ($arg['optional']) ? t('optional') : t('required') ); - if (isset($arg['#size']) && $arg['#size'] == 'big') { + if (isset($arg['size']) && $arg['size'] == 'big') { $form['arg'][$key] = array( '#type' => 'textarea' ); @@ -120,7 +122,7 @@ } $format_opt = array(); - switch ($arg['#type']) { + switch ($arg['type']) { case 'array': $format_opt['cdel'] = t('Comma delimited'); case 'struct': @@ -159,7 +161,7 @@ $args = services_admin_browse_test_unserialize_args($form_state['values']['arg'], $form_state['values']['format']); // Allow the authorization module to handle submitted values. services_auth_invoke('alter_browse_form_submit', $method, $args); - $result = services_method_call($method['#method'], $args, TRUE); + $result = services_method_call($method['method'], $args, TRUE); $_services_admin_browse_test_submit_result = '
'. htmlspecialchars(print_r($result, TRUE)) .'
'; } @@ -167,8 +169,8 @@ $method = services_method_get(arg(4)); $noskip = FALSE; // Convert args - for ($c = count($method['#args']) - 1; $c >= 0; $c--) { - $arg = $method['#args'][$c]; + for ($c = count($method['args']) - 1; $c >= 0; $c--) { + $arg = $method['args'][$c]; $value = $values[$c]; // Remove empty values from end of array @@ -192,7 +194,7 @@ $return[$c] = NULL; } else { - $return[$c] = json_decode($value, $arg['#type'] === 'array'); + $return[$c] = json_decode($value, $arg['type'] === 'array'); } break; case 'sphp': @@ -254,7 +256,9 @@ $auth_options = array('' => t('-- Select a authorization module')); foreach ($auth_modules as $module) { $info = services_auth_info(NULL, $module); - $auth_options[$info['#description']][$module] = $info['#title']; + services_strip_hashes($info); + + $auth_options[$info['description']][$module] = $info['title']; } $form['security'] = array( Index: services.resource-translation.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/Attic/services.resource-translation.inc,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 services.resource-translation.inc --- services.resource-translation.inc 5 Sep 2009 13:57:58 -0000 1.1.2.1 +++ services.resource-translation.inc 28 Oct 2009 03:03:18 -0000 @@ -3,36 +3,36 @@ function _services_resource_as_services($resource) { static $controllers = array( - '#create' => 'create', - '#delete' => 'delete', - '#retrieve' => 'retrieve', - '#update' => 'update', - '#index' => 'index', + 'create' => 'create', + 'delete' => 'delete', + 'retrieve' => 'retrieve', + 'update' => 'update', + 'index' => 'index', ), $subcontrollers = array( - '#relationships' => 'related', - '#targeted actions' => 'targeted_action', + 'relationships' => 'related', + 'targeted actions' => 'targeted_action', ); $methods = array(); - $file = isset($resource['#file']) ? $resource['#file'] : array(); + $file = isset($resource['file']) ? $resource['file'] : array(); foreach ($controllers as $attr => $name) { if (isset($resource[$attr])) { - $methods[] = _services_resource_controller_as_service($resource['#name'], $name, $resource[$attr], $file); + $methods[] = _services_resource_controller_as_service($resource['name'], $name, $resource[$attr], $file); } } foreach ($subcontrollers as $attr => $name) { if (isset($resource[$attr])) { foreach ($resource[$attr] as $sc_name => $controller) { - $methods[] = _services_resource_controller_as_service($resource['#name'], $name . '_' . $sc_name, $controller, $file); + $methods[] = _services_resource_controller_as_service($resource['name'], $name . '_' . $sc_name, $controller, $file); } } } - if (isset($resource['#actions'])) { - foreach ($resource['#actions'] as $sc_name => $controller) { - $methods[] = _services_resource_controller_as_service($resource['#name'], 'action_' . $sc_name, $controller, $file); + if (isset($resource['actions'])) { + foreach ($resource['actions'] as $sc_name => $controller) { + $methods[] = _services_resource_controller_as_service($resource['name'], 'action_' . $sc_name, $controller, $file); } } @@ -41,11 +41,11 @@ function _services_resource_controller_as_service($resource, $name, $controller, $file) { $method = array_merge($controller, array( - '#method' => $resource . '_resource.' . $name, + 'method' => $resource . '_resource.' . $name, )); - if (!empty($file) && !empty($method['#file'])) { - $method['#file'] = $file; + if (!empty($file) && !empty($method['file'])) { + $method['file'] = $file; } return $method; @@ -55,19 +55,19 @@ $resources = array(); foreach ($services as $service) { - $signature = preg_split('/\./', $service['#method']); + $signature = preg_split('/\./', $service['method']); $controller = $service; - $controller['#args'] = array(); + $controller['args'] = array(); - foreach($service['#args'] as $arg) { - $arg['#source'] = array( - 'data' => $arg['#name'], + foreach ($service['args'] as $arg) { + $arg['source'] = array( + 'data' => $arg['name'], ); - $controller['#args'][] = $arg; + $controller['args'][] = $arg; } - $resources['service_' . $signature[0]]['#actions'][$signature[1]] = $controller; + $resources['service_' . $signature[0]]['actions'][$signature[1]] = $controller; } return $resources; } \ No newline at end of file Index: auth/services_keyauth/services_keyauth.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/auth/services_keyauth/Attic/services_keyauth.admin.inc,v retrieving revision 1.1.2.2.2.2 diff -u -r1.1.2.2.2.2 services_keyauth.admin.inc --- auth/services_keyauth/services_keyauth.admin.inc 8 Aug 2009 02:55:05 -0000 1.1.2.2.2.2 +++ auth/services_keyauth/services_keyauth.admin.inc 28 Oct 2009 03:03:18 -0000 @@ -81,7 +81,7 @@ $methods = services_get_all(); foreach ($methods as $method) { - $form_methods[$method['#method']] = $method['#method']; + $form_methods[$method['method']] = $method['method']; } $form['method_access'] = array( Index: auth/services_keyauth/services_keyauth.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/auth/services_keyauth/Attic/services_keyauth.inc,v retrieving revision 1.1.2.8.2.4 diff -u -r1.1.2.8.2.4 services_keyauth.inc --- auth/services_keyauth/services_keyauth.inc 15 Oct 2009 02:59:56 -0000 1.1.2.8.2.4 +++ auth/services_keyauth/services_keyauth.inc 28 Oct 2009 03:03:18 -0000 @@ -84,33 +84,33 @@ foreach ($methods as $key => &$method) { // set method defaults - switch ($method['#method']) { + switch ($method['method']) { case 'system.connect': - $method['#key'] = FALSE; - $method['#auth'] = FALSE; + $method['key'] = FALSE; + $method['auth'] = FALSE; break; default: - $method['#key'] = TRUE; - $method['#auth'] = TRUE; + $method['key'] = TRUE; + $method['auth'] = TRUE; } - if ($method['#auth'] && variable_get('services_use_sessid', TRUE)) { - array_unshift($method['#args'], $arg_sessid); + if ($method['auth'] && variable_get('services_use_sessid', TRUE)) { + array_unshift($method['args'], $arg_sessid); } - if ($method['#key'] && variable_get('services_use_key', TRUE)) { - array_unshift($method['#args'], $arg_nonce); - array_unshift($method['#args'], $arg_domain_time_stamp); - array_unshift($method['#args'], $arg_domain_name); - array_unshift($method['#args'], $arg_api_key); + if ($method['key'] && variable_get('services_use_key', TRUE)) { + array_unshift($method['args'], $arg_nonce); + array_unshift($method['args'], $arg_domain_time_stamp); + array_unshift($method['args'], $arg_domain_name); + array_unshift($method['args'], $arg_api_key); } } } function _services_keyauth_alter_browse_form(&$form, $method) { - foreach ($method['#args'] as $key => $arg) { - switch ($arg['#name']) { + foreach ($method['args'] as $key => $arg) { + switch ($arg['name']) { case 'hash': $form['arg'][$key] = array( '#title' => 'Hash', @@ -141,7 +141,7 @@ } function _services_keyauth_authenticate_call($method, $method_name, &$args) { - if ($method['#key'] && variable_get('services_use_key', TRUE)) { + if ($method['key'] && variable_get('services_use_key', TRUE)) { $hash = array_shift($args); $domain = array_shift($args); $timestamp = array_shift($args); @@ -179,7 +179,7 @@ // Add additonal processing for methods requiring session $session_backup = NULL; - if ($method['#auth'] && variable_get('services_use_sessid', TRUE)) { + if ($method['auth'] && variable_get('services_use_sessid', TRUE)) { $sessid = array_shift($args); if (empty($sessid)) { return t('Invalid sessid.'); @@ -189,7 +189,7 @@ } function _services_keyauth_alter_browse_form_submit($method, &$args) { - if ($method['#key'] && variable_get('services_use_key', TRUE)) { + if ($method['key'] && variable_get('services_use_key', TRUE)) { $args_stripped = $args; for ($i = 1; $i <= 4; $i++) { Index: auth/services_keyauth/services_keyauth.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/services/auth/services_keyauth/Attic/services_keyauth.module,v retrieving revision 1.1.2.6.2.2 diff -u -r1.1.2.6.2.2 services_keyauth.module --- auth/services_keyauth/services_keyauth.module 28 Jun 2009 22:33:08 -0000 1.1.2.6.2.2 +++ auth/services_keyauth/services_keyauth.module 28 Oct 2009 03:03:18 -0000 @@ -33,9 +33,9 @@ */ function services_keyauth_authentication_info() { return array( - '#file' => 'services_keyauth.inc', - '#title' => t('Key authentication'), - '#description' => t('The default key-based authentication'), + 'file' => 'services_keyauth.inc', + 'title' => t('Key authentication'), + 'description' => t('The default key-based authentication'), 'security_settings' => '_services_keyauth_security_settings', 'security_settings_validate' => '_services_keyauth_security_settings_validate', 'security_settings_submit' => '_services_keyauth_security_settings_submit', @@ -94,9 +94,9 @@ } function services_get_hash($timestamp, $domain, $nonce, $method, $args) { - $hash_parameters = array($timestamp, $domain, $nonce, $method['#method']); - foreach ($method['#args'] as $key => $arg) { - if ($arg['#signed'] == TRUE) { + $hash_parameters = array($timestamp, $domain, $nonce, $method['method']); + foreach ($method['args'] as $key => $arg) { + if ($arg['signed'] == TRUE) { if (is_numeric($args[$key]) || !empty($args[$key])) { - if (is_array($args[$key]) || is_object($args[$key])){ + if (is_array($args[$key]) || is_object($args[$key])) { $hash_parameters[] = serialize($args[$key]);