#15 Update Services to 7.x-3.28

docroot/sites/all/modules/contrib/services/README.txt

@@ -13,7 +13,7 @@ http://drupal.org/node/109782
 Installation
 ============
 If you are using the rest server you will need to download the latest version of SPYC:
-wget https://raw.github.com/mustangostang/spyc/0.5.1/Spyc.php -O sites/all/libraries/spyc/spyc.php
+wget https://raw.github.com/mustangostang/spyc/0.6.2/Spyc.php -O sites/all/libraries/spyc/spyc.php
 
 Once downloaded you need to add spyc.php to the rest_server/lib folder which exists under
 the location you have installed services in.

docroot/sites/all/modules/contrib/services/auth/services_oauth/services_oauth.info

@@ -5,8 +5,8 @@ dependencies[] = services
 dependencies[] = oauth_common
 core = 7.x
 php = 5.2
-; Information added by Drupal.org packaging script on 2020-06-03
-version = "7.x-3.27"
+; Information added by Drupal.org packaging script on 2022-04-21
+version = "7.x-3.28"
 core = "7.x"
 project = "services"
-datestamp = "1591213031"
+datestamp = "1650563150"

docroot/sites/all/modules/contrib/services/js/services.admin.js

@@ -4,8 +4,7 @@
    */
   Drupal.behaviors.resourceMenuCollapse = {
     attach: function (context, settings) {
-      var timeout = null,
-        arrowImageHTML = function(collapsed) {
+      var arrowImageHTML = function(collapsed) {
           return settings.services.images[collapsed ? 'collapsed' : 'expanded'];
         },
         setRowsCollapsedState = function(toggle, $rows, collapsed) {
@@ -18,7 +17,7 @@
           $(toggle).html(arrowImageHTML(collapsed));
         };
 
-      $('td.resource-select-all').each(function() {
+      $('td.resource-select-all').once('resource-menu-collapse').each(function() {
         var resourceName = this.id,
           resource = settings.services.resources[this.id],
           $rowElements = $('.' + resourceName + '-method'),
@@ -43,7 +42,7 @@
    */
   Drupal.behaviors.resourceSelectAll = {
     attach: function (context, settings) {
-      $('td.resource-select-all').each(function () {
+      $('td.resource-select-all').once('resource-select-all').each(function () {
         var resourceName = this.id,
           methodCheckboxes = $('.' + resourceName + '-method .resource-method-select input[type=checkbox]'),
           groupCheckbox = $('<input type="checkbox" class="form-checkbox" />').attr('id', this.id + '-select-all'),
@@ -70,4 +69,4 @@
       });
     }
   };
-})(jQuery);
+})(jQuery);

docroot/sites/all/modules/contrib/services/resources/comment_resource.inc

@@ -411,6 +411,9 @@ function _comment_resource_access($op = 'view', $args = array()) {
     case 'edit':
       return comment_access('edit', $comment);
     case 'create':
+      if (!isset($comment->nid)) {
+        return services_error(t('Missing required argument nid'), 406);
+      }
       // Check if the user may post comments, node has comments enabled
       // and that the user has access to the node.
       return user_access('post comments') && ($node->comment == COMMENT_NODE_OPEN);

docroot/sites/all/modules/contrib/services/resources/taxonomy_resource.inc

@@ -373,9 +373,10 @@ function _taxonomy_resource_definition() {
  */
 function _taxonomy_term_resource_retrieve($tid) {
   $term = taxonomy_term_load($tid);
-  //Lets check field_permissions
-  $term = services_field_permissions_clean('view', 'taxonomy_term', $term);
-  return $term;
+  // Let's check field_permissions and return term object
+  return $term ?
+    services_field_permissions_clean('view', 'taxonomy_term', $term) :
+    services_error(t('Term @tid not found', array('@tid' => $tid)), 404);
 }
 
 /**

docroot/sites/all/modules/contrib/services/servers/rest_server/includes/RESTServer.inc

@@ -704,7 +704,7 @@ class RESTServer {
     );
     drupal_alter('rest_server_execute_errors', $error_alter_array, $controller, $arguments);
 
-    drupal_add_http_header('Status', strip_tags(str_replace(PHP_EOL, '', $error_header_status_message)));
+    drupal_add_http_header('Status', strip_tags(str_replace(array("\r", "\n"), '', $error_header_status_message)));
 
     return $error_data;
   }

docroot/sites/all/modules/contrib/services/servers/rest_server/rest_server.info

@@ -20,8 +20,8 @@ dependencies[] = libraries (>=2.x)
 
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2020-06-03
-version = "7.x-3.27"
+; Information added by Drupal.org packaging script on 2022-04-21
+version = "7.x-3.28"
 core = "7.x"
 project = "services"
-datestamp = "1591213031"
+datestamp = "1650563150"

docroot/sites/all/modules/contrib/services/servers/rest_server/rest_server.module

@@ -178,9 +178,8 @@ function _rest_server_add_default_and_remove_unknown(&$array, $keys, $default) {
 function rest_server_libraries_info() {
   $libraries['spyc'] = array(
     'name' => 'Spyc',
-    'version' => '0.5.1',
     'vendor url' => 'https://github.com/mustangostang/spyc',
-    'download url' => 'https://raw.github.com/mustangostang/spyc/0.5.1/Spyc.php',
+    'download url' => 'https://raw.github.com/mustangostang/spyc/0.6.2/Spyc.php',
     'version arguments' => array(
       'file' => 'Spyc.php',
       'pattern' => '@version\s+([0-9a-zA-Z\.-]+)@',

docroot/sites/all/modules/contrib/services/servers/xmlrpc_server/xmlrpc_server.info

@@ -7,8 +7,8 @@ files[] = xmlrpc_server.module
 dependencies[] = services
 
 core = 7.x
-; Information added by Drupal.org packaging script on 2020-06-03
-version = "7.x-3.27"
+; Information added by Drupal.org packaging script on 2022-04-21
+version = "7.x-3.28"
 core = "7.x"
 project = "services"
-datestamp = "1591213031"
+datestamp = "1650563150"

docroot/sites/all/modules/contrib/services/services.info

@@ -30,8 +30,8 @@ dependencies[] = ctools
 ; Required for test coverage.
 test_dependencies[] = libraries
 
-; Information added by Drupal.org packaging script on 2020-06-03
-version = "7.x-3.27"
+; Information added by Drupal.org packaging script on 2022-04-21
+version = "7.x-3.28"
 core = "7.x"
 project = "services"
-datestamp = "1591213031"
+datestamp = "1650563150"

docroot/sites/all/modules/contrib/services/services.make.example

@@ -4,5 +4,5 @@ core = 7.x
 ; Libraries
 libraries[spyc][directory_name] = spyc
 libraries[spyc][download][type] = file
-libraries[spyc][download][url] = https://raw.github.com/mustangostang/spyc/0.5.1/Spyc.php
+libraries[spyc][download][url] = https://raw.github.com/mustangostang/spyc/0.6.2/Spyc.php
 libraries[spyc][type] = library

docroot/sites/all/modules/contrib/services/services.module

@@ -851,8 +851,9 @@ function services_request_apply_version(&$controller, $options = array()) {
     return;
   }
   $updates = services_get_updates();
-  if (isset($method) && isset($updates[$resource][$method])) {
-    foreach ($updates[$resource][$method] as $update) {
+  $resource_clean_name = str_replace('-', '_', $resource);
+  if (isset($method) && isset($updates[$resource_clean_name][$method])) {
+    foreach ($updates[$resource_clean_name][$method] as $update) {
       if (!isset($version)) {
         $endpoint = services_get_server_info('endpoint', '');
         $endpoint = services_endpoint_load($endpoint);

docroot/sites/all/modules/contrib/services/tests/services_test_resource/services_test_resource.info

@@ -9,8 +9,8 @@ hidden = TRUE
 
 dependencies[] = services
 
-; Information added by Drupal.org packaging script on 2020-06-03
-version = "7.x-3.27"
+; Information added by Drupal.org packaging script on 2022-04-21
+version = "7.x-3.28"
 core = "7.x"
 project = "services"
-datestamp = "1591213031"
+datestamp = "1650563150"