arturo-c

<?php
/**
 * @file
 * Loads dependencies and defines the apci_groups resource
 */
module_load_include('inc', 'og_services', 'og_services');
module_load_include('inc', 'services_views', 'services_views.resource');
module_load_include('inc', 'apci_public_api_services', 'helpers');
function apci_public_api_services_groups_resource_definition() {
  $response = new GroupResponse;

arturo-c

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 90aa405..cc2cb52 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,6 @@ Trying to remember to document major API changes here
 
 - hook_services_authentication_info() no longer uses the 'alter_browse_form', 'alter_browse_form_validate' or 'alter_browse_form_submit' callbacks since the browser is gone.
 
-- service definitions are now divided into predefined classes (create, retrieve, update, delete, actions, targeted actions, relationships) and the available keys have all changed/been removed/been added to in a variety of ways since 2.x.
+- service definitions are now divided into predefined classes (create, retrieve, update, delete, actions, targeted_actions, relationships) and the available keys have all changed/been removed/been added to in a variety of ways since 2.x.

arturo-c

diff --git a/plugins/export_ui/services_ctools_export_ui.class.php b/plugins/export_ui/services_ctools_export_ui.class.php
index fe4a51d..99de0c4 100644
--- a/plugins/export_ui/services_ctools_export_ui.class.php
+++ b/plugins/export_ui/services_ctools_export_ui.class.php
@@ -23,6 +23,14 @@ class services_ctools_export_ui extends ctools_export_ui {
     return drupal_get_form('services_edit_form_endpoint_authentication', $item);
   }
 
+  /**
+   * Page callback for the server page.

arturo-c

diff --git a/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc b/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc
index de1ed1d..3eacceb 100755
--- a/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc
+++ b/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc
@@ -128,6 +128,9 @@ function apci_public_api_services_default_services_endpoint() {
         'subgroups' => array(
           'enabled' => 1,
         ),
+        'roles' => array(
+          'enabled' => 1,

arturo-c

diff --git a/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module b/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module
index 121ac43..c2fc7e3 100644
--- a/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module
+++ b/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module
@@ -186,6 +186,10 @@ function theme_fullcalendar_classname($node) {
  * Pass settings to JavaScript.
  */
 function template_preprocess_views_view_fullcalendar(&$vars) {
+  $timezone = date_default_timezone_name();
+  $dateTime = new DateTime();

arturo-c

diff --git a/www/sites/all/modules/contrib/services/resources/user_resource.inc b/www/sites/all/modules/contrib/services/resources/user_resource.inc
index 1638088..78a3364 100644
--- a/www/sites/all/modules/contrib/services/resources/user_resource.inc
+++ b/www/sites/all/modules/contrib/services/resources/user_resource.inc
@@ -401,10 +401,10 @@ function _user_resource_logout() {
 
   watchdog('user', 'Session closed for %name.', array('%name' => theme('placeholder', $user->name)));
 
-  // Destroy the current session:
-  session_destroy();

arturo-c

diff --git a/resources/user_resource.inc b/resources/user_resource.inc
index 3a312de..23017b2 100644
--- a/resources/user_resource.inc
+++ b/resources/user_resource.inc
@@ -401,10 +401,10 @@ function _user_resource_logout() {
 
   watchdog('user', 'Session closed for %name.', array('%name' => theme('placeholder', $user->name)));
 
-  // Destroy the current session:
-  session_destroy();

arturo-c

/*
Copyright (c) 2008-2011
	Lars-Dominik Braun <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

arturo-c

diff --git a/commerce_adhoc_payment.module b/commerce_adhoc_payment.module
old mode 100644
new mode 100755
index f28cca7..f8e590d
--- a/commerce_adhoc_payment.module
+++ b/commerce_adhoc_payment.module
@@ -24,7 +24,7 @@ function commerce_adhoc_payment_commerce_payment_method_info() {
  * Payment method callback: checkout form.
  */
 function commerce_adhoc_payment_submit_form($payment_method, $pane_values, $checkout_pane, $order) {

arturo-c

SELECT commerce_line_item_field_data_commerce_line_items__field_data_field_user.field_user_target_id AS commerce_line_item_field_data_commerce_line_items__field_dat, users_field_data_field_user__field_data_field_firstname.field_firstname_value AS users_field_data_field_user__field_data_field_firstname_fiel, users_field_data_field_user__field_data_field_lastname.field_lastname_value AS users_field_data_field_user__field_data_field_lastname_field, users_commerce_order__field_data_field_firstname.field_firstname_value AS users_commerce_order__field_data_field_firstname_field_first, users_commerce_order__field_data_field_lastname.field_lastname_value AS users_commerce_order__field_data_field_lastname_field_lastna, MIN(commerce_line_item_field_data_commerce_line_items.line_item_id) AS commerce_line_item_field_data_commerce_line_items_line_item_, 'commerce_line_item' AS field_data_field_user_commerce_line_item_entity_type, MIN(users_field_data_field_user.uid) AS users_field_data_field_user_uid, 'user' AS field_data