and add attributes such as
- * classes or an HTML id.
+ * classes or an HTML ID.
+ *
+ * See the @link forms_api_reference.html Form API reference @endlink for more
+ * information on the #theme_wrappers render array property.
*
* @param $variables
* An associative array containing:
@@ -3542,6 +3546,7 @@ function form_process_tableselect($element) {
'#return_value' => $key,
'#default_value' => isset($value[$key]) ? $key : NULL,
'#attributes' => $element['#attributes'],
+ '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
);
}
else {
@@ -3979,7 +3984,12 @@ function form_process_autocomplete($element) {
// browser interpreting the path plus search string as an actual file.
$current_clean_url = isset($GLOBALS['conf']['clean_url']) ? $GLOBALS['conf']['clean_url'] : NULL;
$GLOBALS['conf']['clean_url'] = 0;
- $element['#autocomplete_input']['#url_value'] = url($element['#autocomplete_path'], array('absolute' => TRUE));
+ // Force the script path to 'index.php', in case the server is not
+ // configured to find it automatically. Normally it is the responsibility
+ // of the site to do this themselves using hook_url_outbound_alter() (see
+ // url()) but since this code is forcing non-clean URLs on sites that don't
+ // normally use them, it is done here instead.
+ $element['#autocomplete_input']['#url_value'] = url($element['#autocomplete_path'], array('absolute' => TRUE, 'script' => 'index.php'));
$GLOBALS['conf']['clean_url'] = $current_clean_url;
}
return $element;
@@ -4484,7 +4494,7 @@ function element_validate_number($element, &$form_state) {
*
* Sample callback_batch_finished():
* @code
- * function batch_test_finished($success, $results, $operations) {
+ * function my_finished_callback($success, $results, $operations) {
* // The 'success' parameter means no fatal PHP errors were detected. All
* // other error management should be handled using 'results'.
* if ($success) {
diff --git a/includes/install.core.inc b/includes/install.core.inc
index e5a65865..b18d23d2 100644
--- a/includes/install.core.inc
+++ b/includes/install.core.inc
@@ -809,6 +809,13 @@ function install_system_module(&$install_state) {
variable_set('install_profile_modules', array_diff($modules, array('system')));
$install_state['database_tables_exist'] = TRUE;
+
+ // Prevent the hook_requirements() check from telling us to convert the
+ // database to utf8mb4.
+ $connection = Database::getConnection();
+ if ($connection->utf8mb4IsConfigurable() && $connection->utf8mb4IsActive()) {
+ variable_set('drupal_all_databases_are_utf8mb4', TRUE);
+ }
}
/**
@@ -1590,7 +1597,9 @@ function install_finished(&$install_state) {
}
/**
- * Batch callback for batch installation of modules.
+ * Implements callback_batch_operation().
+ *
+ * Performs batch installation of modules.
*/
function _install_module_batch($module, $module_name, &$context) {
// Install and enable the module right away, so that the module will be
@@ -1603,6 +1612,8 @@ function _install_module_batch($module, $module_name, &$context) {
}
/**
+ * Implements callback_batch_finished().
+ *
* 'Finished' callback for module installation batch.
*/
function _install_profile_modules_finished($success, $results, $operations) {
diff --git a/includes/install.inc b/includes/install.inc
index bd37d067..5065d35c 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -750,7 +750,7 @@ function drupal_install_system() {
/**
* Uninstalls a given list of disabled modules.
*
- * @param array $module_list
+ * @param string[] $module_list
* The modules to uninstall. It is the caller's responsibility to ensure that
* all modules in this list have already been disabled before this function
* is called.
@@ -769,6 +769,7 @@ function drupal_install_system() {
* included in $module_list).
*
* @see module_disable()
+ * @see module_enable()
*/
function drupal_uninstall_modules($module_list = array(), $uninstall_dependents = TRUE) {
if ($uninstall_dependents) {
diff --git a/includes/locale.inc b/includes/locale.inc
index c7f95838..11f1413e 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -435,6 +435,13 @@ function locale_language_url_rewrite_url(&$path, &$options) {
switch (variable_get('locale_language_negotiation_url_part', LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX)) {
case LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN:
if ($options['language']->domain) {
+ // Save the original base URL. If it contains a port, we need to
+ // retain it below.
+ if (!empty($options['base_url'])) {
+ // The colon in the URL scheme messes up the port checking below.
+ $normalized_base_url = str_replace(array('https://', 'http://'), '', $options['base_url']);
+ }
+
// Ask for an absolute URL with our modified base_url.
global $is_https;
$url_scheme = ($is_https) ? 'https://' : 'http://';
@@ -449,6 +456,19 @@ function locale_language_url_rewrite_url(&$path, &$options) {
// Apply the appropriate protocol to the URL.
$options['base_url'] = $url_scheme . $host;
+
+ // In case either the original base URL or the HTTP host contains a
+ // port, retain it.
+ $http_host = $_SERVER['HTTP_HOST'];
+ if (isset($normalized_base_url) && strpos($normalized_base_url, ':') !== FALSE) {
+ list($host, $port) = explode(':', $normalized_base_url);
+ $options['base_url'] .= ':' . $port;
+ }
+ elseif (strpos($http_host, ':') !== FALSE) {
+ list($host, $port) = explode(':', $http_host);
+ $options['base_url'] .= ':' . $port;
+ }
+
if (isset($options['https']) && variable_get('https', FALSE)) {
if ($options['https'] === TRUE) {
$options['base_url'] = str_replace('http://', 'https://', $options['base_url']);
@@ -523,6 +543,22 @@ function locale_language_url_rewrite_session(&$path, &$options) {
* possible attack vector (img).
*/
function locale_string_is_safe($string) {
+ // Some strings have tokens in them. For tokens in the first part of href or
+ // src HTML attributes, filter_xss() removes part of the token, the part
+ // before the first colon. filter_xss() assumes it could be an attempt to
+ // inject javascript. When filter_xss() removes part of tokens, it causes the
+ // string to not be translatable when it should be translatable. See
+ // LocaleStringIsSafeTest::testLocaleStringIsSafe().
+ //
+ // We can recognize tokens since they are wrapped with brackets and are only
+ // composed of alphanumeric characters, colon, underscore, and dashes. We can
+ // be sure these strings are safe to strip out before the string is checked in
+ // filter_xss() because no dangerous javascript will match that pattern.
+ //
+ // @todo Do not strip out the token. Fix filter_xss() to not incorrectly
+ // alter the string. https://www.drupal.org/node/2372127
+ $string = preg_replace('/\[[a-z0-9_-]+(:[a-z0-9_-]+)+\]/i', '', $string);
+
return decode_entities($string) == decode_entities(filter_xss($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'ins', 'kbd', 'li', 'ol', 'p', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var')));
}
@@ -631,9 +667,6 @@ function locale_add_language($langcode, $name = NULL, $native = NULL, $direction
* translations).
*/
function _locale_import_po($file, $langcode, $mode, $group = NULL) {
- // Try to allocate enough time to parse and import the data.
- drupal_set_time_limit(240);
-
// Check if we have the language already in the database.
if (!db_query("SELECT COUNT(language) FROM {languages} WHERE language = :language", array(':language' => $langcode))->fetchField()) {
drupal_set_message(t('The language selected for import is not supported.'), 'error');
@@ -717,6 +750,12 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group =
$lineno = 0;
while (!feof($fd)) {
+ // Refresh the time limit every 10 parsed rows to ensure there is always
+ // enough time to import the data for large PO files.
+ if (!($lineno % 10)) {
+ drupal_set_time_limit(30);
+ }
+
// A line should not be longer than 10 * 1024.
$line = fgets($fd, 10 * 1024);
@@ -2306,6 +2345,8 @@ function _locale_batch_build($files, $finished = NULL, $components = array()) {
}
/**
+ * Implements callback_batch_operation().
+ *
* Perform interface translation import as a batch step.
*
* @param $filepath
@@ -2324,6 +2365,8 @@ function _locale_batch_import($filepath, &$context) {
}
/**
+ * Implements callback_batch_finished().
+ *
* Finished callback of system page locale import batch.
* Inform the user of translation files imported.
*/
@@ -2334,6 +2377,8 @@ function _locale_batch_system_finished($success, $results) {
}
/**
+ * Implements callback_batch_finished().
+ *
* Finished callback of language addition locale import batch.
* Inform the user of translation files imported.
*/
diff --git a/includes/mail.inc b/includes/mail.inc
index 0275922b..0e5c1780 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -566,7 +566,7 @@ function _drupal_wrap_mail_line(&$line, $key, $values) {
// Use soft-breaks only for purely quoted or unindented text.
$line = wordwrap($line, 77 - $values['length'], $values['soft'] ? " \n" : "\n");
// Break really long words at the maximum width allowed.
- $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n");
+ $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n", TRUE);
}
/**
diff --git a/includes/menu.inc b/includes/menu.inc
index 0e9c977c..4664d27e 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -229,12 +229,20 @@ define('MENU_CONTEXT_INLINE', 0x0002);
define('MENU_FOUND', 1);
/**
- * Internal menu status code -- Menu item was not found.
+ * Menu status code -- Not found.
+ *
+ * This can be used as the return value from a page callback, although it is
+ * preferable to use a load function to accomplish this; see the hook_menu()
+ * documentation for details.
*/
define('MENU_NOT_FOUND', 2);
/**
- * Internal menu status code -- Menu item access is denied.
+ * Menu status code -- Access denied.
+ *
+ * This can be used as the return value from a page callback, although it is
+ * preferable to use an access callback to accomplish this; see the hook_menu()
+ * documentation for details.
*/
define('MENU_ACCESS_DENIED', 3);
@@ -431,7 +439,7 @@ function menu_set_item($path, $router_item) {
*
* @param $path
* The path; for example, 'node/5'. The function will find the corresponding
- * node/% item and return that.
+ * node/% item and return that. Defaults to the current path.
* @param $router_item
* Internal use only.
*
@@ -1598,6 +1606,7 @@ function _menu_tree_data(&$links, $parents, $depth) {
* Implements template_preprocess_HOOK() for theme_menu_tree().
*/
function template_preprocess_menu_tree(&$variables) {
+ $variables['#tree'] = $variables['tree'];
$variables['tree'] = $variables['tree']['#children'];
}
@@ -2411,7 +2420,7 @@ function menu_set_active_trail($new_trail = NULL) {
// argument placeholders (%). Such links are not contained in regular
// menu trees, and have only been loaded for the additional
// translation that happens here, so as to be able to display them in
- // the breadcumb for the current page.
+ // the breadcrumb for the current page.
// @see _menu_tree_check_access()
// @see _menu_link_translate()
if (strpos($link['href'], '%') !== FALSE) {
@@ -2613,10 +2622,30 @@ function menu_get_active_breadcrumb() {
*/
function menu_get_active_title() {
$active_trail = menu_get_active_trail();
+ $local_task_title = NULL;
foreach (array_reverse($active_trail) as $item) {
- if (!(bool) ($item['type'] & MENU_IS_LOCAL_TASK)) {
- return $item['title'];
+ // Local task titles are displayed as tabs and therefore should not be
+ // repeated as the page title. However, if the local task appears in a
+ // top-level menu, it is no longer a "local task" anymore (the front page
+ // of the site does not have tabs) so it is better to use the local task
+ // title in that case than to fall back on the front page link in the
+ // active trail (which is usually "Home" and would not make sense in this
+ // context).
+ if ((bool) ($item['type'] & MENU_IS_LOCAL_TASK)) {
+ // A local task title is being skipped; track it in case it needs to be
+ // used later.
+ $local_task_title = $item['title'];
+ }
+ else {
+ // This is not a local task, so use it for the page title (unless the
+ // conditions described above are met).
+ if (isset($local_task_title) && isset($item['href']) && $item['href'] == '') {
+ return $local_task_title;
+ }
+ else {
+ return $item['title'];
+ }
}
}
}
@@ -2654,7 +2683,7 @@ function menu_link_load($mlid) {
}
/**
- * Clears the cached cached data for a single named menu.
+ * Clears the cached data for a single named menu.
*/
function menu_cache_clear($menu_name = 'navigation') {
$cache_cleared = &drupal_static(__FUNCTION__, array());
diff --git a/includes/module.inc b/includes/module.inc
index 494924f5..2e251080 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -227,6 +227,10 @@ function system_list_reset() {
drupal_static_reset('list_themes');
cache_clear_all('bootstrap_modules', 'cache_bootstrap');
cache_clear_all('system_list', 'cache_bootstrap');
+
+ // Clean up the bootstrap file scan cache.
+ drupal_static_reset('_drupal_file_scan_cache');
+ cache_clear_all('_drupal_file_scan_cache', 'cache_bootstrap');
}
/**
@@ -320,16 +324,27 @@ function module_load_install($module) {
* The name of the included file, if successful; FALSE otherwise.
*/
function module_load_include($type, $module, $name = NULL) {
+ static $files = array();
+
if (!isset($name)) {
$name = $module;
}
+ $key = $type . ':' . $module . ':' . $name;
+ if (isset($files[$key])) {
+ return $files[$key];
+ }
+
if (function_exists('drupal_get_path')) {
$file = DRUPAL_ROOT . '/' . drupal_get_path('module', $module) . "/$name.$type";
if (is_file($file)) {
require_once $file;
+ $files[$key] = $file;
return $file;
}
+ else {
+ $files[$key] = FALSE;
+ }
}
return FALSE;
}
@@ -365,20 +380,22 @@ function module_load_all_includes($type, $name = NULL) {
* - Invoke hook_modules_installed().
* - Invoke hook_modules_enabled().
*
- * @param $module_list
+ * @param string[] $module_list
* An array of module names.
- * @param $enable_dependencies
+ * @param bool $enable_dependencies
* If TRUE, dependencies will automatically be added and enabled in the
* correct order. This incurs a significant performance cost, so use FALSE
* if you know $module_list is already complete and in the correct order.
*
- * @return
+ * @return bool
* FALSE if one or more dependencies are missing, TRUE otherwise.
*
* @see hook_install()
* @see hook_enable()
* @see hook_modules_installed()
* @see hook_modules_enabled()
+ * @see module_disable()
+ * @see drupal_uninstall_modules()
*/
function module_enable($module_list, $enable_dependencies = TRUE) {
if ($enable_dependencies) {
@@ -505,12 +522,15 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
/**
* Disables a given set of modules.
*
- * @param $module_list
+ * @param string[] $module_list
* An array of module names.
- * @param $disable_dependents
+ * @param bool $disable_dependents
* If TRUE, dependent modules will automatically be added and disabled in the
* correct order. This incurs a significant performance cost, so use FALSE
* if you know $module_list is already complete and in the correct order.
+ *
+ * @see drupal_uninstall_modules()
+ * @see module_enable()
*/
function module_disable($module_list, $disable_dependents = TRUE) {
if ($disable_dependents) {
@@ -676,12 +696,16 @@ function module_hook($module, $hook) {
/**
* Determines which modules are implementing a hook.
*
- * @param $hook
+ * Lazy-loaded include files specified with "group" via hook_hook_info() or
+ * hook_module_implements_alter() will be automatically included by this
+ * function when necessary.
+ *
+ * @param string $hook
* The name of the hook (e.g. "help" or "menu").
- * @param $sort
+ * @param bool $sort
* By default, modules are ordered by weight and filename, settings this option
* to TRUE, module list will be ordered by module name.
- * @param $reset
+ * @param bool $reset
* For internal use only: Whether to force the stored list of hook
* implementations to be regenerated (such as after enabling a new module,
* before processing hook_enable).
@@ -696,8 +720,10 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) {
static $drupal_static_fast;
if (!isset($drupal_static_fast)) {
$drupal_static_fast['implementations'] = &drupal_static(__FUNCTION__);
+ $drupal_static_fast['verified'] = &drupal_static(__FUNCTION__ . ':verified');
}
$implementations = &$drupal_static_fast['implementations'];
+ $verified = &$drupal_static_fast['verified'];
// We maintain a persistent cache of hook implementations in addition to the
// static cache to avoid looping through every module and every hook on each
@@ -711,14 +737,19 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) {
// per request.
if ($reset) {
$implementations = array();
+ $verified = array();
cache_set('module_implements', array(), 'cache_bootstrap');
drupal_static_reset('module_hook_info');
drupal_static_reset('drupal_alter');
cache_clear_all('hook_info', 'cache_bootstrap');
+ cache_clear_all('system_cache_tables', 'cache');
return;
}
// Fetch implementations from cache.
+ // This happens on the first call to module_implements(*, *, FALSE) during a
+ // request, but also when $implementations have been reset, e.g. after
+ // module_enable().
if (empty($implementations)) {
$implementations = cache_get('module_implements', 'cache_bootstrap');
if ($implementations === FALSE) {
@@ -727,12 +758,17 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) {
else {
$implementations = $implementations->data;
}
+ // Forget all previously "verified" hooks, in case that $implementations
+ // were cleared via drupal_static_reset('module_implements') instead of
+ // module_implements(*, *, TRUE).
+ $verified = array();
}
if (!isset($implementations[$hook])) {
// The hook is not cached, so ensure that whether or not it has
// implementations, that the cache is updated at the end of the request.
$implementations['#write_cache'] = TRUE;
+ // Discover implementations for this hook.
$hook_info = module_hook_info();
$implementations[$hook] = array();
$list = module_list(FALSE, FALSE, $sort);
@@ -744,13 +780,31 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) {
$implementations[$hook][$module] = $include_file ? $hook_info[$hook]['group'] : FALSE;
}
}
- // Allow modules to change the weight of specific implementations but avoid
+ // Allow modules to change the weight of specific implementations, but avoid
// an infinite loop.
if ($hook != 'module_implements_alter') {
+ // Remember the implementations before hook_module_implements_alter().
+ $implementations_before = $implementations[$hook];
drupal_alter('module_implements', $implementations[$hook], $hook);
+ // Verify implementations that were added or modified.
+ foreach (array_diff_assoc($implementations[$hook], $implementations_before) as $module => $group) {
+ // If drupal_alter('module_implements') changed or added a $group, the
+ // respective file needs to be included.
+ if ($group) {
+ module_load_include('inc', $module, "$module.$group");
+ }
+ // If a new implementation was added, verify that the function exists.
+ if (!function_exists($module . '_' . $hook)) {
+ unset($implementations[$hook][$module]);
+ }
+ }
}
+ // Implementations for this hook are now "verified".
+ $verified[$hook] = TRUE;
}
- else {
+ elseif (!isset($verified[$hook])) {
+ // Implementations for this hook were in the cache, but they are not
+ // "verified" yet.
foreach ($implementations[$hook] as $module => $group) {
// If this hook implementation is stored in a lazy-loaded file, so include
// that file first.
@@ -769,6 +823,7 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) {
$implementations['#write_cache'] = TRUE;
}
}
+ $verified[$hook] = TRUE;
}
return array_keys($implementations[$hook]);
@@ -833,6 +888,11 @@ function module_hook_info() {
* @see module_implements()
*/
function module_implements_write_cache() {
+ // The list of implementations includes vital modules only before full
+ // bootstrap, so do not write cache if we are not fully bootstrapped yet.
+ if (drupal_get_bootstrap_phase() != DRUPAL_BOOTSTRAP_FULL) {
+ return;
+ }
$implementations = &drupal_static('module_implements');
if (isset($implementations['#write_cache'])) {
unset($implementations['#write_cache']);
@@ -880,7 +940,9 @@ function module_invoke($module, $hook) {
*
* @return
* An array of return values of the hook implementations. If modules return
- * arrays from their implementations, those are merged into one array.
+ * arrays from their implementations, those are merged into one array
+ * recursively. Note: integer keys in arrays will be lost, as the merge is
+ * done using array_merge_recursive().
*
* @see drupal_alter()
*/
diff --git a/includes/path.inc b/includes/path.inc
index 2e357111..6bd48d30 100644
--- a/includes/path.inc
+++ b/includes/path.inc
@@ -347,7 +347,8 @@ function drupal_match_path($path, $patterns) {
* drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL) makes this function available.
*
* @return
- * The current Drupal URL path.
+ * The current Drupal URL path. The path is untrusted user input and must be
+ * treated as such.
*
* @see request_path()
*/
diff --git a/includes/registry.inc b/includes/registry.inc
index ac5b035d..b035cc37 100644
--- a/includes/registry.inc
+++ b/includes/registry.inc
@@ -180,7 +180,7 @@ function _registry_parse_files($files) {
* (optional) Weight of the module.
*/
function _registry_parse_file($filename, $contents, $module = '', $weight = 0) {
- if (preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface)\s+([a-zA-Z0-9_]+)/m', $contents, $matches)) {
+ if (preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface|trait)\s+([a-zA-Z0-9_]+)/m', $contents, $matches)) {
foreach ($matches[2] as $key => $name) {
db_merge('registry')
->key(array(
diff --git a/includes/session.inc b/includes/session.inc
index 84d1983b..25aa3475 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -163,7 +163,7 @@ function _drupal_session_write($sid, $value) {
try {
if (!drupal_save_session()) {
// We don't have anything to do if we are not allowed to save the session.
- return;
+ return TRUE;
}
// Check whether $_SESSION has been changed in this request.
@@ -425,7 +425,7 @@ function _drupal_session_destroy($sid) {
// Nothing to do if we are not allowed to change the session.
if (!drupal_save_session()) {
- return;
+ return TRUE;
}
// Delete session data.
@@ -446,6 +446,8 @@ function _drupal_session_destroy($sid) {
elseif (variable_get('https', FALSE)) {
_drupal_session_delete_cookie('S' . session_name(), TRUE);
}
+
+ return TRUE;
}
/**
diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc
index 48829388..232ff143 100644
--- a/includes/stream_wrappers.inc
+++ b/includes/stream_wrappers.inc
@@ -133,7 +133,7 @@ interface DrupalStreamWrapperInterface extends StreamWrapperInterface {
* @param $uri
* A string containing the URI that should be used for this instance.
*/
- function setUri($uri);
+ public function setUri($uri);
/**
* Returns the stream resource URI.
@@ -219,7 +219,6 @@ interface DrupalStreamWrapperInterface extends StreamWrapperInterface {
public function dirname($uri = NULL);
}
-
/**
* Drupal stream wrapper base class for local files.
*
@@ -549,6 +548,155 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
return fclose($this->handle);
}
+ /**
+ * Sets metadata on the stream.
+ *
+ * WARNING: Do not call this method directly! It will be called internally by
+ * PHP itself when one of the following functions is called on a stream URL:
+ *
+ * @param string $uri
+ * A string containing the URI to the file to set metadata on.
+ * @param int $option
+ * One of:
+ * - STREAM_META_TOUCH: The method was called in response to touch().
+ * - STREAM_META_OWNER_NAME: The method was called in response to chown()
+ * with string parameter.
+ * - STREAM_META_OWNER: The method was called in response to chown().
+ * - STREAM_META_GROUP_NAME: The method was called in response to chgrp().
+ * - STREAM_META_GROUP: The method was called in response to chgrp().
+ * - STREAM_META_ACCESS: The method was called in response to chmod().
+ * @param mixed $value
+ * If option is:
+ * - STREAM_META_TOUCH: Array consisting of two arguments of the touch()
+ * function.
+ * - STREAM_META_OWNER_NAME or STREAM_META_GROUP_NAME: The name of the owner
+ * user/group as string.
+ * - STREAM_META_OWNER or STREAM_META_GROUP: The value of the owner
+ * user/group as integer.
+ * - STREAM_META_ACCESS: The argument of the chmod() as integer.
+ *
+ * @return bool
+ * Returns TRUE on success or FALSE on failure. If $option is not
+ * implemented, FALSE should be returned.
+ *
+ * @see touch()
+ * @see chmod()
+ * @see chown()
+ * @see chgrp()
+ * @link http://php.net/manual/streamwrapper.stream-metadata.php
+ */
+ public function stream_metadata($uri, $option, $value) {
+ $target = $this->getLocalPath($uri);
+ $return = FALSE;
+ switch ($option) {
+ case STREAM_META_TOUCH:
+ if (!empty($value)) {
+ $return = touch($target, $value[0], $value[1]);
+ }
+ else {
+ $return = touch($target);
+ }
+ break;
+
+ case STREAM_META_OWNER_NAME:
+ case STREAM_META_OWNER:
+ $return = chown($target, $value);
+ break;
+
+ case STREAM_META_GROUP_NAME:
+ case STREAM_META_GROUP:
+ $return = chgrp($target, $value);
+ break;
+
+ case STREAM_META_ACCESS:
+ $return = chmod($target, $value);
+ break;
+ }
+ if ($return) {
+ // For convenience clear the file status cache of the underlying file,
+ // since metadata operations are often followed by file status checks.
+ clearstatcache(TRUE, $target);
+ }
+ return $return;
+ }
+
+ /**
+ * Truncate stream.
+ *
+ * Will respond to truncation; e.g., through ftruncate().
+ *
+ * @param int $new_size
+ * The new size.
+ *
+ * @return bool
+ * TRUE on success, FALSE otherwise.
+ */
+ public function stream_truncate($new_size) {
+ return ftruncate($this->handle, $new_size);
+ }
+
+ /**
+ * Retrieve the underlying stream resource.
+ *
+ * This method is called in response to stream_select().
+ *
+ * @param int $cast_as
+ * Can be STREAM_CAST_FOR_SELECT when stream_select() is calling
+ * stream_cast() or STREAM_CAST_AS_STREAM when stream_cast() is called for
+ * other uses.
+ *
+ * @return resource|false
+ * The underlying stream resource or FALSE if stream_select() is not
+ * supported.
+ *
+ * @see stream_select()
+ * @link http://php.net/manual/streamwrapper.stream-cast.php
+ */
+ public function stream_cast($cast_as) {
+ return $this->handle ? $this->handle : FALSE;
+ }
+
+ /**
+ * Change stream options.
+ *
+ * This method is called to set options on the stream.
+ *
+ * Since Windows systems do not allow it and it is not needed for most use
+ * cases anyway, this method is not supported on local files and will trigger
+ * an error and return false. If needed, custom subclasses can provide
+ * OS-specific implementations for advanced use cases.
+ *
+ * @param int $option
+ * One of:
+ * - STREAM_OPTION_BLOCKING: The method was called in response to
+ * stream_set_blocking().
+ * - STREAM_OPTION_READ_TIMEOUT: The method was called in response to
+ * stream_set_timeout().
+ * - STREAM_OPTION_WRITE_BUFFER: The method was called in response to
+ * stream_set_write_buffer().
+ * @param int $arg1
+ * If option is:
+ * - STREAM_OPTION_BLOCKING: The requested blocking mode:
+ * - 1 means blocking.
+ * - 0 means not blocking.
+ * - STREAM_OPTION_READ_TIMEOUT: The timeout in seconds.
+ * - STREAM_OPTION_WRITE_BUFFER: The buffer mode, STREAM_BUFFER_NONE or
+ * STREAM_BUFFER_FULL.
+ * @param int $arg2
+ * If option is:
+ * - STREAM_OPTION_BLOCKING: This option is not set.
+ * - STREAM_OPTION_READ_TIMEOUT: The timeout in microseconds.
+ * - STREAM_OPTION_WRITE_BUFFER: The requested buffer size.
+ *
+ * @return bool
+ * TRUE on success, FALSE otherwise. If $option is not implemented, FALSE
+ * should be returned.
+ */
+ public function stream_set_option($option, $arg1, $arg2) {
+ trigger_error('stream_set_option() not supported for local file based stream wrappers', E_USER_WARNING);
+ return FALSE;
+ }
+
/**
* Support for unlink().
*
diff --git a/includes/theme.inc b/includes/theme.inc
index 8d5348df..9b606e9f 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1248,6 +1248,7 @@ function path_to_theme() {
function drupal_find_theme_functions($cache, $prefixes) {
$implementations = array();
$functions = get_defined_functions();
+ $theme_functions = preg_grep('/^(' . implode(')|(', $prefixes) . ')_/', $functions['user']);
foreach ($cache as $hook => $info) {
foreach ($prefixes as $prefix) {
@@ -1264,7 +1265,7 @@ function drupal_find_theme_functions($cache, $prefixes) {
// intermediary suggestion.
$pattern = isset($info['pattern']) ? $info['pattern'] : ($hook . '__');
if (!isset($info['base hook']) && !empty($pattern)) {
- $matches = preg_grep('/^' . $prefix . '_' . $pattern . '/', $functions['user']);
+ $matches = preg_grep('/^' . $prefix . '_' . $pattern . '/', $theme_functions);
if ($matches) {
foreach ($matches as $match) {
$new_hook = substr($match, strlen($prefix) + 1);
@@ -1710,11 +1711,29 @@ function theme_status_messages($variables) {
* copy if none of the enabled modules or the active theme implement any
* preprocess or process functions or override this theme implementation.
*
- * @param $variables
- * An associative array containing the keys 'text', 'path', and 'options'.
- * See the l() function for information about these variables.
+ * @param array $variables
+ * An associative array containing the keys:
+ * - text: The text of the link.
+ * - path: The internal path or external URL being linked to. It is used as
+ * the $path parameter of the url() function.
+ * - options: (optional) An array that defaults to empty, but can contain:
+ * - attributes: Can contain optional attributes:
+ * - class: must be declared in an array. Example: 'class' =>
+ * array('class_name1','class_name2').
+ * - title: must be a string. Example: 'title' => 'Example title'
+ * - Others are more flexible as long as they work with
+ * drupal_attributes($variables['options']['attributes]).
+ * - html: Boolean flag that tells whether text contains HTML or plain
+ * text. If set to TRUE, the text value will not be sanitized so the
+ calling function must ensure that it already contains safe HTML.
+ * The elements $variables['options']['attributes'] and
+ * $variables['options']['html'] are used in this function similarly to the
+ * way that $options['attributes'] and $options['html'] are used in l().
+ * The link itself is built by the url() function, which takes
+ * $variables['path'] and $variables['options'] as arguments.
*
* @see l()
+ * @see url()
*/
function theme_link($variables) {
return '' . ($variables['options']['html'] ? $variables['text'] : check_plain($variables['text'])) . '';
@@ -1791,7 +1810,8 @@ function theme_links($variables) {
foreach ($links as $key => $link) {
$class = array($key);
- // Add first, last and active classes to the list of links to help out themers.
+ // Add first, last and active classes to the list of links to help out
+ // themers.
if ($i == 1) {
$class[] = 'first';
}
@@ -1809,7 +1829,8 @@ function theme_links($variables) {
$output .= l($link['title'], $link['href'], $link);
}
elseif (!empty($link['title'])) {
- // Some links are actually not links, but we wrap these in for adding title and class attributes.
+ // Some links are actually not links, but we wrap these in for
+ // adding title and class attributes.
if (empty($link['html'])) {
$link['title'] = check_plain($link['title']);
}
@@ -2618,7 +2639,7 @@ function template_preprocess_page(&$variables) {
// Move some variables to the top level for themer convenience and template cleanliness.
$variables['show_messages'] = $variables['page']['#show_messages'];
- foreach (system_region_list($GLOBALS['theme']) as $region_key => $region_name) {
+ foreach (system_region_list($GLOBALS['theme'], REGIONS_ALL, FALSE) as $region_key) {
if (!isset($variables['page'][$region_key])) {
$variables['page'][$region_key] = array();
}
diff --git a/includes/update.inc b/includes/update.inc
index a17161c9..2167db79 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -795,6 +795,14 @@ function update_fix_d7_requirements() {
function update_fix_d7_install_profile() {
$profile = drupal_get_profile();
+ // 'Default' profile has been renamed to 'Standard' in D7.
+ // We change the profile here to prevent a broken record in the system table.
+ // See system_update_7049().
+ if ($profile == 'default') {
+ $profile = 'standard';
+ variable_set('install_profile', $profile);
+ }
+
$results = db_select('system', 's')
->fields('s', array('name', 'schema_version'))
->condition('name', $profile)
@@ -908,6 +916,8 @@ function update_get_d6_session_name() {
}
/**
+ * Implements callback_batch_operation().
+ *
* Performs one update and stores the results for display on the results page.
*
* If an update function completes successfully, it should return a message
@@ -1078,6 +1088,8 @@ function update_batch($start, $redirect = NULL, $url = NULL, $batch = array(), $
}
/**
+ * Implements callback_batch_finished().
+ *
* Finishes the update process and stores the results for eventual display.
*
* After the updates run, all caches are flushed. The update results are
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index 8655c05b..c334de15 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -264,6 +264,10 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) {
*/
function xmlrpc_server_multicall($methodcalls) {
// See http://www.xmlrpc.com/discuss/msgReader$1208
+ // To avoid multicall expansion attacks, limit the number of duplicate method
+ // calls allowed with a default of 1. Set to -1 for unlimited.
+ $duplicate_method_limit = variable_get('xmlrpc_multicall_duplicate_method_limit', 1);
+ $method_count = array();
$return = array();
$xmlrpc_server = xmlrpc_server_get();
foreach ($methodcalls as $call) {
@@ -273,10 +277,14 @@ function xmlrpc_server_multicall($methodcalls) {
$ok = FALSE;
}
$method = $call['methodName'];
+ $method_count[$method] = isset($method_count[$method]) ? $method_count[$method] + 1 : 1;
$params = $call['params'];
if ($method == 'system.multicall') {
$result = xmlrpc_error(-32600, t('Recursive calls to system.multicall are forbidden.'));
}
+ elseif ($duplicate_method_limit > 0 && $method_count[$method] > $duplicate_method_limit) {
+ $result = xmlrpc_error(-156579, t('Too many duplicate method calls in system.multicall.'));
+ }
elseif ($ok) {
$result = xmlrpc_server_call($xmlrpc_server, $method, $params);
}
diff --git a/misc/ajax.js b/misc/ajax.js
index bb4a6e14..c944ebbf 100644
--- a/misc/ajax.js
+++ b/misc/ajax.js
@@ -476,7 +476,7 @@ Drupal.ajax.prototype.getEffect = function (response) {
* Handler for the form redirection error.
*/
Drupal.ajax.prototype.error = function (xmlhttprequest, uri, customMessage) {
- alert(Drupal.ajaxError(xmlhttprequest, uri, customMessage));
+ Drupal.displayAjaxError(Drupal.ajaxError(xmlhttprequest, uri, customMessage));
// Remove the progress element.
if (this.progress.element) {
$(this.progress.element).remove();
diff --git a/misc/autocomplete.js b/misc/autocomplete.js
index d71441b6..af090713 100644
--- a/misc/autocomplete.js
+++ b/misc/autocomplete.js
@@ -310,7 +310,7 @@ Drupal.ACDB.prototype.search = function (searchString) {
}
},
error: function (xmlhttp) {
- alert(Drupal.ajaxError(xmlhttp, db.uri));
+ Drupal.displayAjaxError(Drupal.ajaxError(xmlhttp, db.uri));
}
});
}, this.delay);
diff --git a/misc/drupal.js b/misc/drupal.js
index 427c4a1e..19fbc712 100644
--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -27,6 +27,42 @@ $.fn.init = function (selector, context, rootjQuery) {
};
$.fn.init.prototype = jquery_init.prototype;
+/**
+ * Pre-filter Ajax requests to guard against XSS attacks.
+ *
+ * See https://github.com/jquery/jquery/issues/2432
+ */
+if ($.ajaxPrefilter) {
+ // For newer versions of jQuery, use an Ajax prefilter to prevent
+ // auto-executing script tags from untrusted domains. This is similar to the
+ // fix that is built in to jQuery 3.0 and higher.
+ $.ajaxPrefilter(function (s) {
+ if (s.crossDomain) {
+ s.contents.script = false;
+ }
+ });
+}
+else if ($.httpData) {
+ // For the version of jQuery that ships with Drupal core, override
+ // jQuery.httpData to prevent auto-detecting "script" data types from
+ // untrusted domains.
+ var jquery_httpData = $.httpData;
+ $.httpData = function (xhr, type, s) {
+ // @todo Consider backporting code from newer jQuery versions to check for
+ // a cross-domain request here, rather than using Drupal.urlIsLocal() to
+ // block scripts from all URLs that are not on the same site.
+ if (!type && !Drupal.urlIsLocal(s.url)) {
+ var content_type = xhr.getResponseHeader('content-type') || '';
+ if (content_type.indexOf('javascript') >= 0) {
+ // Default to a safe data type.
+ type = 'text';
+ }
+ }
+ return jquery_httpData.call(this, xhr, type, s);
+ };
+ $.httpData.prototype = jquery_httpData.prototype;
+}
+
/**
* Attach all registered behaviors to a page element.
*
@@ -137,7 +173,7 @@ Drupal.detachBehaviors = function (context, settings, trigger) {
*/
Drupal.checkPlain = function (str) {
var character, regex,
- replace = { '&': '&', '"': '"', '<': '<', '>': '>' };
+ replace = { '&': '&', "'": ''', '"': '"', '<': '<', '>': '>' };
str = String(str);
for (character in replace) {
if (replace.hasOwnProperty(character)) {
@@ -168,23 +204,76 @@ Drupal.checkPlain = function (str) {
Drupal.formatString = function(str, args) {
// Transform arguments before inserting them.
for (var key in args) {
- switch (key.charAt(0)) {
- // Escaped only.
- case '@':
- args[key] = Drupal.checkPlain(args[key]);
- break;
- // Pass-through.
- case '!':
- break;
- // Escaped and placeholder.
- case '%':
- default:
- args[key] = Drupal.theme('placeholder', args[key]);
- break;
+ if (args.hasOwnProperty(key)) {
+ switch (key.charAt(0)) {
+ // Escaped only.
+ case '@':
+ args[key] = Drupal.checkPlain(args[key]);
+ break;
+ // Pass-through.
+ case '!':
+ break;
+ // Escaped and placeholder.
+ default:
+ args[key] = Drupal.theme('placeholder', args[key]);
+ break;
+ }
}
- str = str.replace(key, args[key]);
}
- return str;
+
+ return Drupal.stringReplace(str, args, null);
+};
+
+/**
+ * Replace substring.
+ *
+ * The longest keys will be tried first. Once a substring has been replaced,
+ * its new value will not be searched again.
+ *
+ * @param {String} str
+ * A string with placeholders.
+ * @param {Object} args
+ * Key-value pairs.
+ * @param {Array|null} keys
+ * Array of keys from the "args". Internal use only.
+ *
+ * @return {String}
+ * Returns the replaced string.
+ */
+Drupal.stringReplace = function (str, args, keys) {
+ if (str.length === 0) {
+ return str;
+ }
+
+ // If the array of keys is not passed then collect the keys from the args.
+ if (!$.isArray(keys)) {
+ keys = [];
+ for (var k in args) {
+ if (args.hasOwnProperty(k)) {
+ keys.push(k);
+ }
+ }
+
+ // Order the keys by the character length. The shortest one is the first.
+ keys.sort(function (a, b) { return a.length - b.length; });
+ }
+
+ if (keys.length === 0) {
+ return str;
+ }
+
+ // Take next longest one from the end.
+ var key = keys.pop();
+ var fragments = str.split(key);
+
+ if (keys.length) {
+ for (var i = 0; i < fragments.length; i++) {
+ // Process each fragment with a copy of remaining keys.
+ fragments[i] = Drupal.stringReplace(fragments[i], args, keys.slice(0));
+ }
+ }
+
+ return fragments.join(args[key]);
};
/**
@@ -251,7 +340,7 @@ Drupal.t = function (str, args, options) {
* A translated string.
*/
Drupal.formatPlural = function (count, singular, plural, args, options) {
- var args = args || {};
+ args = args || {};
args['@count'] = count;
// Determine the index of the plural form.
var index = Drupal.locale.pluralFormula ? Drupal.locale.pluralFormula(args['@count']) : ((args['@count'] == 1) ? 0 : 1);
@@ -413,6 +502,29 @@ Drupal.getSelection = function (element) {
return { 'start': element.selectionStart, 'end': element.selectionEnd };
};
+/**
+ * Add a global variable which determines if the window is being unloaded.
+ *
+ * This is primarily used by Drupal.displayAjaxError().
+ */
+Drupal.beforeUnloadCalled = false;
+$(window).bind('beforeunload pagehide', function () {
+ Drupal.beforeUnloadCalled = true;
+});
+
+/**
+ * Displays a JavaScript error from an Ajax response when appropriate to do so.
+ */
+Drupal.displayAjaxError = function (message) {
+ // Skip displaying the message if the user deliberately aborted (for example,
+ // by reloading the page or navigating to a different page) while the Ajax
+ // request was still ongoing. See, for example, the discussion at
+ // http://stackoverflow.com/questions/699941/handle-ajax-error-when-a-user-clicks-refresh.
+ if (!Drupal.beforeUnloadCalled) {
+ alert(message);
+ }
+};
+
/**
* Build an error message from an Ajax response.
*/
diff --git a/misc/states.js b/misc/states.js
index 6d98da81..5aac65d2 100644
--- a/misc/states.js
+++ b/misc/states.js
@@ -493,7 +493,11 @@ $(document).bind('state:disabled', function(e) {
$(document).bind('state:required', function(e) {
if (e.trigger) {
if (e.value) {
- $(e.target).closest('.form-item, .form-wrapper').find('label').append('*');
+ var $label = $(e.target).closest('.form-item, .form-wrapper').find('label');
+ // Avoids duplicate required markers on initialization.
+ if (!$label.find('.form-required').length) {
+ $label.append('*');
+ }
}
else {
$(e.target).closest('.form-item, .form-wrapper').find('label .form-required').remove();
diff --git a/misc/tabledrag.js b/misc/tabledrag.js
index 3cc27019..7ea88b60 100644
--- a/misc/tabledrag.js
+++ b/misc/tabledrag.js
@@ -106,8 +106,10 @@ Drupal.tableDrag = function (table, tableSettings) {
// Add mouse bindings to the document. The self variable is passed along
// as event handlers do not have direct access to the tableDrag object.
- $(document).bind('mousemove', function (event) { return self.dragRow(event, self); });
- $(document).bind('mouseup', function (event) { return self.dropRow(event, self); });
+ $(document).bind('mousemove pointermove', function (event) { return self.dragRow(event, self); });
+ $(document).bind('mouseup pointerup', function (event) { return self.dropRow(event, self); });
+ $(document).bind('touchmove', function (event) { return self.dragRow(event.originalEvent.touches[0], self); });
+ $(document).bind('touchend', function (event) { return self.dropRow(event.originalEvent.touches[0], self); });
};
/**
@@ -274,7 +276,10 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) {
});
// Add the mousedown action for the handle.
- handle.mousedown(function (event) {
+ handle.bind('mousedown touchstart pointerdown', function (event) {
+ if (event.originalEvent.type == "touchstart") {
+ event = event.originalEvent.touches[0];
+ }
// Create a new dragObject recording the event information.
self.dragObject = {};
self.dragObject.initMouseOffset = self.getMouseOffset(item, event);
@@ -575,12 +580,20 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) {
* Get the mouse coordinates from the event (allowing for browser differences).
*/
Drupal.tableDrag.prototype.mouseCoords = function (event) {
+ // Complete support for pointer events was only introduced to jQuery in
+ // version 1.11.1; between versions 1.7 and 1.11.0 pointer events have the
+ // clientX and clientY properties undefined. In those cases, the properties
+ // must be retrieved from the event.originalEvent object instead.
+ var clientX = event.clientX || event.originalEvent.clientX;
+ var clientY = event.clientY || event.originalEvent.clientY;
+
if (event.pageX || event.pageY) {
return { x: event.pageX, y: event.pageY };
}
+
return {
- x: event.clientX + document.body.scrollLeft - document.body.clientLeft,
- y: event.clientY + document.body.scrollTop - document.body.clientTop
+ x: clientX + document.body.scrollLeft - document.body.clientLeft,
+ y: clientY + document.body.scrollTop - document.body.clientTop
};
};
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index e7e8fa55..2d84f9d1 100644
--- a/modules/aggregator/aggregator.info
+++ b/modules/aggregator/aggregator.info
@@ -7,8 +7,7 @@ files[] = aggregator.test
configure = admin/config/services/aggregator/settings
stylesheets[all][] = aggregator.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 70f8c5cd..02c9ec46 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -455,6 +455,14 @@ function aggregator_save_category($edit) {
db_delete('aggregator_category')
->condition('cid', $edit['cid'])
->execute();
+ // Remove category from feeds.
+ db_delete('aggregator_category_feed')
+ ->condition('cid', $edit['cid'])
+ ->execute();
+ // Remove category from feed items.
+ db_delete('aggregator_category_item')
+ ->condition('cid', $edit['cid'])
+ ->execute();
// Make sure there is no active block for this category.
if (module_exists('block')) {
db_delete('block')
diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc
index 44ed5499..534cca57 100644
--- a/modules/aggregator/aggregator.processor.inc
+++ b/modules/aggregator/aggregator.processor.inc
@@ -72,7 +72,7 @@ function aggregator_aggregator_remove($feed) {
*/
function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
if (in_array('aggregator', variable_get('aggregator_processors', array('aggregator')))) {
- $info = module_invoke('aggregator', 'aggregator_process', 'info');
+ $info = module_invoke('aggregator', 'aggregator_process_info');
$items = drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items');
$period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
$period[AGGREGATOR_CLEAR_NEVER] = t('Never');
diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test
index d84ee785..afa791d6 100644
--- a/modules/aggregator/aggregator.test
+++ b/modules/aggregator/aggregator.test
@@ -418,7 +418,7 @@ class CategorizeFeedTestCase extends AggregatorTestCase {
}
/**
- * Creates a feed and makes sure you can add more than one category to it.
+ * Creates a feed and makes sure you can add/delete categories to it.
*/
function testCategorizeFeed() {
@@ -448,7 +448,31 @@ class CategorizeFeedTestCase extends AggregatorTestCase {
// Assert the feed has two categories.
$this->getFeedCategories($db_feed);
$this->assertEqual(count($db_feed->categories), 2, 'Feed has 2 categories');
+
+ // Use aggregator_save_feed() to delete a category.
+ $category = reset($categories);
+ aggregator_save_category(array('cid' => $category->cid));
+
+ // Assert that category is deleted.
+ $db_category = db_query("SELECT COUNT(*) FROM {aggregator_category} WHERE cid = :cid", array(':cid' => $category->cid))->fetchField();
+ $this->assertFalse($db_category, format_string('The category %title has been deleted.', array('%title' => $category->title)));
+
+ // Assert that category has been removed from feed.
+ $categorized_feeds = db_query("SELECT COUNT(*) FROM {aggregator_category_feed} WHERE cid = :cid", array(':cid' => $category->cid))->fetchField();
+ $this->assertFalse($categorized_feeds, format_string('The category %title has been removed from feed %feed_title.', array('%title' => $category->title, '%feed_title' => $feed['title'])));
+
+ // Assert that no broken links (associated with the deleted category)
+ // appear on one of the other category pages.
+ $this->createSampleNodes();
+ $this->drupalGet('admin/config/services/aggregator');
+ $this->clickLink('update items');
+ $categories = $this->getCategories();
+ $category = reset($categories);
+ $this->drupalGet('aggregator/categories/' . $category->cid);
+ global $base_path;
+ $this->assertNoRaw(',');
}
+
}
/**
@@ -685,9 +709,21 @@ class CategorizeFeedItemTestCase extends AggregatorTestCase {
}
}
+ // Delete category from feed items when category is deleted.
+ $cid = reset($feed->categories);
+ $categories = $this->getCategories();
+ $category_title = $categories[$cid]->title;
+
+ // Delete category.
+ aggregator_save_category(array('cid' => $cid));
+
+ // Assert category has been removed from feed items.
+ $categorized_count = db_query("SELECT COUNT(*) FROM {aggregator_category_item} WHERE cid = :cid", array(':cid' => $cid))->fetchField();
+ $this->assertFalse($categorized_count, format_string('The category %title has been removed from feed items.', array('%title' => $category_title)));
// Delete feed.
$this->deleteFeed($feed);
}
+
}
/**
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index e862225f..91811fcd 100644
--- a/modules/aggregator/tests/aggregator_test.info
+++ b/modules/aggregator/tests/aggregator_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/block/block.api.php b/modules/block/block.api.php
index d7453b24..e38f7d6e 100644
--- a/modules/block/block.api.php
+++ b/modules/block/block.api.php
@@ -363,6 +363,31 @@ function hook_block_list_alter(&$blocks) {
}
}
+/**
+ * Act on block cache ID (cid) parts before the cid is generated.
+ *
+ * This hook allows you to add, remove or modify the custom keys used to
+ * generate a block cache ID (by default, these keys are set to the block
+ * module and delta). These keys will be combined with the standard ones
+ * provided by drupal_render_cid_parts() to generate the final block cache ID.
+ *
+ * To change the cache granularity used by drupal_render_cid_parts(), this hook
+ * cannot be used; instead, set the 'cache' key in the block's definition in
+ * hook_block_info().
+ *
+ * @params $cid_parts
+ * An array of elements used to build the cid.
+ * @param $block
+ * The block object being acted on.
+ *
+ * @see _block_get_cache_id()
+ */
+function hook_block_cid_parts_alter(&$cid_parts, $block) {
+ global $user;
+ // This example shows how to cache a block based on the user's timezone.
+ $cid_parts[] = $user->timezone;
+}
+
/**
* @} End of "addtogroup hooks".
*/
diff --git a/modules/block/block.info b/modules/block/block.info
index e5f66a7d..f3f2c7cf 100644
--- a/modules/block/block.info
+++ b/modules/block/block.info
@@ -6,8 +6,7 @@ core = 7.x
files[] = block.test
configure = admin/structure/block
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/block/block.js b/modules/block/block.js
index acd3f5ae..721dedf1 100644
--- a/modules/block/block.js
+++ b/modules/block/block.js
@@ -24,7 +24,7 @@ Drupal.behaviors.blockSettingsSummary = {
$('fieldset#edit-node-type', context).drupalSetSummary(function (context) {
var vals = [];
$('input[type="checkbox"]:checked', context).each(function () {
- vals.push($.trim($(this).next('label').text()));
+ vals.push($.trim($(this).next('label').html()));
});
if (!vals.length) {
vals.push(Drupal.t('Not restricted'));
@@ -35,7 +35,7 @@ Drupal.behaviors.blockSettingsSummary = {
$('fieldset#edit-role', context).drupalSetSummary(function (context) {
var vals = [];
$('input[type="checkbox"]:checked', context).each(function () {
- vals.push($.trim($(this).next('label').text()));
+ vals.push($.trim($(this).next('label').html()));
});
if (!vals.length) {
vals.push(Drupal.t('Not restricted'));
@@ -49,7 +49,7 @@ Drupal.behaviors.blockSettingsSummary = {
return Drupal.t('Not customizable');
}
else {
- return $radio.next('label').text();
+ return $radio.next('label').html();
}
});
}
diff --git a/modules/block/block.module b/modules/block/block.module
index 48c80d76..d68ea9e7 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -16,7 +16,7 @@ define('BLOCK_REGION_NONE', -1);
define('BLOCK_CUSTOM_FIXED', 0);
/**
- * Shows this block by default, but lets individual users hide it.
+ * Shows this block by default, but lets individual users hide it.
*/
define('BLOCK_CUSTOM_ENABLED', 1);
@@ -59,6 +59,7 @@ function block_help($path, $arg) {
$output .= '' . t('Users with the Administer blocks permission can add custom blocks, which are then listed on the Blocks administration page. Once created, custom blocks behave just like default and module-generated blocks.', array('@blocks' => url('admin/structure/block'), '@block-add' => url('admin/structure/block/add'))) . ' ';
$output .= '';
return $output;
+
case 'admin/structure/block/add':
return ''),
diff --git a/modules/field/modules/number/number.test b/modules/field/modules/number/number.test
index 88029cdd..839da36c 100644
--- a/modules/field/modules/number/number.test
+++ b/modules/field/modules/number/number.test
@@ -23,7 +23,7 @@ class NumberFieldTestCase extends DrupalWebTestCase {
function setUp() {
parent::setUp('field_test');
- $this->web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content', 'administer content types'));
+ $this->web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content', 'administer content types', 'administer fields'));
$this->drupalLogin($this->web_user);
}
@@ -152,4 +152,50 @@ class NumberFieldTestCase extends DrupalWebTestCase {
);
$this->drupalPost(NULL, $edit, t('Save'));
}
+
+ /**
+ * Test number_float field.
+ */
+ function testNumberFloatField() {
+ $this->field = array(
+ 'field_name' => drupal_strtolower($this->randomName()),
+ 'type' => 'number_float',
+ 'settings' => array(
+ 'precision' => 8, 'scale' => 4, 'decimal_separator' => '.',
+ )
+ );
+ field_create_field($this->field);
+ $this->instance = array(
+ 'field_name' => $this->field['field_name'],
+ 'entity_type' => 'test_entity',
+ 'bundle' => 'test_bundle',
+ 'widget' => array(
+ 'type' => 'number',
+ ),
+ 'display' => array(
+ 'default' => array(
+ 'type' => 'number_float',
+ ),
+ ),
+ );
+ field_create_instance($this->instance);
+
+ $langcode = LANGUAGE_NONE;
+ $value = array(
+ '9.' => '9',
+ '.' => '0',
+ '123.55' => '123.55',
+ '.55' => '0.55',
+ '-0.55' => '-0.55',
+ );
+ foreach($value as $key => $value) {
+ $edit = array(
+ "{$this->field['field_name']}[$langcode][0][value]" => $key,
+ );
+ $this->drupalPost('test-entity/add/test-bundle', $edit, t('Save'));
+ $this->assertNoText("PDOException");
+ $this->assertRaw($value, 'Correct value is displayed.');
+ }
+ }
+
}
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index 1a5ba124..71abf417 100644
--- a/modules/field/modules/options/options.info
+++ b/modules/field/modules/options/options.info
@@ -6,8 +6,7 @@ core = 7.x
dependencies[] = field
files[] = options.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module
index 3862ba77..041b84a6 100644
--- a/modules/field/modules/options/options.module
+++ b/modules/field/modules/options/options.module
@@ -185,6 +185,7 @@ function _options_properties($type, $multiple, $required, $has_value) {
$base = array(
'filter_xss' => FALSE,
'strip_tags' => FALSE,
+ 'strip_tags_and_unescape' => FALSE,
'empty_option' => FALSE,
'optgroups' => FALSE,
);
@@ -195,7 +196,7 @@ function _options_properties($type, $multiple, $required, $has_value) {
case 'select':
$properties = array(
// Select boxes do not support any HTML tag.
- 'strip_tags' => TRUE,
+ 'strip_tags_and_unescape' => TRUE,
'optgroups' => TRUE,
);
if ($multiple) {
@@ -271,9 +272,16 @@ function _options_prepare_options(&$options, $properties) {
_options_prepare_options($options[$value], $properties);
}
else {
+ // The 'strip_tags' option is deprecated. Use 'strip_tags_and_unescape'
+ // when plain text is required (and where the output will be run through
+ // check_plain() before being inserted back into HTML) or 'filter_xss'
+ // when HTML is required.
if ($properties['strip_tags']) {
$options[$value] = strip_tags($label);
}
+ if ($properties['strip_tags_and_unescape']) {
+ $options[$value] = decode_entities(strip_tags($label));
+ }
if ($properties['filter_xss']) {
$options[$value] = field_filter_xss($label);
}
diff --git a/modules/field/modules/options/options.test b/modules/field/modules/options/options.test
index 7183311b..321c2a4b 100644
--- a/modules/field/modules/options/options.test
+++ b/modules/field/modules/options/options.test
@@ -23,8 +23,15 @@ class OptionsWidgetsTestCase extends FieldTestCase {
'type' => 'list_integer',
'cardinality' => 1,
'settings' => array(
- // Make sure that 0 works as an option.
- 'allowed_values' => array(0 => 'Zero', 1 => 'One', 2 => 'Some & unescaped markup'),
+ 'allowed_values' => array(
+ // Make sure that 0 works as an option.
+ 0 => 'Zero',
+ 1 => 'One',
+ // Make sure that option text is properly sanitized.
+ 2 => 'Some & unescaped markup',
+ // Make sure that HTML entities in option text are not double-encoded.
+ 3 => 'Some HTML encoded markup with < & >',
+ ),
),
);
$this->card_1 = field_create_field($this->card_1);
@@ -35,8 +42,13 @@ class OptionsWidgetsTestCase extends FieldTestCase {
'type' => 'list_integer',
'cardinality' => 2,
'settings' => array(
- // Make sure that 0 works as an option.
- 'allowed_values' => array(0 => 'Zero', 1 => 'One', 2 => 'Some & unescaped markup'),
+ 'allowed_values' => array(
+ // Make sure that 0 works as an option.
+ 0 => 'Zero',
+ 1 => 'One',
+ // Make sure that option text is properly sanitized.
+ 2 => 'Some & unescaped markup',
+ ),
),
);
$this->card_2 = field_create_field($this->card_2);
@@ -47,14 +59,18 @@ class OptionsWidgetsTestCase extends FieldTestCase {
'type' => 'list_boolean',
'cardinality' => 1,
'settings' => array(
- // Make sure that 0 works as a 'on' value'.
- 'allowed_values' => array(1 => 'Zero', 0 => 'Some & unescaped markup'),
+ 'allowed_values' => array(
+ // Make sure that 1 works as a 'on' value'.
+ 1 => 'Zero',
+ // Make sure that option text is properly sanitized.
+ 0 => 'Some & unescaped markup',
+ ),
),
);
$this->bool = field_create_field($this->bool);
// Create a web user.
- $this->web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content'));
+ $this->web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content', 'administer fields'));
$this->drupalLogin($this->web_user);
}
@@ -233,6 +249,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->assertNoOptionSelected("edit-card-1-$langcode", 1);
$this->assertNoOptionSelected("edit-card-1-$langcode", 2);
$this->assertRaw('Some dangerous & unescaped markup', 'Option text was properly filtered.');
+ $this->assertRaw('Some HTML encoded markup with < & >', 'HTML entities in option text were properly handled and not double-encoded');
// Submit form: select invalid 'none' option.
$edit = array("card_1[$langcode]" => '_none');
@@ -459,7 +476,7 @@ class OptionsWidgetsTestCase extends FieldTestCase {
$this->assertNoFieldChecked("edit-bool-$langcode");
// Create admin user.
- $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer taxonomy'));
+ $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer taxonomy', 'administer fields'));
$this->drupalLogin($admin_user);
// Create a test field instance.
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index e8db6294..1de61433 100644
--- a/modules/field/modules/text/text.info
+++ b/modules/field/modules/text/text.info
@@ -7,8 +7,7 @@ dependencies[] = field
files[] = text.test
required = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index 68fc3cb4..bf0d29d5 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -223,11 +223,13 @@ function text_field_formatter_settings_form($field, $instance, $view_mode, $form
if (strpos($display['type'], '_trimmed') !== FALSE) {
$element['trim_length'] = array(
- '#title' => t('Trim length'),
+ '#title' => t('Trimmed limit'),
'#type' => 'textfield',
+ '#field_suffix' => t('characters'),
'#size' => 10,
'#default_value' => $settings['trim_length'],
'#element_validate' => array('element_validate_integer_positive'),
+ '#description' => t('If the summary is not set, the trimmed %label field will be shorter than this character limit.', array('%label' => $instance['label'])),
'#required' => TRUE,
);
}
@@ -245,7 +247,7 @@ function text_field_formatter_settings_summary($field, $instance, $view_mode) {
$summary = '';
if (strpos($display['type'], '_trimmed') !== FALSE) {
- $summary = t('Trim length') . ': ' . check_plain($settings['trim_length']);
+ $summary = t('Trimmed limit: @trim_length characters', array('@trim_length' => $settings['trim_length']));
}
return $summary;
diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test
index 2f147382..ad803cf4 100644
--- a/modules/field/modules/text/text.test
+++ b/modules/field/modules/text/text.test
@@ -424,6 +424,7 @@ class TextTranslationTestCase extends DrupalWebTestCase {
'administer content types',
'access administration pages',
'bypass node access',
+ 'administer fields',
filter_permission_name($full_html_format),
));
$this->translator = $this->drupalCreateUser(array('create article content', 'edit own article content', 'translate content'));
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index 0e66b280..fb1653fb 100644
--- a/modules/field/tests/field_test.info
+++ b/modules/field/tests/field_test.info
@@ -6,8 +6,7 @@ files[] = field_test.entity.inc
version = VERSION
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/theme/field.tpl.php b/modules/field/theme/field.tpl.php
index f0f9d583..460fd2e2 100644
--- a/modules/field/theme/field.tpl.php
+++ b/modules/field/theme/field.tpl.php
@@ -4,8 +4,10 @@
* @file field.tpl.php
* Default template implementation to display the value of a field.
*
- * This file is not used and is here as a starting point for customization only.
- * @see theme_field()
+ * This file is not used by Drupal core, which uses theme functions instead for
+ * performance reasons. The markup is the same, though, so if you want to use
+ * template files rather than functions to extend field theming, copy this to
+ * your custom theme. See theme_field() for a discussion of performance.
*
* Available variables:
* - $items: An array of field values. Use render() to output them.
@@ -45,7 +47,7 @@
*/
?>
' placeholder.
if ($mode) {
$content = $match[1];
- $hash = md5($content);
+ $hash = hash('sha256', $content);
$comments[$hash] = $content;
return "";
}
diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc
index e602bcef..0f13da84 100644
--- a/modules/filter/filter.pages.inc
+++ b/modules/filter/filter.pages.inc
@@ -14,10 +14,9 @@
* @see filter_menu()
* @see theme_filter_tips()
*/
-function filter_tips_long() {
- $format_id = arg(2);
- if ($format_id) {
- $output = theme('filter_tips', array('tips' => _filter_tips($format_id, TRUE), 'long' => TRUE));
+function filter_tips_long($format = NULL) {
+ if (!empty($format)) {
+ $output = theme('filter_tips', array('tips' => _filter_tips($format->format, TRUE), 'long' => TRUE));
}
else {
$output = theme('filter_tips', array('tips' => _filter_tips(-1, TRUE), 'long' => TRUE));
diff --git a/modules/filter/filter.test b/modules/filter/filter.test
index ddea6afb..34dcf043 100644
--- a/modules/filter/filter.test
+++ b/modules/filter/filter.test
@@ -555,6 +555,27 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase {
$this->assertTrue(isset($options[$this->allowed_format->format]), 'The allowed text format appears as an option when adding a new node.');
$this->assertFalse(isset($options[$this->disallowed_format->format]), 'The disallowed text format does not appear as an option when adding a new node.');
$this->assertTrue(isset($options[filter_fallback_format()]), 'The fallback format appears as an option when adding a new node.');
+
+ // Check regular user access to the filter tips pages.
+ $this->drupalGet('filter/tips/' . $this->allowed_format->format);
+ $this->assertResponse(200);
+ $this->drupalGet('filter/tips/' . $this->disallowed_format->format);
+ $this->assertResponse(403);
+ $this->drupalGet('filter/tips/' . filter_fallback_format());
+ $this->assertResponse(200);
+ $this->drupalGet('filter/tips/invalid-format');
+ $this->assertResponse(404);
+
+ // Check admin user access to the filter tips pages.
+ $this->drupalLogin($this->admin_user);
+ $this->drupalGet('filter/tips/' . $this->allowed_format->format);
+ $this->assertResponse(200);
+ $this->drupalGet('filter/tips/' . $this->disallowed_format->format);
+ $this->assertResponse(200);
+ $this->drupalGet('filter/tips/' . filter_fallback_format());
+ $this->assertResponse(200);
+ $this->drupalGet('filter/tips/invalid-format');
+ $this->assertResponse(404);
}
/**
@@ -1099,8 +1120,12 @@ class FilterUnitTestCase extends DrupalUnitTestCase {
$f = filter_xss("![](\"jav\0a\0\0cript:alert(0)\")
", array('img'));
$this->assertNoNormalized($f, 'cript', 'HTML scheme clearing evasion -- embedded nulls.');
- $f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- spaces and metacharacters before scheme.');
+ // @todo This dataset currently fails under 5.4 because of
+ // https://www.drupal.org/node/1210798. Restore after it's fixed.
+ if (version_compare(PHP_VERSION, '5.4.0', '<')) {
+ $f = filter_xss('', array('img'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- spaces and metacharacters before scheme.');
+ }
$f = filter_xss(')
', array('img'));
$this->assertNoNormalized($f, 'vbscript', 'HTML scheme clearing evasion -- another scheme.');
@@ -1273,6 +1298,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase {
// Create a e-mail that is too long.
$long_email = str_repeat('a', 254) . '@example.com';
$too_long_email = str_repeat('b', 255) . '@example.com';
+ $email_with_plus_sign = 'one+two@example.com';
// Filter selection/pattern matching.
@@ -1286,12 +1312,13 @@ http://example.com or www.example.com
),
// MAILTO URLs.
'
-person@example.com or mailto:person2@example.com or ' . $long_email . ' but not ' . $too_long_email . '
+person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . '
' => array(
'person@example.com' => TRUE,
'mailto:person2@example.com' => TRUE,
'' . $long_email . '' => TRUE,
'' . $too_long_email . '' => FALSE,
+ '' . $email_with_plus_sign . '' => TRUE,
),
// URI parts and special characters.
'
@@ -1983,3 +2010,26 @@ class FilterSettingsTestCase extends DrupalWebTestCase {
}
}
}
+
+/**
+ * Tests DOMDocument serialization.
+ */
+class FilterDOMSerializeTestCase extends DrupalWebTestCase {
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Serialization',
+ 'description' => 'Test serialization of DOMDocument objects.',
+ 'group' => 'Filter',
+ );
+ }
+
+ /**
+ * Tests empty DOMDocument object.
+ */
+ function testFilterEmptyDOMSerialization() {
+ $document = new DOMDocument();
+ $result = filter_dom_serialize($document);
+ $this->assertEqual('', $result);
+ }
+}
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index 5312ec02..6907509f 100644
--- a/modules/forum/forum.info
+++ b/modules/forum/forum.info
@@ -9,8 +9,7 @@ files[] = forum.test
configure = admin/structure/forum
stylesheets[all][] = forum.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/help/help.info b/modules/help/help.info
index f51b9062..33e6c811 100644
--- a/modules/help/help.info
+++ b/modules/help/help.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = help.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/image/image.info b/modules/image/image.info
index 3e9ef6be..d6b6942d 100644
--- a/modules/image/image.info
+++ b/modules/image/image.info
@@ -7,8 +7,7 @@ dependencies[] = file
files[] = image.test
configure = admin/config/media/image-styles
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/image/image.module b/modules/image/image.module
index fac8de95..dab88361 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -64,7 +64,7 @@ function image_help($path, $arg) {
$effect = image_effect_definition_load($arg[7]);
return isset($effect['help']) ? ('
!';
+ $result = locale_string_is_safe($string);
+ $this->assertFalse($result);
+
+ // Check a translatable string which includes a token in an href attribute.
+ $string = 'Hi user';
+ $result = locale_string_is_safe($string);
+ $this->assertTrue($result);
+ }
+}
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index 5e8d50f7..20ae2b47 100644
--- a/modules/locale/tests/locale_test.info
+++ b/modules/locale/tests/locale_test.info
@@ -5,8 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 66bd6f3b..a24703c9 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -281,6 +281,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
$form['link_title'] = array(
'#type' => 'textfield',
'#title' => t('Menu link title'),
+ '#maxlength' => 255,
'#default_value' => $item['link_title'],
'#description' => t('The text to be used for this link in the menu.'),
'#required' => TRUE,
@@ -305,7 +306,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
'#title' => t('Path'),
'#maxlength' => 255,
'#default_value' => $path,
- '#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')),
+ '#description' => t('The path for this menu link. This can be an internal path such as %add-node or an external URL such as %example. Enter %front to link to the front page.', array('%front' => '', '%add-node' => 'node/add', '%example' => 'http://example.com')),
'#required' => TRUE,
);
$form['actions']['delete'] = array(
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 7212d9ab..b44e1301 100644
--- a/modules/menu/menu.info
+++ b/modules/menu/menu.info
@@ -6,8 +6,7 @@ core = 7.x
files[] = menu.test
configure = admin/structure/menu
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index dc8f015d..27b1675a 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -674,6 +674,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
$form['menu']['link']['link_title'] = array(
'#type' => 'textfield',
'#title' => t('Menu link title'),
+ '#maxlength' => 255,
'#default_value' => $link['link_title'],
);
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index a9bdb5f2..bb792ee8 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -72,6 +72,17 @@ class MenuTestCase extends DrupalWebTestCase {
$saved_item = menu_link_load($item['mlid']);
$this->assertEqual($description, $saved_item['options']['attributes']['title'], 'Saving an existing link updates the description (title attribute)');
$this->resetMenuLink($item, $old_title);
+
+ // Test that the page title is correct when a local task appears in a
+ // top-level menu item. See https://www.drupal.org/node/1973262.
+ $item = $this->addMenuLink(0, 'user/register', 'user-menu');
+ $this->drupalGet('user/password');
+ $this->assertNoTitle('Home | Drupal');
+ $this->drupalLogout();
+ $this->drupalGet('user/register');
+ $this->assertTitle($item['link_title'] . ' | Drupal');
+ $this->drupalGet('user');
+ $this->assertNoTitle('Home | Drupal');
}
/**
@@ -637,7 +648,12 @@ class MenuNodeTestCase extends DrupalWebTestCase {
);
$this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
- // Create a node.
+ // Verify that the menu link title on the node add form has the correct
+ // maxlength.
+ $this->drupalGet('node/add/page');
+ $this->assertPattern('//', 'Menu link title field has correct maxlength in node add form.');
+
+ // Create a node with menu link disabled.
$node_title = $this->randomName();
$language = LANGUAGE_NONE;
$edit = array(
@@ -673,6 +689,10 @@ class MenuNodeTestCase extends DrupalWebTestCase {
$this->drupalGet('node/' . $node->nid . '/edit');
$this->assertOptionSelected('edit-menu-weight', 17, 'Menu weight correct in edit form');
+ // Verify that the menu link title on the node edit form has the correct
+ // maxlength.
+ $this->assertPattern('//', 'Menu link title field has correct maxlength in node edit form.');
+
// Edit the node and remove the menu link.
$edit = array(
'menu[enabled]' => FALSE,
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 55af6670..c451dc7e 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -11,7 +11,7 @@
function node_overview_types() {
$types = node_type_get_types();
$names = node_type_get_names();
- $field_ui = module_exists('field_ui');
+ $field_ui = module_exists('field_ui') && user_access('administer fields');
$header = array(t('Name'), array('data' => t('Operations'), 'colspan' => $field_ui ? '4' : '2'));
$rows = array();
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 35f4c1d5..eead4ea9 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -329,6 +329,8 @@ function _node_mass_update_helper($nid, $updates) {
}
/**
+ * Implements callback_batch_operation().
+ *
* Executes a batch operation for node_mass_update().
*
* @param array $nodes
@@ -367,7 +369,9 @@ function _node_mass_update_batch_process($nodes, $updates, &$context) {
}
/**
- * Menu callback: Reports the status of batch operation for node_mass_update().
+ * Implements callback_batch_finished().
+ *
+ * Reports the status of batch operation for node_mass_update().
*
* @param bool $success
* A boolean indicating whether the batch mass update operation successfully
@@ -504,14 +508,17 @@ function node_admin_nodes() {
$options = array();
foreach ($nodes as $node) {
$langcode = entity_language('node', $node);
- $l_options = $langcode != LANGUAGE_NONE && isset($languages[$langcode]) ? array('language' => $languages[$langcode]) : array();
+ $uri = entity_uri('node', $node);
+ if ($langcode != LANGUAGE_NONE && isset($languages[$langcode])) {
+ $uri['options']['language'] = $languages[$langcode];
+ }
$options[$node->nid] = array(
'title' => array(
'data' => array(
'#type' => 'link',
'#title' => $node->title,
- '#href' => 'node/' . $node->nid,
- '#options' => $l_options,
+ '#href' => $uri['path'],
+ '#options' => $uri['options'],
'#suffix' => ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))),
),
),
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 9a4d0959..c8176a7d 100644
--- a/modules/node/node.api.php
+++ b/modules/node/node.api.php
@@ -950,7 +950,7 @@ function hook_node_info() {
* 'recent', or 'comments'. The values should be arrays themselves, with the
* following keys available:
* - title: (required) The human readable name of the ranking mechanism.
- * - join: (optional) The part of a query string to join to any additional
+ * - join: (optional) An array with information to join any additional
* necessary table. This is not necessary if the table required is already
* joined to by the base query, such as for the {node} table. Other tables
* should use the full table name as an alias to avoid naming collisions.
@@ -974,7 +974,12 @@ function hook_ranking() {
'title' => t('Average vote'),
// Note that we use i.sid, the search index's search item id, rather than
// n.nid.
- 'join' => 'LEFT JOIN {vote_node_data} vote_node_data ON vote_node_data.nid = i.sid',
+ 'join' => array(
+ 'type' => 'LEFT',
+ 'table' => 'vote_node_data',
+ 'alias' => 'vote_node_data',
+ 'on' => 'vote_node_data.nid = i.sid',
+ ),
// The highest possible score should be 1, and the lowest possible score,
// always 0, should be 0.
'score' => 'vote_node_data.average / CAST(%f AS DECIMAL)',
@@ -1079,19 +1084,9 @@ function hook_delete($node) {
* @ingroup node_api_hooks
*/
function hook_prepare($node) {
- $file = file_save_upload($field_name, _image_filename($file->filename, NULL, TRUE));
- if ($file) {
- if (!image_get_info($file->uri)) {
- form_set_error($field_name, t('Uploaded file is not a valid image'));
- return;
- }
- }
- else {
- return;
+ if (!isset($node->mymodule_value)) {
+ $node->mymodule_value = 'foo';
}
- $node->images['_original'] = $file->uri;
- _image_build_derivatives($node, TRUE);
- $node->new_file = TRUE;
}
/**
diff --git a/modules/node/node.info b/modules/node/node.info
index 758179dc..0094ad6a 100644
--- a/modules/node/node.info
+++ b/modules/node/node.info
@@ -9,8 +9,7 @@ required = TRUE
configure = admin/structure/types
stylesheets[all][] = node.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/node/node.install b/modules/node/node.install
index 0b0a7bd5..3c4e7c2a 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -410,6 +410,7 @@ function node_schema() {
'nid' => array(
'description' => 'The {node}.nid that was read.',
'type' => 'int',
+ 'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
@@ -943,6 +944,23 @@ function node_update_7015() {
->execute();
}
+/**
+ * Change {history}.nid to an unsigned int in order to match {node}.nid.
+ */
+function node_update_7016() {
+ db_drop_primary_key('history');
+ db_drop_index('history', 'nid');
+ db_change_field('history', 'nid', 'nid', array(
+ 'description' => 'The {node}.nid that was read.',
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ));
+ db_add_primary_key('history', array('uid', 'nid'));
+ db_add_index('history', 'nid', array('nid'));
+}
+
/**
* @} End of "addtogroup updates-7.x-extra".
*/
diff --git a/modules/node/node.module b/modules/node/node.module
index 7a6246d5..1d88834c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2953,7 +2953,10 @@ function node_search_validate($form, &$form_state) {
* system. When adding a node listing to your module, be sure to use a dynamic
* query created by db_select() and add a tag of "node_access". This will allow
* modules dealing with node access to ensure only nodes to which the user has
- * access are retrieved, through the use of hook_query_TAG_alter().
+ * access are retrieved, through the use of hook_query_TAG_alter(). Tagging a
+ * query with "node_access" does not check the published/unpublished status of
+ * nodes, so the base query is responsible for ensuring that unpublished nodes
+ * are not displayed to inappropriate users.
*
* Note: Even a single module returning NODE_ACCESS_DENY from hook_node_access()
* will block access to the node. Therefore, implementers should take care to
@@ -3669,6 +3672,8 @@ function node_access_rebuild($batch_mode = FALSE) {
}
/**
+ * Implements callback_batch_operation().
+ *
* Performs batch operation for node_access_rebuild().
*
* This is a multistep operation: we go through all nodes by packs of 20. The
@@ -3683,7 +3688,7 @@ function _node_access_rebuild_batch_operation(&$context) {
// Initiate multistep processing.
$context['sandbox']['progress'] = 0;
$context['sandbox']['current_node'] = 0;
- $context['sandbox']['max'] = db_query('SELECT COUNT(DISTINCT nid) FROM {node}')->fetchField();
+ $context['sandbox']['max'] = db_query('SELECT COUNT(nid) FROM {node}')->fetchField();
}
// Process the next 20 nodes.
@@ -3707,6 +3712,8 @@ function _node_access_rebuild_batch_operation(&$context) {
}
/**
+ * Implements callback_batch_finished().
+ *
* Performs post-processing for node_access_rebuild().
*
* @param bool $success
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index cc3908e3..72b0ea7c 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -396,7 +396,6 @@ function node_preview($node) {
$cloned_node->changed = REQUEST_TIME;
$nodes = array($cloned_node->nid => $cloned_node);
- field_attach_prepare_view('node', $nodes, 'full');
// Display a preview of the node.
if (!form_get_errors()) {
diff --git a/modules/node/node.test b/modules/node/node.test
index 5c9118eb..e8eb459e 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -457,10 +457,70 @@ class PagePreviewTestCase extends DrupalWebTestCase {
}
function setUp() {
- parent::setUp();
+ parent::setUp(array('taxonomy', 'node'));
$web_user = $this->drupalCreateUser(array('edit own page content', 'create page content'));
$this->drupalLogin($web_user);
+
+ // Add a vocabulary so we can test different view modes.
+ $vocabulary = (object) array(
+ 'name' => $this->randomName(),
+ 'description' => $this->randomName(),
+ 'machine_name' => drupal_strtolower($this->randomName()),
+ 'help' => '',
+ 'nodes' => array('page' => 'page'),
+ );
+ taxonomy_vocabulary_save($vocabulary);
+
+ $this->vocabulary = $vocabulary;
+
+ // Add a term to the vocabulary.
+ $term = (object) array(
+ 'name' => $this->randomName(),
+ 'description' => $this->randomName(),
+ // Use the first available text format.
+ 'format' => db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField(),
+ 'vid' => $this->vocabulary->vid,
+ 'vocabulary_machine_name' => $vocabulary->machine_name,
+ );
+ taxonomy_term_save($term);
+
+ $this->term = $term;
+
+ // Set up a field and instance.
+ $this->field_name = drupal_strtolower($this->randomName());
+ $this->field = array(
+ 'field_name' => $this->field_name,
+ 'type' => 'taxonomy_term_reference',
+ 'settings' => array(
+ 'allowed_values' => array(
+ array(
+ 'vocabulary' => $this->vocabulary->machine_name,
+ 'parent' => '0',
+ ),
+ ),
+ )
+ );
+
+ field_create_field($this->field);
+ $this->instance = array(
+ 'field_name' => $this->field_name,
+ 'entity_type' => 'node',
+ 'bundle' => 'page',
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ // Hide on full display but render on teaser.
+ 'display' => array(
+ 'default' => array(
+ 'type' => 'hidden',
+ ),
+ 'teaser' => array(
+ 'type' => 'taxonomy_term_reference_link',
+ ),
+ ),
+ );
+ field_create_instance($this->instance);
}
/**
@@ -470,21 +530,26 @@ class PagePreviewTestCase extends DrupalWebTestCase {
$langcode = LANGUAGE_NONE;
$title_key = "title";
$body_key = "body[$langcode][0][value]";
+ $term_key = "{$this->field_name}[$langcode]";
// Fill in node creation form and preview node.
$edit = array();
$edit[$title_key] = $this->randomName(8);
$edit[$body_key] = $this->randomName(16);
+ $edit[$term_key] = $this->term->tid;
$this->drupalPost('node/add/page', $edit, t('Preview'));
- // Check that the preview is displaying the title and body.
+ // Check that the preview is displaying the title, body, and term.
$this->assertTitle(t('Preview | Drupal'), 'Basic page title is preview.');
$this->assertText($edit[$title_key], 'Title displayed.');
$this->assertText($edit[$body_key], 'Body displayed.');
+ $this->assertText($this->term->name, 'Term displayed.');
- // Check that the title and body fields are displayed with the correct values.
+ // Check that the title, body, and term fields are displayed with the
+ // correct values.
$this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
$this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
+ $this->assertFieldByName($term_key, $edit[$term_key], 'Term field displayed.');
}
/**
@@ -494,6 +559,7 @@ class PagePreviewTestCase extends DrupalWebTestCase {
$langcode = LANGUAGE_NONE;
$title_key = "title";
$body_key = "body[$langcode][0][value]";
+ $term_key = "{$this->field_name}[$langcode]";
// Force revision on "Basic page" content.
variable_set('node_options_page', array('status', 'revision'));
@@ -501,17 +567,21 @@ class PagePreviewTestCase extends DrupalWebTestCase {
$edit = array();
$edit[$title_key] = $this->randomName(8);
$edit[$body_key] = $this->randomName(16);
+ $edit[$term_key] = $this->term->tid;
$edit['log'] = $this->randomName(32);
$this->drupalPost('node/add/page', $edit, t('Preview'));
- // Check that the preview is displaying the title and body.
+ // Check that the preview is displaying the title, body, and term.
$this->assertTitle(t('Preview | Drupal'), 'Basic page title is preview.');
$this->assertText($edit[$title_key], 'Title displayed.');
$this->assertText($edit[$body_key], 'Body displayed.');
+ $this->assertText($this->term->name, 'Term displayed.');
- // Check that the title and body fields are displayed with the correct values.
+ // Check that the title, body, and term fields are displayed with the
+ // correct values.
$this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
$this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
+ $this->assertFieldByName($term_key, $edit[$term_key], 'Term field displayed.');
// Check that the log field has the correct value.
$this->assertFieldByName('log', $edit['log'], 'Log field displayed.');
@@ -1448,7 +1518,7 @@ class NodeTypeTestCase extends DrupalWebTestCase {
* Tests editing a node type using the UI.
*/
function testNodeTypeEditing() {
- $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types'));
+ $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'administer fields'));
$this->drupalLogin($web_user);
$instance = field_info_instance('node', 'body', 'page');
@@ -2698,8 +2768,8 @@ class NodeAccessFieldTestCase extends NodeWebTestCase {
node_access_rebuild();
// Create some users.
- $this->admin_user = $this->drupalCreateUser(array('access content', 'bypass node access'));
- $this->content_admin_user = $this->drupalCreateUser(array('access content', 'administer content types'));
+ $this->admin_user = $this->drupalCreateUser(array('access content', 'bypass node access', 'administer fields'));
+ $this->content_admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer fields'));
// Add a custom field to the page content type.
$this->field_name = drupal_strtolower($this->randomName() . '_field_name');
@@ -2916,3 +2986,36 @@ class NodePageCacheTest extends NodeWebTestCase {
$this->assertResponse(404);
}
}
+
+/**
+ * Tests that multi-byte UTF-8 characters are stored and retrieved correctly.
+ */
+class NodeMultiByteUtf8Test extends NodeWebTestCase {
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Multi-byte UTF-8',
+ 'description' => 'Test that multi-byte UTF-8 characters are stored and retrieved correctly.',
+ 'group' => 'Node',
+ );
+ }
+
+ /**
+ * Tests that multi-byte UTF-8 characters are stored and retrieved correctly.
+ */
+ public function testMultiByteUtf8() {
+ $connection = Database::getConnection();
+ // On MySQL, this test will only run if 'charset' is set to 'utf8mb4' in
+ // settings.php.
+ if (!($connection->utf8mb4IsSupported() && $connection->utf8mb4IsActive())) {
+ return;
+ }
+ $title = '🐙';
+ $this->assertTrue(drupal_strlen($title, 'utf-8') < strlen($title), 'Title has multi-byte characters.');
+ $node = $this->drupalCreateNode(array('title' => $title));
+ $this->drupalGet('node/' . $node->nid);
+ $result = $this->xpath('//h1[@id="page-title"]');
+ $this->assertEqual(trim((string) $result[0]), $title, 'The passed title was returned.');
+ }
+
+}
diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index 87683bdb..a7aad51e 100644
--- a/modules/node/tests/node_access_test.info
+++ b/modules/node/tests/node_access_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index c91df020..86337664 100644
--- a/modules/node/tests/node_test.info
+++ b/modules/node/tests/node_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index 3a805b39..7c495bfe 100644
--- a/modules/node/tests/node_test_exception.info
+++ b/modules/node/tests/node_test_exception.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index 62800a65..09a49f79 100644
--- a/modules/openid/openid.info
+++ b/modules/openid/openid.info
@@ -5,8 +5,7 @@ package = Core
core = 7.x
files[] = openid.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/openid/openid.test b/modules/openid/openid.test
index 5f7493a5..d0708e03 100644
--- a/modules/openid/openid.test
+++ b/modules/openid/openid.test
@@ -680,11 +680,11 @@ class OpenIDTestCase extends DrupalWebTestCase {
* Test _openid_dh_XXX_to_XXX() functions.
*/
function testConversion() {
- $this->assertEqual(_openid_dh_long_to_base64('12345678901234567890123456789012345678901234567890'), 'CHJ/Y2mq+DyhUCZ0evjH8ZbOPwrS', '_openid_dh_long_to_base64() returned expected result.');
- $this->assertEqual(_openid_dh_base64_to_long('BsH/g8Nrpn2dtBSdu/sr1y8hxwyx'), '09876543210987654321098765432109876543210987654321', '_openid_dh_base64_to_long() returned expected result.');
+ $this->assertIdentical(_openid_dh_long_to_base64('12345678901234567890123456789012345678901234567890'), 'CHJ/Y2mq+DyhUCZ0evjH8ZbOPwrS', '_openid_dh_long_to_base64() returned expected result.');
+ $this->assertIdentical(_openid_dh_base64_to_long('BsH/g8Nrpn2dtBSdu/sr1y8hxwyx'), '9876543210987654321098765432109876543210987654321', '_openid_dh_base64_to_long() returned expected result.');
- $this->assertEqual(_openid_dh_long_to_binary('12345678901234567890123456789012345678901234567890'), "\x08r\x7fci\xaa\xf8<\xa1P&tz\xf8\xc7\xf1\x96\xce?\x0a\xd2", '_openid_dh_long_to_binary() returned expected result.');
- $this->assertEqual(_openid_dh_binary_to_long("\x06\xc1\xff\x83\xc3k\xa6}\x9d\xb4\x14\x9d\xbb\xfb+\xd7/!\xc7\x0c\xb1"), '09876543210987654321098765432109876543210987654321', '_openid_dh_binary_to_long() returned expected result.');
+ $this->assertIdentical(_openid_dh_long_to_binary('12345678901234567890123456789012345678901234567890'), "\x08r\x7fci\xaa\xf8<\xa1P&tz\xf8\xc7\xf1\x96\xce?\x0a\xd2", '_openid_dh_long_to_binary() returned expected result.');
+ $this->assertIdentical(_openid_dh_binary_to_long("\x06\xc1\xff\x83\xc3k\xa6}\x9d\xb4\x14\x9d\xbb\xfb+\xd7/!\xc7\x0c\xb1"), '9876543210987654321098765432109876543210987654321', '_openid_dh_binary_to_long() returned expected result.');
}
/**
diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index 3c66f075..712801ad 100644
--- a/modules/openid/tests/openid_test.info
+++ b/modules/openid/tests/openid_test.info
@@ -6,8 +6,7 @@ core = 7.x
dependencies[] = openid
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js
index 7859821b..efb26370 100644
--- a/modules/overlay/overlay-parent.js
+++ b/modules/overlay/overlay-parent.js
@@ -350,7 +350,7 @@ Drupal.overlay.setFocusBefore = function ($element, document) {
* TRUE if the URL represents an administrative link, FALSE otherwise.
*/
Drupal.overlay.isAdminLink = function (url) {
- if (Drupal.overlay.isExternalLink(url)) {
+ if (!Drupal.urlIsLocal(url)) {
return false;
}
@@ -378,6 +378,8 @@ Drupal.overlay.isAdminLink = function (url) {
/**
* Determine whether a link is external to the site.
*
+ * Deprecated. Use Drupal.urlIsLocal() instead.
+ *
* @param url
* The URL to be tested.
*
@@ -385,8 +387,7 @@ Drupal.overlay.isAdminLink = function (url) {
* TRUE if the URL is external to the site, FALSE otherwise.
*/
Drupal.overlay.isExternalLink = function (url) {
- var re = RegExp('^((f|ht)tps?:)?//(?!' + window.location.host + ')');
- return re.test(url);
+ return !Drupal.urlIsLocal(url);
};
/**
@@ -405,7 +406,7 @@ Drupal.overlay.isExternalLink = function (url) {
*/
Drupal.overlay.getInternalUrl = function (path) {
var url = Drupal.settings.basePath + path;
- if (!this.isExternalLink(url)) {
+ if (Drupal.urlIsLocal(url)) {
return url;
}
};
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index ec0cdf4d..656c6577 100644
--- a/modules/overlay/overlay.info
+++ b/modules/overlay/overlay.info
@@ -4,8 +4,7 @@ package = Core
version = VERSION
core = 7.x
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 7b2fc939..7e54734e 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -78,6 +78,20 @@ function overlay_theme() {
);
}
+/**
+ * Implements hook_form_alter().
+ */
+function overlay_form_alter(&$form, &$form_state) {
+ // Add a hidden element to prevent dropping out of the overlay when a form is
+ // submitted inside the overlay using a GET method.
+ if (isset($form['#method']) && $form['#method'] == 'get' && isset($_REQUEST['render']) && $_REQUEST['render'] == 'overlay' && !isset($form['render'])) {
+ $form['render'] = array(
+ '#type' => 'hidden',
+ '#value' => 'overlay',
+ );
+ }
+}
+
/**
* Implements hook_form_FORM_ID_alter().
*/
diff --git a/modules/path/path.info b/modules/path/path.info
index a70da447..0edafb7d 100644
--- a/modules/path/path.info
+++ b/modules/path/path.info
@@ -6,8 +6,7 @@ core = 7.x
files[] = path.test
configure = admin/config/search/path
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/path/path.module b/modules/path/path.module
index 81c7bb2c..4614b0fa 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -185,7 +185,7 @@ function path_form_element_validate($element, &$form_state, $complete_form) {
* Implements hook_node_insert().
*/
function path_node_insert($node) {
- if (isset($node->path)) {
+ if (isset($node->path) && isset($node->path['alias'])) {
$path = $node->path;
$path['alias'] = trim($path['alias']);
// Only save a non-empty alias.
@@ -205,9 +205,9 @@ function path_node_insert($node) {
function path_node_update($node) {
if (isset($node->path)) {
$path = $node->path;
- $path['alias'] = trim($path['alias']);
+ $path['alias'] = isset($path['alias']) ? trim($path['alias']) : '';
// Delete old alias if user erased it.
- if (!empty($path['pid']) && empty($path['alias'])) {
+ if (!empty($path['pid']) && !$path['alias']) {
path_delete($path['pid']);
}
path_node_insert($node);
diff --git a/modules/path/path.test b/modules/path/path.test
index edecff5c..f6131ce6 100644
--- a/modules/path/path.test
+++ b/modules/path/path.test
@@ -21,7 +21,7 @@ class PathTestCase extends DrupalWebTestCase {
parent::setUp('path');
// Create test user and login.
- $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases'));
+ $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases', 'access content overview'));
$this->drupalLogin($web_user);
}
@@ -160,6 +160,34 @@ class PathTestCase extends DrupalWebTestCase {
$this->drupalGet($edit['path[alias]']);
$this->assertNoText($node1->title, 'Alias was successfully deleted.');
$this->assertResponse(404);
+
+ // Create third test node.
+ $node3 = $this->drupalCreateNode();
+
+ // Create an invalid alias with a leading slash and verify that the slash
+ // is removed when the link is generated. This ensures that URL aliases
+ // cannot be used to inject external URLs.
+ // @todo The user interface should either display an error message or
+ // automatically trim these invalid aliases, rather than allowing them to
+ // be silently created, at which point the functional aspects of this
+ // test will need to be moved elsewhere and switch to using a
+ // programmatically-created alias instead.
+ $alias = $this->randomName(8);
+ $edit = array('path[alias]' => '/' . $alias);
+ $this->drupalPost('node/' . $node3->nid . '/edit', $edit, t('Save'));
+ $this->drupalGet('admin/content');
+ // This checks the link href before clicking it, rather than using
+ // DrupalWebTestCase::assertUrl() after clicking it, because the test
+ // browser does not always preserve the correct number of slashes in the
+ // URL when it visits internal links; using DrupalWebTestCase::assertUrl()
+ // would actually make the test pass unconditionally on the testbot (or
+ // anywhere else where Drupal is installed in a subdirectory).
+ $link_xpath = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $node3->title));
+ $link_href = (string) $link_xpath[0]['href'];
+ $link_prefix = base_path() . (variable_get('clean_url', 0) ? '' : '?q=');
+ $this->assertEqual($link_href, $link_prefix . $alias);
+ $this->clickLink($node3->title);
+ $this->assertResponse(404);
}
/**
diff --git a/modules/php/php.info b/modules/php/php.info
index 93aed895..9ea7278c 100644
--- a/modules/php/php.info
+++ b/modules/php/php.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = php.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index aa203f9b..3f0d235b 100644
--- a/modules/poll/poll.info
+++ b/modules/poll/poll.info
@@ -6,8 +6,7 @@ core = 7.x
files[] = poll.test
stylesheets[all][] = poll.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index bfc72bf9..336e4456 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -631,9 +631,6 @@ function poll_delete($node) {
* The node object to load.
*/
function poll_block_latest_poll_view($node) {
- global $user;
- $output = '';
-
// This is necessary for shared objects because PHP doesn't copy objects, but
// passes them by reference. So when the objects are cached it can result in
// the wrong output being displayed on subsequent calls. The cloning and
@@ -674,9 +671,6 @@ function poll_block_latest_poll_view($node) {
* Implements hook_view().
*/
function poll_view($node, $view_mode) {
- global $user;
- $output = '';
-
if (!empty($node->allowvotes) && empty($node->show_results)) {
$node->content['poll_view_voting'] = drupal_get_form('poll_view_voting', $node);
}
@@ -694,7 +688,7 @@ function poll_view($node, $view_mode) {
function poll_teaser($node) {
$teaser = NULL;
if (is_array($node->choice)) {
- foreach ($node->choice as $k => $choice) {
+ foreach ($node->choice as $choice) {
if ($choice['chtext'] != '') {
$teaser .= '* ' . check_plain($choice['chtext']) . "\n";
}
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index 4aa11a86..ce6d9549 100644
--- a/modules/profile/profile.info
+++ b/modules/profile/profile.info
@@ -11,8 +11,7 @@ configure = admin/config/people/profile
; See user_system_info_alter().
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/profile/profile.test b/modules/profile/profile.test
index 6cb07391..18924714 100644
--- a/modules/profile/profile.test
+++ b/modules/profile/profile.test
@@ -342,7 +342,7 @@ class ProfileTestAutocomplete extends ProfileTestCase {
// Autocomplete always uses non-clean URLs.
$current_clean_url = isset($GLOBALS['conf']['clean_url']) ? $GLOBALS['conf']['clean_url'] : NULL;
$GLOBALS['conf']['clean_url'] = 0;
- $autocomplete_url = url('profile/autocomplete/' . $field['fid'], array('absolute' => TRUE));
+ $autocomplete_url = url('profile/autocomplete/' . $field['fid'], array('absolute' => TRUE, 'script' => 'index.php'));
$GLOBALS['conf']['clean_url'] = $current_clean_url;
$autocomplete_id = drupal_html_id('edit-' . $field['form_name'] . '-autocomplete');
$autocomplete_html = '';
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index af080ce4..ea28b0e3 100644
--- a/modules/rdf/rdf.info
+++ b/modules/rdf/rdf.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = rdf.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index 3b80f351..7e0e2b21 100644
--- a/modules/rdf/tests/rdf_test.info
+++ b/modules/rdf/tests/rdf_test.info
@@ -4,9 +4,9 @@ package = Testing
version = VERSION
core = 7.x
hidden = TRUE
+dependencies[] = blog
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc
index a609485a..a37d37b9 100644
--- a/modules/search/search.admin.inc
+++ b/modules/search/search.admin.inc
@@ -125,6 +125,16 @@ function search_admin_settings($form) {
'#options' => $module_options,
'#description' => t('Choose which search module is the default.')
);
+ $form['logging'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Logging')
+ );
+ $form['logging']['search_logging'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Log searches'),
+ '#default_value' => variable_get('search_logging', 1),
+ '#description' => t('If checked, all searches will be logged. Uncheck to skip logging. Logging may affect performance.'),
+ );
$form['#validate'][] = 'search_admin_settings_validate';
$form['#submit'][] = 'search_admin_settings_submit';
diff --git a/modules/search/search.api.php b/modules/search/search.api.php
index 62d53b85..8c17bb4f 100644
--- a/modules/search/search.api.php
+++ b/modules/search/search.api.php
@@ -30,8 +30,9 @@
*
* @return
* Array with optional keys:
- * - title: Title for the tab on the search page for this module. Defaults
- * to the module name if not given.
+ * - title: Title for the tab on the search page for this module. Title must
+ * be untranslated. Outside of this return array, pass the title through the
+ * t() function to register it as a translatable string.
* - path: Path component after 'search/' for searching with this module.
* Defaults to the module name if not given.
* - conditions_callback: An implementation of callback_search_conditions().
@@ -39,6 +40,9 @@
* @ingroup search
*/
function hook_search_info() {
+ // Make the title translatable.
+ t('Content');
+
return array(
'title' => 'Content',
'path' => 'node',
diff --git a/modules/search/search.extender.inc b/modules/search/search.extender.inc
index 72cea647..40742569 100644
--- a/modules/search/search.extender.inc
+++ b/modules/search/search.extender.inc
@@ -409,10 +409,10 @@ class SearchQuery extends SelectQueryExtender {
* used. However, if at least one call to addScore() has taken place, the
* keyword relevance score is not automatically added.
*
- * Also note that if you call orderBy() directly on the query, search scores
- * will not automatically be used to order search results. Your orderBy()
- * expression can reference 'calculated_score', which will be the total
- * calculated score value.
+ * Note that you must use this method to add ordering to your searches, and
+ * not call orderBy() directly, when using the SearchQuery extender. This is
+ * because of the two-pass system the SearchQuery class uses to normalize
+ * scores.
*
* @param $score
* The score expression, which should evaluate to a number between 0 and 1.
diff --git a/modules/search/search.info b/modules/search/search.info
index 5743fd51..31328786 100644
--- a/modules/search/search.info
+++ b/modules/search/search.info
@@ -8,8 +8,7 @@ files[] = search.test
configure = admin/config/search/settings
stylesheets[all][] = search.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/search/search.install b/modules/search/search.install
index f0113b3f..c91283c4 100644
--- a/modules/search/search.install
+++ b/modules/search/search.install
@@ -12,6 +12,7 @@ function search_uninstall() {
variable_del('minimum_word_size');
variable_del('overlap_cjk');
variable_del('search_cron_limit');
+ variable_del('search_logging');
}
/**
diff --git a/modules/search/search.pages.inc b/modules/search/search.pages.inc
index 9dd00a6d..b24de8ed 100644
--- a/modules/search/search.pages.inc
+++ b/modules/search/search.pages.inc
@@ -49,7 +49,7 @@ function search_view($module = NULL, $keys = '') {
// which will get us back to this page callback. In other words, the search
// form submits with POST but redirects to GET. This way we can keep
// the search query URL clean as a whistle.
- if (empty($_POST['form_id']) || $_POST['form_id'] != 'search_form') {
+ if (empty($_POST['form_id']) || ($_POST['form_id'] != 'search_form' && $_POST['form_id'] != 'search_block_form')) {
$conditions = NULL;
if (isset($info['conditions_callback']) && function_exists($info['conditions_callback'])) {
// Build an optional array of more search conditions.
@@ -57,9 +57,10 @@ function search_view($module = NULL, $keys = '') {
}
// Only search if there are keywords or non-empty conditions.
if ($keys || !empty($conditions)) {
- // Log the search keys.
- watchdog('search', 'Searched %type for %keys.', array('%keys' => $keys, '%type' => $info['title']), WATCHDOG_NOTICE, l(t('results'), 'search/' . $info['path'] . '/' . $keys));
-
+ if (variable_get('search_logging', TRUE)) {
+ // Log the search keys.
+ watchdog('search', 'Searched %type for %keys.', array('%keys' => $keys, '%type' => $info['title']), WATCHDOG_NOTICE, l(t('results'), 'search/' . $info['path'] . '/' . $keys));
+ }
// Collect the search results.
$results = search_data($keys, $info['module'], $conditions);
}
diff --git a/modules/search/search.test b/modules/search/search.test
index 5f16db3f..d3a60b49 100644
--- a/modules/search/search.test
+++ b/modules/search/search.test
@@ -666,6 +666,24 @@ class SearchBlockTestCase extends DrupalWebTestCase {
url('search/node/', array('absolute' => TRUE)),
'Redirected to correct url.'
);
+
+ // Test that after entering a too-short keyword in the form, you can then
+ // search again with a longer keyword. First test using the block form.
+ $terms = array('search_block_form' => 'a');
+ $this->drupalPost('node', $terms, t('Search'));
+ $this->assertText('You must include at least one positive keyword with 3 characters or more');
+ $terms = array('search_block_form' => 'foo');
+ $this->drupalPost(NULL, $terms, t('Search'));
+ $this->assertNoText('You must include at least one positive keyword with 3 characters or more');
+ $this->assertText('Your search yielded no results');
+
+ // Same test again, using the search page form for the second search this time.
+ $terms = array('search_block_form' => 'a');
+ $this->drupalPost('node', $terms, t('Search'));
+ $terms = array('keys' => 'foo');
+ $this->drupalPost(NULL, $terms, t('Search'));
+ $this->assertNoText('You must include at least one positive keyword with 3 characters or more');
+ $this->assertText('Your search yielded no results');
}
}
@@ -1435,7 +1453,7 @@ class SearchConfigSettingsForm extends DrupalWebTestCase {
parent::setUp('search', 'search_extra_type');
// Login as a user that can create and search content.
- $this->search_user = $this->drupalCreateUser(array('search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer blocks'));
+ $this->search_user = $this->drupalCreateUser(array('search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer blocks', 'access site reports'));
$this->drupalLogin($this->search_user);
// Add a single piece of content and index it.
@@ -1484,6 +1502,19 @@ class SearchConfigSettingsForm extends DrupalWebTestCase {
);
$this->drupalPost('admin/config/search/settings', $edit, t('Save configuration'));
$this->assertNoText(t('The configuration options have been saved.'), 'Form does not save with an invalid word length.');
+
+ // Test logging setting. It should be on by default.
+ $text = $this->randomName(5);
+ $this->drupalPost('search/node', array('keys' => $text), t('Search'));
+ $this->drupalGet('admin/reports/dblog');
+ $this->assertLink('Searched Content for ' . $text . '.', 0, 'Search was logged');
+
+ // Turn off logging.
+ variable_set('search_logging', FALSE);
+ $text = $this->randomName(5);
+ $this->drupalPost('search/node', array('keys' => $text), t('Search'));
+ $this->drupalGet('admin/reports/dblog');
+ $this->assertNoLink('Searched Content for ' . $text . '.', 'Search was not logged');
}
/**
@@ -2029,10 +2060,11 @@ class SearchNodeAccessTest extends DrupalWebTestCase {
}
/**
- * Tests that search returns results with punctuation in the search phrase.
+ * Tests that search works with punctuation and HTML entities.
*/
function testPhraseSearchPunctuation() {
$node = $this->drupalCreateNode(array('body' => array(LANGUAGE_NONE => array(array('value' => "The bunny's ears were fuzzy.")))));
+ $node2 = $this->drupalCreateNode(array('body' => array(LANGUAGE_NONE => array(array('value' => 'Dignissim Aliquam & Quieligo meus natu quae quia te. Damnum© erat— neo pneum. Facilisi feugiat ibidem ratis.')))));
// Update the search index.
module_invoke_all('update_index');
@@ -2045,6 +2077,17 @@ class SearchNodeAccessTest extends DrupalWebTestCase {
$edit = array('keys' => '"bunny\'s"');
$this->drupalPost('search/node', $edit, t('Search'));
$this->assertText($node->title);
+
+ // Search for "&" and verify entities are not broken up in the output.
+ $edit = array('keys' => '&');
+ $this->drupalPost('search/node', $edit, t('Search'));
+ $this->assertNoRaw('&');
+ $this->assertText('You must include at least one positive keyword');
+
+ $edit = array('keys' => '&');
+ $this->drupalPost('search/node', $edit, t('Search'));
+ $this->assertNoRaw('&');
+ $this->assertText('You must include at least one positive keyword');
}
}
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 2e671e39..0874c63a 100644
--- a/modules/search/tests/search_embedded_form.info
+++ b/modules/search/tests/search_embedded_form.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index e83c32fa..67b8566d 100644
--- a/modules/search/tests/search_extra_type.info
+++ b/modules/search/tests/search_extra_type.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/search/tests/search_node_tags.info b/modules/search/tests/search_node_tags.info
index 266778d6..f260f0b4 100644
--- a/modules/search/tests/search_node_tags.info
+++ b/modules/search/tests/search_node_tags.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index 60aa6ae2..1c1b2a5b 100644
--- a/modules/shortcut/shortcut.info
+++ b/modules/shortcut/shortcut.info
@@ -6,8 +6,7 @@ core = 7.x
files[] = shortcut.test
configure = admin/config/user-interface/shortcut
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index b67c478a..3124ffe8 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -39,6 +39,13 @@ abstract class DrupalTestCase {
*/
protected $originalFileDirectory = NULL;
+ /**
+ * URL to the verbose output file directory.
+ *
+ * @var string
+ */
+ protected $verboseDirectoryUrl;
+
/**
* Time limit for the test.
*/
@@ -461,8 +468,11 @@ protected function error($message = '', $group = 'Other', array $caller = NULL)
protected function verbose($message) {
if ($id = simpletest_verbose($message)) {
$class_safe = str_replace('\\', '_', get_class($this));
- $url = file_create_url($this->originalFileDirectory . '/simpletest/verbose/' . $class_safe . '-' . $id . '.html');
- $this->error(l(t('Verbose message'), $url, array('attributes' => array('target' => '_blank'))), 'User notice');
+ $url = $this->verboseDirectoryUrl . '/' . $class_safe . '-' . $id . '.html';
+ // Not using l() to avoid invoking the theme system, so that unit tests
+ // can use verbose() as well.
+ $link = '' . t('Verbose message') . '';
+ $this->error($link, 'User notice');
}
}
@@ -719,10 +729,17 @@ function __construct($test_id = NULL) {
* method.
*/
protected function setUp() {
- global $conf;
+ global $conf, $language;
// Store necessary current values before switching to the test environment.
$this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files');
+ $this->verboseDirectoryUrl = file_create_url($this->originalFileDirectory . '/simpletest/verbose');
+
+ // Set up English language.
+ $this->originalLanguage = $language;
+ $this->originalLanguageDefault = variable_get('language_default');
+ unset($conf['language_default']);
+ $language = language_default();
// Reset all statics so that test is performed with a clean environment.
drupal_static_reset();
@@ -764,7 +781,7 @@ protected function setUp() {
}
protected function tearDown() {
- global $conf;
+ global $conf, $language;
// Get back to the original connection.
Database::removeConnection('default');
@@ -775,6 +792,12 @@ protected function tearDown() {
if (isset($this->originalModuleList)) {
module_list(TRUE, FALSE, FALSE, $this->originalModuleList);
}
+
+ // Reset language.
+ $language = $this->originalLanguage;
+ if ($this->originalLanguageDefault) {
+ $GLOBALS['conf']['language_default'] = $this->originalLanguageDefault;
+ }
}
}
@@ -853,6 +876,13 @@ class DrupalWebTestCase extends DrupalTestCase {
*/
protected $cookieFile = NULL;
+ /**
+ * The cookies of the page currently loaded in the internal browser.
+ *
+ * @var array
+ */
+ protected $cookies = array();
+
/**
* Additional cURL options.
*
@@ -942,7 +972,6 @@ function drupalGetNodeByTitle($title, $reset = FALSE) {
protected function drupalCreateNode($settings = array()) {
// Populate defaults array.
$settings += array(
- 'body' => array(LANGUAGE_NONE => array(array())),
'title' => $this->randomName(8),
'comment' => 2,
'changed' => REQUEST_TIME,
@@ -957,6 +986,12 @@ protected function drupalCreateNode($settings = array()) {
'language' => LANGUAGE_NONE,
);
+ // Add the body after the language is defined so that it may be set
+ // properly.
+ $settings += array(
+ 'body' => array($settings['language'] => array(array())),
+ );
+
// Use the original node's created time for existing nodes.
if (isset($settings['created']) && !isset($settings['date'])) {
$settings['date'] = format_date($settings['created'], 'custom', 'Y-m-d H:i:s O');
@@ -1015,9 +1050,7 @@ protected function drupalCreateContentType($settings = array()) {
'description' => '',
'help' => '',
'title_label' => 'Title',
- 'body_label' => 'Body',
'has_title' => 1,
- 'has_body' => 1,
);
// Imposed values for a custom type.
$forced = array(
@@ -1067,7 +1100,7 @@ protected function drupalGetTestFiles($type, $size = NULL) {
$lines = array(16, 256, 1024, 2048, 20480);
$count = 0;
foreach ($lines as $line) {
- simpletest_generate_file('text-' . $count++, 64, $line);
+ simpletest_generate_file('text-' . $count++, 64, $line, 'text');
}
// Copy other test files from simpletest.
@@ -1364,12 +1397,14 @@ protected function changeDatabasePrefix() {
* @see DrupalWebTestCase::tearDown()
*/
protected function prepareEnvironment() {
- global $user, $language, $conf;
+ global $user, $language, $language_url, $conf;
// Store necessary current values before switching to prefixed database.
$this->originalLanguage = $language;
+ $this->originalLanguageUrl = $language_url;
$this->originalLanguageDefault = variable_get('language_default');
$this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files');
+ $this->verboseDirectoryUrl = file_create_url($this->originalFileDirectory . '/simpletest/verbose');
$this->originalProfile = drupal_get_profile();
$this->originalCleanUrl = variable_get('clean_url', 0);
$this->originalUser = $user;
@@ -1377,7 +1412,7 @@ protected function prepareEnvironment() {
// Set to English to prevent exceptions from utf8_truncate() from t()
// during install if the current language is not 'en'.
// The following array/object conversion is copied from language_default().
- $language = (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0, 'javascript' => '');
+ $language_url = $language = (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0, 'javascript' => '');
// Save and clean the shutdown callbacks array because it is static cached
// and will be changed by the test run. Otherwise it will contain callbacks
@@ -1435,7 +1470,7 @@ protected function prepareEnvironment() {
* @see DrupalWebTestCase::prepareEnvironment()
*/
protected function setUp() {
- global $user, $language, $conf;
+ global $user, $language, $language_url, $conf;
// Create the database prefix for this test.
$this->prepareDatabasePrefix();
@@ -1532,7 +1567,7 @@ protected function setUp() {
// Set up English language.
unset($conf['language_default']);
- $language = language_default();
+ $language_url = $language = language_default();
// Use the test mail class instead of the default mail handler class.
variable_set('mail_system', array('default-system' => 'TestingMailSystem'));
@@ -1626,7 +1661,7 @@ protected function refreshVariables() {
* and reset the database prefix.
*/
protected function tearDown() {
- global $user, $language;
+ global $user, $language, $language_url;
// In case a fatal error occurred that was not in the test process read the
// log to pick up any fatal errors.
@@ -1691,12 +1726,15 @@ protected function tearDown() {
// Reset language.
$language = $this->originalLanguage;
+ $language_url = $this->originalLanguageUrl;
if ($this->originalLanguageDefault) {
$GLOBALS['conf']['language_default'] = $this->originalLanguageDefault;
}
- // Close the CURL handler.
+ // Close the CURL handler and reset the cookies array so test classes
+ // containing multiple tests are not polluted.
$this->curlClose();
+ $this->cookies = array();
}
/**
@@ -2586,6 +2624,11 @@ protected function buildXPathQuery($xpath, array $args = array()) {
*
* @param $xpath
* The xpath string to use in the search.
+ * @param array $arguments
+ * An array of arguments with keys in the form ':name' matching the
+ * placeholders in the query. The values may be either strings or numeric
+ * values.
+ *
* @return
* The return value of the xpath search. For details on the xpath string
* format and return values see the SimpleXML documentation,
@@ -2757,7 +2800,7 @@ protected function getAbsoluteUrl($path) {
$path = substr($path, $length);
}
// Ensure that we have an absolute path.
- if ($path[0] !== '/') {
+ if (empty($path) || $path[0] !== '/') {
$path = '/' . $path;
}
// Finally, prepend the $base_url.
diff --git a/modules/simpletest/files/image-test-no-transparency.gif b/modules/simpletest/files/image-test-no-transparency.gif
new file mode 100644
index 00000000..15ae7772
Binary files /dev/null and b/modules/simpletest/files/image-test-no-transparency.gif differ
diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index 723736b6..316eb84a 100644
--- a/modules/simpletest/simpletest.info
+++ b/modules/simpletest/simpletest.info
@@ -11,6 +11,7 @@ configure = admin/config/development/testing/settings
files[] = tests/actions.test
files[] = tests/ajax.test
files[] = tests/batch.test
+files[] = tests/boot.test
files[] = tests/bootstrap.test
files[] = tests/cache.test
files[] = tests/common.test
@@ -56,8 +57,7 @@ files[] = tests/upgrade/update.trigger.test
files[] = tests/upgrade/update.field.test
files[] = tests/upgrade/update.user.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index 91f0f906..cf830478 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -154,7 +154,7 @@ function simpletest_run_tests($test_list, $reporter = 'drupal') {
}
/**
- * Batch operation callback.
+ * Implements callback_batch_operation().
*/
function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
simpletest_classloader_register();
@@ -205,6 +205,9 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
$context['finished'] = 1 - $size / $max;
}
+/**
+ * Implements callback_batch_finished().
+ */
function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
if ($success) {
drupal_set_message(t('The test run finished in @elapsed.', array('@elapsed' => $elapsed)));
@@ -371,7 +374,10 @@ function simpletest_test_get_all() {
// If this test class requires a non-existing module, skip it.
if (!empty($info['dependencies'])) {
foreach ($info['dependencies'] as $module) {
- if (!drupal_get_filename('module', $module)) {
+ // Pass FALSE as fourth argument so no error gets created for
+ // the missing file.
+ $found_module = drupal_get_filename('module', $module, NULL, FALSE);
+ if (!$found_module) {
continue 2;
}
}
@@ -509,25 +515,25 @@ function simpletest_registry_files_alter(&$files, $modules) {
* Generate test file.
*/
function simpletest_generate_file($filename, $width, $lines, $type = 'binary-text') {
- $size = $width * $lines - $lines;
-
- // Generate random text
$text = '';
- for ($i = 0; $i < $size; $i++) {
- switch ($type) {
- case 'text':
- $text .= chr(rand(32, 126));
- break;
- case 'binary':
- $text .= chr(rand(0, 31));
- break;
- case 'binary-text':
- default:
- $text .= rand(0, 1);
- break;
+ for ($i = 0; $i < $lines; $i++) {
+ // Generate $width - 1 characters to leave space for the "\n" character.
+ for ($j = 0; $j < $width - 1; $j++) {
+ switch ($type) {
+ case 'text':
+ $text .= chr(rand(32, 126));
+ break;
+ case 'binary':
+ $text .= chr(rand(0, 31));
+ break;
+ case 'binary-text':
+ default:
+ $text .= rand(0, 1);
+ break;
+ }
}
+ $text .= "\n";
}
- $text = wordwrap($text, $width - 1, "\n", TRUE) . "\n"; // Add \n for symmetrical file.
// Create filename.
file_put_contents('public://' . $filename . '.txt', $text);
diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test
index f22ef955..5d1c718c 100644
--- a/modules/simpletest/simpletest.test
+++ b/modules/simpletest/simpletest.test
@@ -322,6 +322,14 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase {
* Test internal testing framework browser.
*/
class SimpleTestBrowserTestCase extends DrupalWebTestCase {
+
+ /**
+ * A flag indicating whether a cookie has been set in a test.
+ *
+ * @var bool
+ */
+ protected static $cookieSet = FALSE;
+
public static function getInfo() {
return array(
'name' => 'SimpleTest browser',
@@ -380,6 +388,46 @@ EOF;
$urls = $this->xpath('//a[text()=:text]', array(':text' => 'A second "even more weird" link, in memory of George O\'Malley'));
$this->assertEqual($urls[0]['href'], 'link2', 'Match with mixed single and double quotes.');
}
+
+ /**
+ * Tests that cookies set during a request are available for testing.
+ */
+ public function testCookies() {
+ // Check that the $this->cookies property is populated when a user logs in.
+ $user = $this->drupalCreateUser();
+ $edit = array('name' => $user->name, 'pass' => $user->pass_raw);
+ $this->drupalPost('', $edit, t('Log in'));
+ $this->assertEqual(count($this->cookies), 1, 'A cookie is set when the user logs in.');
+
+ // Check that the name and value of the cookie match the request data.
+ $cookie_header = $this->drupalGetHeader('set-cookie', TRUE);
+
+ // The name and value are located at the start of the string, separated by
+ // an equals sign and ending in a semicolon.
+ preg_match('/^([^=]+)=([^;]+)/', $cookie_header, $matches);
+ $name = $matches[1];
+ $value = $matches[2];
+
+ $this->assertTrue(array_key_exists($name, $this->cookies), 'The cookie name is correct.');
+ $this->assertEqual($value, $this->cookies[$name]['value'], 'The cookie value is correct.');
+
+ // Set a flag indicating that a cookie has been set in this test.
+ // @see SimpleTestBrowserTestCase::testCookieDoesNotBleed().
+ self::$cookieSet = TRUE;
+ }
+
+ /**
+ * Tests that the cookies from a previous test do not bleed into a new test.
+ *
+ * @see SimpleTestBrowserTestCase::testCookies().
+ */
+ public function testCookieDoesNotBleed() {
+ // In order for this test to be effective it should always run after the
+ // testCookies() test.
+ $this->assertTrue(self::$cookieSet, 'Tests have been executed in the expected order.');
+ $this->assertEqual(count($this->cookies), 0, 'No cookies are present at the start of a new test.');
+ }
+
}
class SimpleTestMailCaptureTestCase extends DrupalWebTestCase {
diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index b880d5d7..dd6a1b20 100644
--- a/modules/simpletest/tests/actions_loop_test.info
+++ b/modules/simpletest/tests/actions_loop_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index f0353069..5b1038d0 100644
--- a/modules/simpletest/tests/ajax_forms_test.info
+++ b/modules/simpletest/tests/ajax_forms_test.info
@@ -5,8 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index a09870c8..c85f9aaa 100644
--- a/modules/simpletest/tests/ajax_test.info
+++ b/modules/simpletest/tests/ajax_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/batch_test.callbacks.inc b/modules/simpletest/tests/batch_test.callbacks.inc
index 75e66553..6564413d 100644
--- a/modules/simpletest/tests/batch_test.callbacks.inc
+++ b/modules/simpletest/tests/batch_test.callbacks.inc
@@ -7,6 +7,8 @@
*/
/**
+ * Implements callback_batch_operation().
+ *
* Simple batch operation.
*/
function _batch_test_callback_1($id, $sleep, &$context) {
@@ -20,6 +22,8 @@ function _batch_test_callback_1($id, $sleep, &$context) {
}
/**
+ * Implements callback_batch_operation().
+ *
* Multistep batch operation.
*/
function _batch_test_callback_2($start, $total, $sleep, &$context) {
@@ -53,6 +57,8 @@ function _batch_test_callback_2($start, $total, $sleep, &$context) {
}
/**
+ * Implements callback_batch_operation().
+ *
* Simple batch operation.
*/
function _batch_test_callback_5($id, $sleep, &$context) {
@@ -68,6 +74,8 @@ function _batch_test_callback_5($id, $sleep, &$context) {
}
/**
+ * Implements callback_batch_operation().
+ *
* Batch operation setting up its own batch.
*/
function _batch_test_nested_batch_callback() {
@@ -76,6 +84,8 @@ function _batch_test_nested_batch_callback() {
}
/**
+ * Implements callback_batch_finished().
+ *
* Common 'finished' callbacks for batches 1 to 4.
*/
function _batch_test_finished_helper($batch_id, $success, $results, $operations) {
@@ -99,6 +109,8 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
}
/**
+ * Implements callback_batch_finished().
+ *
* 'finished' callback for batch 0.
*/
function _batch_test_finished_0($success, $results, $operations) {
@@ -106,6 +118,8 @@ function _batch_test_finished_0($success, $results, $operations) {
}
/**
+ * Implements callback_batch_finished().
+ *
* 'finished' callback for batch 1.
*/
function _batch_test_finished_1($success, $results, $operations) {
@@ -113,6 +127,8 @@ function _batch_test_finished_1($success, $results, $operations) {
}
/**
+ * Implements callback_batch_finished().
+ *
* 'finished' callback for batch 2.
*/
function _batch_test_finished_2($success, $results, $operations) {
@@ -120,6 +136,8 @@ function _batch_test_finished_2($success, $results, $operations) {
}
/**
+ * Implements callback_batch_finished().
+ *
* 'finished' callback for batch 3.
*/
function _batch_test_finished_3($success, $results, $operations) {
@@ -127,6 +145,8 @@ function _batch_test_finished_3($success, $results, $operations) {
}
/**
+ * Implements callback_batch_finished().
+ *
* 'finished' callback for batch 4.
*/
function _batch_test_finished_4($success, $results, $operations) {
@@ -134,6 +154,8 @@ function _batch_test_finished_4($success, $results, $operations) {
}
/**
+ * Implements callback_batch_finished().
+ *
* 'finished' callback for batch 5.
*/
function _batch_test_finished_5($success, $results, $operations) {
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index be057e33..f04ed7c9 100644
--- a/modules/simpletest/tests/batch_test.info
+++ b/modules/simpletest/tests/batch_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/boot.test b/modules/simpletest/tests/boot.test
new file mode 100644
index 00000000..562b082e
--- /dev/null
+++ b/modules/simpletest/tests/boot.test
@@ -0,0 +1,38 @@
+ 'Early bootstrap test',
+ 'description' => 'Confirm that calling module_implements() during early bootstrap does not pollute the module_implements() cache.',
+ 'group' => 'System',
+ );
+ }
+
+ function setUp() {
+ parent::setUp('boot_test_1', 'boot_test_2');
+ }
+
+ /**
+ * Test hook_boot() on both regular and "early exit" pages.
+ */
+ public function testHookBoot() {
+ $paths = array('', 'early_exit');
+ foreach ($paths as $path) {
+ // Empty the module_implements() caches.
+ module_implements(NULL, FALSE, TRUE);
+ // Do a request to the front page, which will call module_implements()
+ // during hook_boot().
+ $this->drupalGet($path);
+ // Reset the static cache so we get implementation data from the persistent
+ // cache.
+ drupal_static_reset();
+ // Make sure we get a full list of all modules implementing hook_help().
+ $modules = module_implements('help');
+ $this->assertTrue(in_array('boot_test_2', $modules));
+ }
+ }
+}
diff --git a/modules/simpletest/tests/boot_test_1.info b/modules/simpletest/tests/boot_test_1.info
new file mode 100644
index 00000000..405171c8
--- /dev/null
+++ b/modules/simpletest/tests/boot_test_1.info
@@ -0,0 +1,11 @@
+name = Early bootstrap tests
+description = A support module for hook_boot testing.
+core = 7.x
+package = Testing
+version = VERSION
+hidden = TRUE
+
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
+project = "drupal"
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/boot_test_1.module b/modules/simpletest/tests/boot_test_1.module
new file mode 100644
index 00000000..a452e289
--- /dev/null
+++ b/modules/simpletest/tests/boot_test_1.module
@@ -0,0 +1,21 @@
+proxy_ip;
+ $_SERVER['HTTP_X_FORWARDED_FOR'] = $this->proxy_ip;
+ drupal_static_reset('ip_address');
+ $this->assertTrue(
+ ip_address() == $this->proxy_ip,
+ 'Visiting from trusted proxy got proxy IP address.'
+ );
+
// Multi-tier architecture with comma separated values in header.
$_SERVER['REMOTE_ADDR'] = $this->proxy_ip;
$_SERVER['HTTP_X_FORWARDED_FOR'] = implode(', ', array($this->untrusted_ip, $this->forwarded_ip, $this->proxy2_ip));
@@ -152,7 +161,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
$this->drupalLogin($user);
$this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag));
$this->assertResponse(200, 'Conditional request returned 200 OK for authenticated user.');
- $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Absense of Page was not cached.');
+ $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Absence of Page was not cached.');
$this->assertFalse($this->drupalGetHeader('ETag'), 'ETag HTTP headers are not present for logged in users.');
$this->assertFalse($this->drupalGetHeader('Last-Modified'), 'Last-Modified HTTP headers are not present for logged in users.');
}
@@ -191,7 +200,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
$this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
$this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
$this->assertTrue(strpos($this->drupalGetHeader('Vary'), 'Cookie') === FALSE, 'Vary: Cookie header was not sent.');
- $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate, post-check=0, pre-check=0', 'Cache-Control header was sent.');
+ $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate', 'Cache-Control header was sent.');
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
$this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
@@ -313,6 +322,10 @@ class BootstrapAutoloadTestCase extends DrupalWebTestCase {
$this->assertTrue(drupal_autoload_interface('drupalautoloadtestinterface'), 'drupal_autoload_interface() recognizes DrupalAutoloadTestInterface in lower case.');
// Test class autoloader.
$this->assertTrue(drupal_autoload_class('drupalautoloadtestclass'), 'drupal_autoload_class() recognizes DrupalAutoloadTestClass in lower case.');
+ // Test trait autoloader.
+ if (version_compare(PHP_VERSION, '5.4') >= 0) {
+ $this->assertTrue(drupal_autoload_trait('drupalautoloadtesttrait'), 'drupal_autoload_trait() recognizes DrupalAutoloadTestTrait in lower case.');
+ }
}
}
@@ -375,12 +388,19 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
public static function getInfo() {
return array(
- 'name' => 'Get filename test',
- 'description' => 'Test that drupal_get_filename() works correctly when the file is not found in the database.',
+ 'name' => 'Get filename test (without the system table)',
+ 'description' => 'Test that drupal_get_filename() works correctly when the database is not available.',
'group' => 'Bootstrap',
);
}
+ /**
+ * The last file-related error message triggered by the filename test.
+ *
+ * Used by BootstrapGetFilenameTestCase::testDrupalGetFilename().
+ */
+ protected $getFilenameTestTriggeredError;
+
/**
* Test that drupal_get_filename() works correctly when the file is not found in the database.
*/
@@ -410,6 +430,203 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
// automatically check there for 'script' files, just as it does for (e.g.)
// 'module' files in modules.
$this->assertIdentical(drupal_get_filename('script', 'test'), 'scripts/test.script', t('Retrieve test script location.'));
+
+ // When searching for a module that does not exist, drupal_get_filename()
+ // should return NULL and trigger an appropriate error message.
+ $this->getFilenameTestTriggeredError = NULL;
+ set_error_handler(array($this, 'fileNotFoundErrorHandler'));
+ $non_existing_module = $this->randomName();
+ $this->assertNull(drupal_get_filename('module', $non_existing_module), 'Searching for a module that does not exist returns NULL.');
+ $this->assertTrue(strpos($this->getFilenameTestTriggeredError, format_string('The following module is missing from the file system: %name', array('%name' => $non_existing_module))) === 0, 'Searching for an item that does not exist triggers the correct error.');
+ restore_error_handler();
+
+ // Check that the result is stored in the file system scan cache.
+ $file_scans = _drupal_file_scan_cache();
+ $this->assertIdentical($file_scans['module'][$non_existing_module], FALSE, 'Searching for a module that does not exist creates a record in the missing and moved files static variable.');
+
+ // Performing the search again in the same request still should not find
+ // the file, but the error message should not be repeated (therefore we do
+ // not override the error handler here).
+ $this->assertNull(drupal_get_filename('module', $non_existing_module), 'Searching for a module that does not exist returns NULL during the second search.');
+ }
+
+ /**
+ * Skips handling of "file not found" errors.
+ */
+ public function fileNotFoundErrorHandler($error_level, $message, $filename, $line, $context) {
+ // Skip error handling if this is a "file not found" error.
+ if (strpos($message, 'is missing from the file system:') !== FALSE || strpos($message, 'has moved within the file system:') !== FALSE) {
+ $this->getFilenameTestTriggeredError = $message;
+ return;
+ }
+ _drupal_error_handler($error_level, $message, $filename, $line, $context);
+ }
+}
+
+/**
+ * Test drupal_get_filename() in the context of a full Drupal installation.
+ */
+class BootstrapGetFilenameWebTestCase extends DrupalWebTestCase {
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Get filename test (full installation)',
+ 'description' => 'Test that drupal_get_filename() works correctly in the context of a full Drupal installation.',
+ 'group' => 'Bootstrap',
+ );
+ }
+
+ function setUp() {
+ parent::setUp('system_test');
+ }
+
+ /**
+ * The last file-related error message triggered by the filename test.
+ *
+ * Used by BootstrapGetFilenameWebTestCase::testDrupalGetFilename().
+ */
+ protected $getFilenameTestTriggeredError;
+
+ /**
+ * Test that drupal_get_filename() works correctly with a full Drupal site.
+ */
+ function testDrupalGetFilename() {
+ // Search for a module that exists in the file system and the {system}
+ // table and make sure that it is found.
+ $this->assertIdentical(drupal_get_filename('module', 'node'), 'modules/node/node.module', 'Module found at expected location.');
+
+ // Search for a module that does not exist in either the file system or the
+ // {system} table. Make sure that an appropriate error is triggered and
+ // that the module winds up in the static and persistent cache.
+ $this->getFilenameTestTriggeredError = NULL;
+ set_error_handler(array($this, 'fileNotFoundErrorHandler'));
+ $non_existing_module = $this->randomName();
+ $this->assertNull(drupal_get_filename('module', $non_existing_module), 'Searching for a module that does not exist returns NULL.');
+ $this->assertTrue(strpos($this->getFilenameTestTriggeredError, format_string('The following module is missing from the file system: %name', array('%name' => $non_existing_module))) === 0, 'Searching for a module that does not exist triggers the correct error.');
+ restore_error_handler();
+ $file_scans = _drupal_file_scan_cache();
+ $this->assertIdentical($file_scans['module'][$non_existing_module], FALSE, 'Searching for a module that does not exist creates a record in the missing and moved files static variable.');
+ drupal_file_scan_write_cache();
+ $cache = cache_get('_drupal_file_scan_cache', 'cache_bootstrap');
+ $this->assertIdentical($cache->data['module'][$non_existing_module], FALSE, 'Searching for a module that does not exist creates a record in the missing and moved files persistent cache.');
+
+ // Simulate moving a module to a location that does not match the location
+ // in the {system} table and perform similar tests as above.
+ db_update('system')
+ ->fields(array('filename' => 'modules/simpletest/tests/fake_location/module_test.module'))
+ ->condition('name', 'module_test')
+ ->condition('type', 'module')
+ ->execute();
+ $this->getFilenameTestTriggeredError = NULL;
+ set_error_handler(array($this, 'fileNotFoundErrorHandler'));
+ $this->assertIdentical(drupal_get_filename('module', 'module_test'), 'modules/simpletest/tests/module_test.module', 'Searching for a module that has moved finds the module at its new location.');
+ $this->assertTrue(strpos($this->getFilenameTestTriggeredError, format_string('The following module has moved within the file system: %name', array('%name' => 'module_test'))) === 0, 'Searching for a module that has moved triggers the correct error.');
+ restore_error_handler();
+ $file_scans = _drupal_file_scan_cache();
+ $this->assertIdentical($file_scans['module']['module_test'], 'modules/simpletest/tests/module_test.module', 'Searching for a module that has moved creates a record in the missing and moved files static variable.');
+ drupal_file_scan_write_cache();
+ $cache = cache_get('_drupal_file_scan_cache', 'cache_bootstrap');
+ $this->assertIdentical($cache->data['module']['module_test'], 'modules/simpletest/tests/module_test.module', 'Searching for a module that has moved creates a record in the missing and moved files persistent cache.');
+
+ // Simulate a module that exists in the {system} table but does not exist
+ // in the file system and perform similar tests as above.
+ $non_existing_module = $this->randomName();
+ db_update('system')
+ ->fields(array('name' => $non_existing_module))
+ ->condition('name', 'module_test')
+ ->condition('type', 'module')
+ ->execute();
+ $this->getFilenameTestTriggeredError = NULL;
+ set_error_handler(array($this, 'fileNotFoundErrorHandler'));
+ $this->assertNull(drupal_get_filename('module', $non_existing_module), 'Searching for a module that exists in the system table but not in the file system returns NULL.');
+ $this->assertTrue(strpos($this->getFilenameTestTriggeredError, format_string('The following module is missing from the file system: %name', array('%name' => $non_existing_module))) === 0, 'Searching for a module that exists in the system table but not in the file system triggers the correct error.');
+ restore_error_handler();
+ $file_scans = _drupal_file_scan_cache();
+ $this->assertIdentical($file_scans['module'][$non_existing_module], FALSE, 'Searching for a module that exists in the system table but not in the file system creates a record in the missing and moved files static variable.');
+ drupal_file_scan_write_cache();
+ $cache = cache_get('_drupal_file_scan_cache', 'cache_bootstrap');
+ $this->assertIdentical($cache->data['module'][$non_existing_module], FALSE, 'Searching for a module that exists in the system table but not in the file system creates a record in the missing and moved files persistent cache.');
+
+ // Simulate a module that exists in the file system but not in the {system}
+ // table and perform similar tests as above.
+ db_delete('system')
+ ->condition('name', 'common_test')
+ ->condition('type', 'module')
+ ->execute();
+ system_list_reset();
+ $this->getFilenameTestTriggeredError = NULL;
+ set_error_handler(array($this, 'fileNotFoundErrorHandler'));
+ $this->assertIdentical(drupal_get_filename('module', 'common_test'), 'modules/simpletest/tests/common_test.module', 'Searching for a module that does not exist in the system table finds the module at its actual location.');
+ $this->assertTrue(strpos($this->getFilenameTestTriggeredError, format_string('The following module has moved within the file system: %name', array('%name' => 'common_test'))) === 0, 'Searching for a module that does not exist in the system table triggers the correct error.');
+ restore_error_handler();
+ $file_scans = _drupal_file_scan_cache();
+ $this->assertIdentical($file_scans['module']['common_test'], 'modules/simpletest/tests/common_test.module', 'Searching for a module that does not exist in the system table creates a record in the missing and moved files static variable.');
+ drupal_file_scan_write_cache();
+ $cache = cache_get('_drupal_file_scan_cache', 'cache_bootstrap');
+ $this->assertIdentical($cache->data['module']['common_test'], 'modules/simpletest/tests/common_test.module', 'Searching for a module that does not exist in the system table creates a record in the missing and moved files persistent cache.');
+ }
+
+ /**
+ * Skips handling of "file not found" errors.
+ */
+ public function fileNotFoundErrorHandler($error_level, $message, $filename, $line, $context) {
+ // Skip error handling if this is a "file not found" error.
+ if (strpos($message, 'is missing from the file system:') !== FALSE || strpos($message, 'has moved within the file system:') !== FALSE) {
+ $this->getFilenameTestTriggeredError = $message;
+ return;
+ }
+ _drupal_error_handler($error_level, $message, $filename, $line, $context);
+ }
+
+ /**
+ * Test that watchdog messages about missing files are correctly recorded.
+ */
+ public function testWatchdog() {
+ // Search for a module that does not exist in either the file system or the
+ // {system} table. Make sure that an appropriate warning is recorded in the
+ // logs.
+ $non_existing_module = $this->randomName();
+ $query_parameters = array(
+ ':type' => 'php',
+ ':severity' => WATCHDOG_WARNING,
+ );
+ $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND severity = :severity', $query_parameters)->fetchField(), 0, 'No warning message appears in the logs before searching for a module that does not exist.');
+ // Trigger the drupal_get_filename() call. This must be done via a request
+ // to a separate URL since the watchdog() will happen in a shutdown
+ // function, and so that SimpleTest can be told to ignore (and not fail as
+ // a result of) the expected PHP warnings generated during this process.
+ variable_set('system_test_drupal_get_filename_test_module_name', $non_existing_module);
+ $this->drupalGet('system-test/drupal-get-filename');
+ $message_variables = db_query('SELECT variables FROM {watchdog} WHERE type = :type AND severity = :severity', $query_parameters)->fetchCol();
+ $this->assertEqual(count($message_variables), 1, 'A single warning message appears in the logs after searching for a module that does not exist.');
+ $variables = reset($message_variables);
+ $variables = unserialize($variables);
+ $this->assertTrue(isset($variables['!message']) && strpos($variables['!message'], format_string('The following module is missing from the file system: %name', array('%name' => $non_existing_module))) !== FALSE, 'The warning message that appears in the logs after searching for a module that does not exist contains the expected text.');
+ }
+
+ /**
+ * Test that drupal_get_filename() does not break recursive rebuilds.
+ */
+ public function testRecursiveRebuilds() {
+ // Ensure that the drupal_get_filename() call due to a missing module does
+ // not break the data returned by an attempted recursive rebuild. The code
+ // path which is tested is as follows:
+ // - Call drupal_get_schema().
+ // - Within a hook_schema() implementation, trigger a drupal_get_filename()
+ // search for a nonexistent module.
+ // - In the watchdog() call that results from that, trigger
+ // drupal_get_schema() again.
+ // Without some kind of recursion protection, this could cause the second
+ // drupal_get_schema() call to return incomplete results. This test ensures
+ // that does not happen.
+ $non_existing_module = $this->randomName();
+ variable_set('system_test_drupal_get_filename_test_module_name', $non_existing_module);
+ $this->drupalGet('system-test/drupal-get-filename-with-schema-rebuild');
+ $original_drupal_get_schema_tables = variable_get('system_test_drupal_get_filename_with_schema_rebuild_original_tables');
+ $final_drupal_get_schema_tables = variable_get('system_test_drupal_get_filename_with_schema_rebuild_final_tables');
+ $this->assertTrue(!empty($original_drupal_get_schema_tables));
+ $this->assertTrue(!empty($final_drupal_get_schema_tables));
+ $this->assertEqual($original_drupal_get_schema_tables, $final_drupal_get_schema_tables);
}
}
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 88fdd04d..f86be2a7 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -76,7 +76,7 @@ class DrupalAlterTestCase extends DrupalWebTestCase {
class CommonURLUnitTest extends DrupalWebTestCase {
public static function getInfo() {
return array(
- 'name' => 'URL generation tests',
+ 'name' => 'URL generation unit tests',
'description' => 'Confirm that url(), drupal_get_query_parameters(), drupal_http_build_query(), and l() work correctly with various input.',
'group' => 'System',
);
@@ -169,7 +169,7 @@ class CommonURLUnitTest extends DrupalWebTestCase {
$this->assertEqual(drupal_http_build_query(array('a' => ' &#//+%20@۞')), 'a=%20%26%23//%2B%2520%40%DB%9E', 'Value was properly encoded.');
$this->assertEqual(drupal_http_build_query(array(' &#//+%20@۞' => 'a')), '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', 'Key was properly encoded.');
$this->assertEqual(drupal_http_build_query(array('a' => '1', 'b' => '2', 'c' => '3')), 'a=1&b=2&c=3', 'Multiple values were properly concatenated.');
- $this->assertEqual(drupal_http_build_query(array('a' => array('b' => '2', 'c' => '3'), 'd' => 'foo')), 'a[b]=2&a[c]=3&d=foo', 'Nested array was properly encoded.');
+ $this->assertEqual(drupal_http_build_query(array('a' => array('b' => '2', 'c' => '3'), 'd' => 'foo')), 'a%5Bb%5D=2&a%5Bc%5D=3&d=foo', 'Nested array was properly encoded.');
}
/**
@@ -372,6 +372,97 @@ class CommonURLUnitTest extends DrupalWebTestCase {
}
}
+/**
+ * Web tests for URL generation functions.
+ */
+class CommonURLWebTest extends DrupalWebTestCase {
+ public static function getInfo() {
+ return array(
+ 'name' => 'URL generation web tests',
+ 'description' => 'Confirm that URL-generating functions work correctly on specific site paths.',
+ 'group' => 'System',
+ );
+ }
+
+ function setUp() {
+ parent::setUp('common_test');
+ }
+
+ /**
+ * Tests the url() function on internal paths which mimic external URLs.
+ */
+ function testInternalPathMimicsExternal() {
+ // Ensure that calling url(current_path()) on "/http://example.com" (an
+ // internal path which mimics an external URL) always links to the internal
+ // path, not the external URL. This helps protect against external URL link
+ // injection vulnerabilities.
+ variable_set('common_test_link_to_current_path', TRUE);
+ $this->drupalGet('/http://example.com');
+ $this->clickLink('link which should point to the current path');
+ $this->assertUrl('/http://example.com');
+ $this->assertText('link which should point to the current path');
+ }
+}
+
+/**
+ * Tests url_is_external().
+ */
+class UrlIsExternalUnitTest extends DrupalUnitTestCase {
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'External URL checking',
+ 'description' => 'Performs tests on url_is_external().',
+ 'group' => 'System',
+ );
+ }
+
+ /**
+ * Tests if each URL is external or not.
+ */
+ function testUrlIsExternal() {
+ foreach ($this->examples() as $path => $expected) {
+ $this->assertIdentical(url_is_external($path), $expected, $path);
+ }
+ }
+
+ /**
+ * Provides data for testUrlIsExternal().
+ *
+ * @return array
+ * An array of test data, keyed by a path, with the expected value where
+ * TRUE is external, and FALSE is not external.
+ */
+ protected function examples() {
+ return array(
+ // Simple external URLs.
+ 'http://example.com' => TRUE,
+ 'https://example.com' => TRUE,
+ 'http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo' => TRUE,
+ '//drupal.org' => TRUE,
+ // Some browsers ignore or strip leading control characters.
+ "\x00//www.example.com" => TRUE,
+ "\x08//www.example.com" => TRUE,
+ "\x1F//www.example.com" => TRUE,
+ "\n//www.example.com" => TRUE,
+ // JSON supports decoding directly from UTF-8 code points.
+ json_decode('"\u00AD"') . "//www.example.com" => TRUE,
+ json_decode('"\u200E"') . "//www.example.com" => TRUE,
+ json_decode('"\uE0020"') . "//www.example.com" => TRUE,
+ json_decode('"\uE000"') . "//www.example.com" => TRUE,
+ // Backslashes should be normalized to forward.
+ '\\\\example.com' => TRUE,
+ // Local URLs.
+ 'node' => FALSE,
+ '/system/ajax' => FALSE,
+ '?q=foo:bar' => FALSE,
+ 'node/edit:me' => FALSE,
+ '/drupal.org' => FALSE,
+ '' => FALSE,
+ );
+ }
+}
+
/**
* Tests for check_plain(), filter_xss(), format_string(), and check_url().
*/
@@ -888,6 +979,31 @@ class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
// Verify that invalid characters (including non-breaking space) are stripped from the identifier.
$this->assertIdentical(drupal_clean_css_identifier('invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ identifier', array()), 'invalididentifier', 'Strip invalid characters.');
+
+ // Verify that double underscores are replaced in the identifier by default.
+ $identifier = 'css__identifier__with__double__underscores';
+ $expected = 'css--identifier--with--double--underscores';
+ $this->assertIdentical(drupal_clean_css_identifier($identifier), $expected, 'Verify double underscores are replaced with double hyphens by default.');
+
+ // Verify that double underscores are preserved in the identifier if the
+ // variable allow_css_double_underscores is set to TRUE.
+ $this->setAllowCSSDoubleUnderscores(TRUE);
+ $this->assertIdentical(drupal_clean_css_identifier($identifier), $identifier, 'Verify double underscores are preserved if the allow_css_double_underscores set to TRUE.');
+
+ // To avoid affecting other test cases, set the variable
+ // allow_css_double_underscores to FALSE which is the default value.
+ $this->setAllowCSSDoubleUnderscores(FALSE);
+ }
+
+ /**
+ * Set the variable allow_css_double_underscores and reset the cache.
+ *
+ * @param $value bool
+ * A new value to be set to allow_css_double_underscores.
+ */
+ function setAllowCSSDoubleUnderscores($value) {
+ $GLOBALS['conf']['allow_css_double_underscores'] = $value;
+ drupal_static_reset('drupal_clean_css_identifier:allow_css_double_underscores');
}
/**
@@ -1195,7 +1311,7 @@ class DrupalSetContentTestCase extends DrupalWebTestCase {
function testRegions() {
global $theme_key;
- $block_regions = array_keys(system_region_list($theme_key));
+ $block_regions = system_region_list($theme_key, REGIONS_ALL, FALSE);
$delimiter = $this->randomName(32);
$values = array();
// Set some random content for each region available.
@@ -1256,6 +1372,15 @@ class DrupalGotoTest extends DrupalWebTestCase {
$this->assertText('drupal_goto', 'Drupal goto redirect succeeded.');
$this->assertEqual($this->getUrl(), url('common-test/drupal_goto', array('query' => array('foo' => '123'), 'absolute' => TRUE)), 'Drupal goto redirected to expected URL.');
+ // Test that calling drupal_goto() on the current path is not dangerous.
+ variable_set('common_test_redirect_current_path', TRUE);
+ $this->drupalGet('', array('query' => array('q' => 'http://www.example.com/')));
+ $headers = $this->drupalGetHeaders(TRUE);
+ list(, $status) = explode(' ', $headers[0][':status'], 3);
+ $this->assertEqual($status, 302, 'Expected response code was sent.');
+ $this->assertNotEqual($this->getUrl(), 'http://www.example.com/', 'Drupal goto did not redirect to external URL.');
+ $this->assertTrue(strpos($this->getUrl(), url('', array('absolute' => TRUE))) === 0, 'Drupal redirected to itself.');
+ variable_del('common_test_redirect_current_path');
// Test that drupal_goto() respects ?destination=xxx. Use an complicated URL
// to test that the path is encoded and decoded properly.
$destination = 'common-test/drupal_goto/destination?foo=%2525&bar=123';
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index 1719db7a..744d932c 100644
--- a/modules/simpletest/tests/common_test.info
+++ b/modules/simpletest/tests/common_test.info
@@ -7,8 +7,7 @@ stylesheets[all][] = common_test.css
stylesheets[print][] = common_test.print.css
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index 674a4944..d092c924 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -92,6 +92,18 @@ function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code)
}
}
+/**
+ * Implements hook_init().
+ */
+function common_test_init() {
+ if (variable_get('common_test_redirect_current_path', FALSE)) {
+ drupal_goto(current_path());
+ }
+ if (variable_get('common_test_link_to_current_path', FALSE)) {
+ drupal_set_message(l('link which should point to the current path', current_path()));
+ }
+}
+
/**
* Print destination query parameter.
*/
diff --git a/modules/simpletest/tests/common_test_cron_helper.info b/modules/simpletest/tests/common_test_cron_helper.info
index e00bd241..1f1f8554 100644
--- a/modules/simpletest/tests/common_test_cron_helper.info
+++ b/modules/simpletest/tests/common_test_cron_helper.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index e5022598..381e3d21 100644
--- a/modules/simpletest/tests/database_test.info
+++ b/modules/simpletest/tests/database_test.info
@@ -5,8 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
index f78833af..82237d84 100644
--- a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
+++ b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
@@ -7,8 +7,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.module b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.module
index 37aa94eb..edd5d77c 100644
--- a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.module
+++ b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.module
@@ -4,3 +4,19 @@
* @file
* Test module to check code registry.
*/
+
+/**
+ * Implements hook_registry_files_alter().
+ */
+function drupal_autoload_test_registry_files_alter(&$files, $modules) {
+ foreach ($modules as $module) {
+ // Add the drupal_autoload_test_trait.sh file to the registry when PHP 5.4+
+ // is being used.
+ if ($module->name == 'drupal_autoload_test' && version_compare(PHP_VERSION, '5.4') >= 0) {
+ $files["$module->dir/drupal_autoload_test_trait.sh"] = array(
+ 'module' => $module->name,
+ 'weight' => $module->weight,
+ );
+ }
+ }
+}
diff --git a/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test_trait.sh b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test_trait.sh
new file mode 100644
index 00000000..69ce9ec0
--- /dev/null
+++ b/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test_trait.sh
@@ -0,0 +1,16 @@
+assertText('The form has become outdated. Copy any unsaved work in the form below');
}
+ /**
+ * Tests that a form with a disabled CSRF token can be validated.
+ */
+ function testDisabledToken() {
+ $this->drupalPost('form-test/validate-no-token', array(), 'Save');
+ $this->assertText('The form_test_validate_no_token form has been submitted successfully.');
+ }
+
/**
* Tests partial form validation through #limit_validation_errors.
*/
@@ -994,6 +1002,26 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
$this->assertTrue(isset($errors['tableselect']), 'Option checker disallows invalid values for radio buttons.');
}
+ /**
+ * Test presence of ajax functionality
+ */
+ function testAjax() {
+ $rows = array('row1', 'row2', 'row3');
+ // Test checkboxes (#multiple == TRUE).
+ foreach ($rows as $row) {
+ $element = 'tableselect[' . $row . ']';
+ $edit = array($element => TRUE);
+ $result = $this->drupalPostAJAX('form_test/tableselect/multiple-true', $edit, $element);
+ $this->assertFalse(empty($result), t('Ajax triggers on checkbox for @row.', array('@row' => $row)));
+ }
+ // Test radios (#multiple == FALSE).
+ $element = 'tableselect';
+ foreach ($rows as $row) {
+ $edit = array($element => $row);
+ $result = $this->drupalPostAjax('form_test/tableselect/multiple-false', $edit, $element);
+ $this->assertFalse(empty($result), t('Ajax triggers on radio for @row.', array('@row' => $row)));
+ }
+ }
/**
* Helper function for the option check test to submit a form while collecting errors.
@@ -2099,3 +2127,36 @@ class HTMLIdTestCase extends DrupalWebTestCase {
$this->assertNoDuplicateIds('There are no duplicate IDs');
}
}
+
+/**
+ * Tests for form textarea.
+ */
+class FormTextareaTestCase extends DrupalUnitTestCase {
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Form textarea',
+ 'description' => 'Tests form textarea related functions.',
+ 'group' => 'Form API',
+ );
+ }
+
+ /**
+ * Tests that textarea value is properly set.
+ */
+ public function testValueCallback() {
+ $element = array();
+ $form_state = array();
+ $test_cases = array(
+ array(NULL, FALSE),
+ array(NULL, NULL),
+ array('', array('test')),
+ array('test', 'test'),
+ array('123', 123),
+ );
+ foreach ($test_cases as $test_case) {
+ list($expected, $input) = $test_case;
+ $this->assertIdentical($expected, form_type_textarea_value($element, $input, $form_state));
+ }
+ }
+}
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index 1b327b30..40254ae5 100644
--- a/modules/simpletest/tests/form_test.info
+++ b/modules/simpletest/tests/form_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module
index 602b4090..097e5884 100644
--- a/modules/simpletest/tests/form_test.module
+++ b/modules/simpletest/tests/form_test.module
@@ -37,6 +37,13 @@ function form_test_menu() {
'access callback' => TRUE,
'type' => MENU_CALLBACK,
);
+ $items['form-test/validate-no-token'] = array(
+ 'title' => 'Form validation without a CSRF token',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('form_test_validate_no_token'),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
+ );
$items['form-test/limit-validation-errors'] = array(
'title' => 'Form validation with some error suppression',
'page callback' => 'drupal_get_form',
@@ -454,6 +461,27 @@ function form_test_validate_required_form_no_title_submit($form, &$form_state) {
drupal_set_message('The form_test_validate_required_form_no_title form was submitted successfully.');
}
+/**
+ * Form builder for testing submission of a form without a CSRF token.
+ */
+function form_test_validate_no_token($form, &$form_state) {
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => 'Save',
+ );
+
+ $form['#token'] = FALSE;
+
+ return $form;
+}
+
+/**
+ * Form submission handler for form_test_validate_no_token().
+ */
+function form_test_validate_no_token_submit($form, &$form_state) {
+ drupal_set_message('The form_test_validate_no_token form has been submitted successfully.');
+}
+
/**
* Builds a simple form with a button triggering partial validation.
*/
@@ -589,11 +617,17 @@ function _form_test_tableselect_form_builder($form, $form_state, $element_proper
$form['tableselect'] = $element_properties;
$form['tableselect'] += array(
+ '#prefix' => ' is 1000 characters."
*/
function testVeryLongLineWrap() {
- $input = 'Drupal
Drupal'; $output = drupal_html_to_text($input); // This awkward construct comes from includes/mail.inc lines 8-13. $eol = variable_get('mail_line_endings', MAIL_LINE_ENDINGS); @@ -455,7 +455,6 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { $maximum_line_length = max($maximum_line_length, strlen($line . $eol)); } $verbose = 'Maximum line length found was ' . $maximum_line_length . ' octets.'; - // @todo This should assert that $maximum_line_length <= 1000. - $this->pass($verbose); + $this->assertTrue($maximum_line_length <= 1000, $verbose); } } diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info index 162e912a..0599f903 100644 --- a/modules/simpletest/tests/menu_test.info +++ b/modules/simpletest/tests/menu_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test index 371339f3..eea3b51e 100644 --- a/modules/simpletest/tests/module.test +++ b/modules/simpletest/tests/module.test @@ -302,3 +302,45 @@ class ModuleUninstallTestCase extends DrupalWebTestCase { $this->assertEqual(0, $count, 'Permissions were all removed.'); } } + +class ModuleImplementsAlterTestCase extends DrupalWebTestCase { + public static function getInfo() { + return array( + 'name' => 'Module implements alter', + 'description' => 'Tests hook_module_implements_alter().', + 'group' => 'Module', + ); + } + + /** + * Tests hook_module_implements_alter() adding an implementation. + */ + function testModuleImplementsAlter() { + module_enable(array('module_test'), FALSE); + $this->assertTrue(module_exists('module_test'), 'Test module is enabled.'); + + // Assert that module_test.module is now included. + $this->assertTrue(function_exists('module_test_permission'), + 'The file module_test.module was successfully included.'); + + $modules = module_implements('permission'); + $this->assertTrue(in_array('module_test', $modules), 'module_test implements hook_permission.'); + + $modules = module_implements('module_implements_alter'); + $this->assertTrue(in_array('module_test', $modules), 'module_test implements hook_module_implements_alter().'); + + // Assert that module_test.implementations.inc is not included yet. + $this->assertFalse(function_exists('module_test_altered_test_hook'), + 'The file module_test.implementations.inc is not included yet.'); + + // Assert that module_test_module_implements_alter(*, 'altered_test_hook') + // has added an implementation + $this->assertTrue(in_array('module_test', module_implements('altered_test_hook')), + 'module_test implements hook_altered_test_hook().'); + + // Assert that module_test.implementations.inc was included as part of the process. + $this->assertTrue(function_exists('module_test_altered_test_hook'), + 'The file module_test.implementations.inc was included.'); + } + +} diff --git a/modules/simpletest/tests/module_test.implementations.inc b/modules/simpletest/tests/module_test.implementations.inc new file mode 100644 index 00000000..63c866ea --- /dev/null +++ b/modules/simpletest/tests/module_test.implementations.inc @@ -0,0 +1,10 @@ +2.0) -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info index f469bd7f..837ea2e3 100644 --- a/modules/simpletest/tests/system_incompatible_module_version_test.info +++ b/modules/simpletest/tests/system_incompatible_module_version_test.info @@ -5,8 +5,7 @@ version = 1.0 core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/system_project_namespace_test.info b/modules/simpletest/tests/system_project_namespace_test.info new file mode 100644 index 00000000..1f30959e --- /dev/null +++ b/modules/simpletest/tests/system_project_namespace_test.info @@ -0,0 +1,12 @@ +name = "System project namespace test" +description = "Support module for testing project namespace dependencies." +package = Testing +version = VERSION +core = 7.x +hidden = TRUE +dependencies[] = drupal:filter + +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" +project = "drupal" +datestamp = "1539816636" diff --git a/modules/simpletest/tests/system_project_namespace_test.module b/modules/simpletest/tests/system_project_namespace_test.module new file mode 100644 index 00000000..b3d9bbc7 --- /dev/null +++ b/modules/simpletest/tests/system_project_namespace_test.module @@ -0,0 +1 @@ + MENU_CALLBACK, ); + $items['system-test/drupal-get-filename'] = array( + 'title' => 'Test drupal_get_filename()', + 'page callback' => 'system_test_drupal_get_filename', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); + + $items['system-test/drupal-get-filename-with-schema-rebuild'] = array( + 'title' => 'Test drupal_get_filename() with a schema rebuild', + 'page callback' => 'system_test_drupal_get_filename_with_schema_rebuild', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); + return $items; } @@ -296,6 +310,9 @@ function system_test_system_info_alter(&$info, $file, $type) { } } + if ($file->name == 'system_project_namespace_test') { + $info['hidden'] = FALSE; + } // Make the system_dependencies_test visible by default. if ($file->name == 'system_dependencies_test') { $info['hidden'] = FALSE; @@ -479,3 +496,76 @@ function system_test_request_destination() { // information. exit; } + +/** + * Page callback to run drupal_get_filename() on a particular module. + */ +function system_test_drupal_get_filename() { + // Prevent SimpleTest from failing as a result of the expected PHP warnings + // this function causes. Any warnings will be recorded in the database logs + // for examination by the tests. + define('SIMPLETEST_COLLECT_ERRORS', FALSE); + + $module_name = variable_get('system_test_drupal_get_filename_test_module_name'); + drupal_get_filename('module', $module_name); + + return ''; +} + +/** + * Page callback to run drupal_get_filename() and do a schema rebuild. + */ +function system_test_drupal_get_filename_with_schema_rebuild() { + // Prevent SimpleTest from failing as a result of the expected PHP warnings + // this function causes. + define('SIMPLETEST_COLLECT_ERRORS', FALSE); + + // Record the original database tables from drupal_get_schema(). + variable_set('system_test_drupal_get_filename_with_schema_rebuild_original_tables', array_keys(drupal_get_schema(NULL, TRUE))); + + // Trigger system_test_schema() and system_test_watchdog() to perform an + // attempted recursive rebuild when drupal_get_schema() is called. See + // BootstrapGetFilenameWebTestCase::testRecursiveRebuilds(). + variable_set('system_test_drupal_get_filename_attempt_recursive_rebuild', TRUE); + drupal_get_schema(NULL, TRUE); + + return ''; +} + +/** + * Implements hook_watchdog(). + */ +function system_test_watchdog($log_entry) { + // If an attempted recursive schema rebuild has been triggered by + // system_test_drupal_get_filename_with_schema_rebuild(), perform the rebuild + // in response to the missing file message triggered by system_test_schema(). + if (!variable_get('system_test_drupal_get_filename_attempt_recursive_rebuild')) { + return; + } + if ($log_entry['type'] != 'php' || $log_entry['severity'] != WATCHDOG_WARNING) { + return; + } + $module_name = variable_get('system_test_drupal_get_filename_test_module_name'); + if (!isset($log_entry['variables']['!message']) || strpos($log_entry['variables']['!message'], format_string('The following module is missing from the file system: %name', array('%name' => $module_name))) === FALSE) { + return; + } + variable_set('system_test_drupal_get_filename_with_schema_rebuild_final_tables', array_keys(drupal_get_schema())); +} + +/** + * Implements hook_module_implements_alter(). + */ +function system_test_module_implements_alter(&$implementations, $hook) { + // For BootstrapGetFilenameWebTestCase::testRecursiveRebuilds() to work + // correctly, this module's hook_schema() implementation cannot be either the + // first implementation (since that would trigger a potential recursive + // rebuild before anything is in the drupal_get_schema() cache) or the last + // implementation (since that would trigger a potential recursive rebuild + // after the cache is already complete). So put it somewhere in the middle. + if ($hook == 'schema') { + $group = $implementations['system_test']; + unset($implementations['system_test']); + $count = count($implementations); + $implementations = array_merge(array_slice($implementations, 0, $count / 2, TRUE), array('system_test' => $group), array_slice($implementations, $count / 2, NULL, TRUE)); + } +} diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info index ebb752e3..94aef660 100644 --- a/modules/simpletest/tests/taxonomy_test.info +++ b/modules/simpletest/tests/taxonomy_test.info @@ -6,8 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = taxonomy -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/taxonomy_test.module b/modules/simpletest/tests/taxonomy_test.module index f82950c3..f4144380 100644 --- a/modules/simpletest/tests/taxonomy_test.module +++ b/modules/simpletest/tests/taxonomy_test.module @@ -109,3 +109,33 @@ function taxonomy_test_get_antonym($tid) { ->execute() ->fetchField(); } + +/** + * Implements hook_query_alter(). + */ +function taxonomy_test_query_alter(QueryAlterableInterface $query) { + $value = variable_get(__FUNCTION__); + if (isset($value)) { + variable_set(__FUNCTION__, ++$value); + } +} + +/** + * Implements hook_query_TAG_alter(). + */ +function taxonomy_test_query_term_access_alter(QueryAlterableInterface $query) { + $value = variable_get(__FUNCTION__); + if (isset($value)) { + variable_set(__FUNCTION__, ++$value); + } +} + +/** + * Implements hook_query_TAG_alter(). + */ +function taxonomy_test_query_taxonomy_term_access_alter(QueryAlterableInterface $query) { + $value = variable_get(__FUNCTION__); + if (isset($value)) { + variable_set(__FUNCTION__, ++$value); + } +} diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test index f5ddfa9b..5f095bd5 100644 --- a/modules/simpletest/tests/theme.test +++ b/modules/simpletest/tests/theme.test @@ -646,3 +646,34 @@ class ThemeDebugMarkupTestCase extends DrupalWebTestCase { } } + +/** + * Tests module-provided theme engines. + */ +class ModuleProvidedThemeEngineTestCase extends DrupalWebTestCase { + + public static function getInfo() { + return array( + 'name' => 'Theme engine test', + 'description' => 'Tests module-provided theme engines.', + 'group' => 'Theme', + ); + } + + function setUp() { + parent::setUp('theme_test'); + theme_enable(array('test_theme', 'test_theme_nyan_cat')); + } + + /** + * Ensures that the module provided theme engine is found and used by core. + */ + function testEngineIsFoundAndWorking() { + variable_set('theme_default', 'test_theme_nyan_cat'); + variable_set('admin_theme', 'test_theme_nyan_cat'); + + $this->drupalGet('theme-test/engine-info-test'); + $this->assertText('Miaou'); + } + +} diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info index 9df1b617..c3635173 100644 --- a/modules/simpletest/tests/theme_test.info +++ b/modules/simpletest/tests/theme_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/theme_test.module b/modules/simpletest/tests/theme_test.module index 948d8175..1dbc3b95 100644 --- a/modules/simpletest/tests/theme_test.module +++ b/modules/simpletest/tests/theme_test.module @@ -27,9 +27,18 @@ function theme_test_system_theme_info() { $themes['test_theme'] = drupal_get_path('module', 'theme_test') . '/themes/test_theme/test_theme.info'; $themes['test_basetheme'] = drupal_get_path('module', 'theme_test') . '/themes/test_basetheme/test_basetheme.info'; $themes['test_subtheme'] = drupal_get_path('module', 'theme_test') . '/themes/test_subtheme/test_subtheme.info'; + $themes['test_theme_nyan_cat'] = drupal_get_path('module', 'theme_test') . '/themes/test_theme_nyan_cat/test_theme_nyan_cat.info'; return $themes; } +/** + * Implements hook_system_theme_engine_info(). + */ +function theme_test_system_theme_engine_info() { + $theme_engines['nyan_cat'] = drupal_get_path('module', 'theme_test') . '/themes/engines/nyan_cat/nyan_cat.engine'; + return $theme_engines; +} + /** * Implements hook_menu(). */ @@ -58,6 +67,12 @@ function theme_test_menu() { 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); + $items['theme-test/engine-info-test'] = array( + 'description' => "Serves a simple page rendered using a Nyan Cat theme engine template.", + 'page callback' => '_theme_test_engine_info_test', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); return $items; } @@ -139,6 +154,15 @@ function _theme_test_drupal_add_region_content() { return 'Hello'; } +/** + * Serves a simple page renderered using a Nyan Cat theme engine template. + */ +function _theme_test_engine_info_test() { + return array( + '#markup' => theme('theme_test_template_test'), + ); +} + /** * Theme function for testing theme('theme_test_foo'). */ diff --git a/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine b/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine new file mode 100644 index 00000000..1b8ffef8 --- /dev/null +++ b/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine @@ -0,0 +1,53 @@ +filename) . '/template.theme'; + if (file_exists($file)) { + include_once DRUPAL_ROOT . '/' . $file; + } +} + +/** + * Implements hook_theme(). + */ +function nyan_cat_theme($existing, $type, $theme, $path) { + $templates = drupal_find_theme_functions($existing, array($theme)); + $templates += drupal_find_theme_templates($existing, '.nyan-cat.html', $path); + return $templates; +} + +/** + * Implements hook_extension(). + */ +function nyan_cat_extension() { + return '.nyan-cat.html'; +} + +/** + * Implements hook_render_template(). + * + * @param string $template_file + * The filename of the template to render. + * @param mixed[] $variables + * A keyed array of variables that will appear in the output. + * + * @return string + * The output generated by the template. + */ +function nyan_cat_render_template($template_file, $variables) { + $output = str_replace('div', 'nyancat', file_get_contents(DRUPAL_ROOT . '/' . $template_file)); + foreach ($variables as $key => $variable) { + if (strpos($output, '9' . $key) !== FALSE) { + $output = str_replace('9' . $key, $variable, $output); + } + } + return $output; +} diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info index acba3d5f..8788b00b 100644 --- a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info +++ b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info @@ -6,8 +6,7 @@ hidden = TRUE settings[basetheme_only] = base theme value settings[subtheme_override] = base theme value -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info index 120fc3a6..04c5975a 100644 --- a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info +++ b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info @@ -6,8 +6,7 @@ hidden = TRUE settings[subtheme_override] = subtheme value -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info index 4679f32e..e88a344d 100644 --- a/modules/simpletest/tests/themes/test_theme/test_theme.info +++ b/modules/simpletest/tests/themes/test_theme/test_theme.info @@ -17,8 +17,7 @@ stylesheets[all][] = system.base.css settings[theme_test_setting] = default value -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html b/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html new file mode 100644 index 00000000..7202dd48 --- /dev/null +++ b/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html @@ -0,0 +1 @@ +Miaou \ No newline at end of file diff --git a/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info b/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info new file mode 100644 index 00000000..12f46b5c --- /dev/null +++ b/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info @@ -0,0 +1,10 @@ +name = Nyan cat engine based test theme +description = Theme for testing the module-provided theme engines. +core = 7.x +hidden = TRUE +engine = nyan_cat + +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" +project = "drupal" +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info index 5a174fc6..2c7c5125 100644 --- a/modules/simpletest/tests/update_script_test.info +++ b/modules/simpletest/tests/update_script_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_script_test.install b/modules/simpletest/tests/update_script_test.install index 6955ef11..4024fb4a 100644 --- a/modules/simpletest/tests/update_script_test.install +++ b/modules/simpletest/tests/update_script_test.install @@ -31,6 +31,19 @@ function update_script_test_requirements($phase) { 'severity' => REQUIREMENT_ERROR, ); break; + case REQUIREMENT_INFO: + $requirements['update_script_test_stop'] = array( + 'title' => 'Update script test stop', + 'value' => 'Error', + 'description' => 'This is a requirements error provided by the update_script_test module to stop the page redirect for the info.', + 'severity' => REQUIREMENT_ERROR, + ); + $requirements['update_script_test'] = array( + 'title' => 'Update script test', + 'description' => 'This is a requirements info provided by the update_script_test module.', + 'severity' => REQUIREMENT_INFO, + ); + break; } } diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info index 4484ad46..36d36422 100644 --- a/modules/simpletest/tests/update_test_1.info +++ b/modules/simpletest/tests/update_test_1.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info index 4484ad46..36d36422 100644 --- a/modules/simpletest/tests/update_test_2.info +++ b/modules/simpletest/tests/update_test_2.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info index 4484ad46..36d36422 100644 --- a/modules/simpletest/tests/update_test_3.info +++ b/modules/simpletest/tests/update_test_3.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php index a9162813..10b9040c 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php @@ -19919,7 +19919,7 @@ 'vid' => '1', 'name' => 'vocabulary 1 (i=0)', 'description' => 'description of vocabulary 1 (i=0)', - 'help' => '', + 'help' => 'help for vocabulary 1 (i=0)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -19932,7 +19932,7 @@ 'vid' => '2', 'name' => 'vocabulary 2 (i=1)', 'description' => 'description of vocabulary 2 (i=1)', - 'help' => '', + 'help' => 'help for vocabulary 2 (i=1)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -19945,7 +19945,7 @@ 'vid' => '3', 'name' => 'vocabulary 3 (i=2)', 'description' => 'description of vocabulary 3 (i=2)', - 'help' => '', + 'help' => 'help for vocabulary 3 (i=2)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -19958,7 +19958,7 @@ 'vid' => '4', 'name' => 'vocabulary 4 (i=3)', 'description' => 'description of vocabulary 4 (i=3)', - 'help' => '', + 'help' => 'help for vocabulary 4 (i=3)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -19971,7 +19971,7 @@ 'vid' => '5', 'name' => 'vocabulary 5 (i=4)', 'description' => 'description of vocabulary 5 (i=4)', - 'help' => '', + 'help' => 'help for vocabulary 5 (i=4)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -19984,7 +19984,7 @@ 'vid' => '6', 'name' => 'vocabulary 6 (i=5)', 'description' => 'description of vocabulary 6 (i=5)', - 'help' => '', + 'help' => 'help for vocabulary 6 (i=5)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', @@ -19997,7 +19997,7 @@ 'vid' => '7', 'name' => 'vocabulary 7 (i=6)', 'description' => 'description of vocabulary 7 (i=6)', - 'help' => '', + 'help' => 'help for vocabulary 7 (i=6)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -20010,7 +20010,7 @@ 'vid' => '8', 'name' => 'vocabulary 8 (i=7)', 'description' => 'description of vocabulary 8 (i=7)', - 'help' => '', + 'help' => 'help for vocabulary 8 (i=7)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -20023,7 +20023,7 @@ 'vid' => '9', 'name' => 'vocabulary 9 (i=8)', 'description' => 'description of vocabulary 9 (i=8)', - 'help' => '', + 'help' => 'help for vocabulary 9 (i=8)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -20036,7 +20036,7 @@ 'vid' => '10', 'name' => 'vocabulary 10 (i=9)', 'description' => 'description of vocabulary 10 (i=9)', - 'help' => '', + 'help' => 'help for vocabulary 10 (i=9)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -20049,7 +20049,7 @@ 'vid' => '11', 'name' => 'vocabulary 11 (i=10)', 'description' => 'description of vocabulary 11 (i=10)', - 'help' => '', + 'help' => 'help for vocabulary 11 (i=10)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -20062,7 +20062,7 @@ 'vid' => '12', 'name' => 'vocabulary 12 (i=11)', 'description' => 'description of vocabulary 12 (i=11)', - 'help' => '', + 'help' => 'help for vocabulary 12 (i=11)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', @@ -20075,7 +20075,7 @@ 'vid' => '13', 'name' => 'vocabulary 13 (i=12)', 'description' => 'description of vocabulary 13 (i=12)', - 'help' => '', + 'help' => 'help for vocabulary 13 (i=12)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -20088,7 +20088,7 @@ 'vid' => '14', 'name' => 'vocabulary 14 (i=13)', 'description' => 'description of vocabulary 14 (i=13)', - 'help' => '', + 'help' => 'help for vocabulary 14 (i=13)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -20101,7 +20101,7 @@ 'vid' => '15', 'name' => 'vocabulary 15 (i=14)', 'description' => 'description of vocabulary 15 (i=14)', - 'help' => '', + 'help' => 'help for vocabulary 15 (i=14)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -20114,7 +20114,7 @@ 'vid' => '16', 'name' => 'vocabulary 16 (i=15)', 'description' => 'description of vocabulary 16 (i=15)', - 'help' => '', + 'help' => 'help for vocabulary 16 (i=15)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -20127,7 +20127,7 @@ 'vid' => '17', 'name' => 'vocabulary 17 (i=16)', 'description' => 'description of vocabulary 17 (i=16)', - 'help' => '', + 'help' => 'help for vocabulary 17 (i=16)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -20140,7 +20140,7 @@ 'vid' => '18', 'name' => 'vocabulary 18 (i=17)', 'description' => 'description of vocabulary 18 (i=17)', - 'help' => '', + 'help' => 'help for vocabulary 18 (i=17)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', @@ -20153,7 +20153,7 @@ 'vid' => '19', 'name' => 'vocabulary 19 (i=18)', 'description' => 'description of vocabulary 19 (i=18)', - 'help' => '', + 'help' => 'help for vocabulary 19 (i=18)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -20166,7 +20166,7 @@ 'vid' => '20', 'name' => 'vocabulary 20 (i=19)', 'description' => 'description of vocabulary 20 (i=19)', - 'help' => '', + 'help' => 'help for vocabulary 20 (i=19)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -20179,7 +20179,7 @@ 'vid' => '21', 'name' => 'vocabulary 21 (i=20)', 'description' => 'description of vocabulary 21 (i=20)', - 'help' => '', + 'help' => 'help for vocabulary 21 (i=20)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -20192,7 +20192,7 @@ 'vid' => '22', 'name' => 'vocabulary 22 (i=21)', 'description' => 'description of vocabulary 22 (i=21)', - 'help' => '', + 'help' => 'help for vocabulary 22 (i=21)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -20205,7 +20205,7 @@ 'vid' => '23', 'name' => 'vocabulary 23 (i=22)', 'description' => 'description of vocabulary 23 (i=22)', - 'help' => '', + 'help' => 'help for vocabulary 23 (i=22)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -20218,7 +20218,7 @@ 'vid' => '24', 'name' => 'vocabulary 24 (i=23)', 'description' => 'description of vocabulary 24 (i=23)', - 'help' => '', + 'help' => 'help for vocabulary 24 (i=23)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', diff --git a/modules/simpletest/tests/upgrade/drupal-6.upload.database.php b/modules/simpletest/tests/upgrade/drupal-6.upload.database.php index 46ebe2cb..3fd602af 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.upload.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.upload.database.php @@ -127,6 +127,38 @@ 'status' => '1', 'timestamp' => '1285708958', )) +// On some Drupal 6 sites, more than one file can have the same filepath. See +// https://www.drupal.org/node/1260938. +->values(array( + 'fid' => '12', + 'uid' => '1', + 'filename' => 'duplicate-name.png', + 'filepath' => 'sites/default/files/duplicate-name.png', + 'filemime' => 'image/png', + 'filesize' => '314', + 'status' => '1', + 'timestamp' => '1285708958', +)) +->values(array( + 'fid' => '13', + 'uid' => '1', + 'filename' => 'duplicate-name.png', + 'filepath' => 'sites/default/files/duplicate-name.png', + 'filemime' => 'image/png', + 'filesize' => '315', + 'status' => '1', + 'timestamp' => '1285708958', +)) +->values(array( + 'fid' => '14', + 'uid' => '1', + 'filename' => 'duplicate-name.png', + 'filepath' => 'sites/default/files/duplicate-name.png', + 'filemime' => 'image/png', + 'filesize' => '316', + 'status' => '1', + 'timestamp' => '1285708958', +)) ->execute(); db_insert('node')->fields(array( @@ -196,6 +228,23 @@ 'sticky' => '0', 'tnid' => '0', 'translate' => '0', +)) +->values(array( + 'nid' => '41', + 'vid' => '55', + 'type' => 'page', + 'language' => '', + 'title' => 'node title 41 revision 55', + 'uid' => '1', + 'status' => '1', + 'created' => '1285709012', + 'changed' => '1285709012', + 'comment' => '0', + 'promote' => '0', + 'moderate' => '0', + 'sticky' => '0', + 'tnid' => '0', + 'translate' => '0', )) ->execute(); @@ -253,6 +302,28 @@ 'log' => '', 'timestamp' => '1285709012', 'format' => '1', +)) +->values(array( + 'nid' => '41', + 'vid' => '54', + 'uid' => '1', + 'title' => 'node title 41 revision 54', + 'body' => "Attachments:\r\nduplicate-name.png", + 'teaser' => "Attachments:\r\nduplicate-name.png", + 'log' => '', + 'timestamp' => '1285709012', + 'format' => '1', +)) +->values(array( + 'nid' => '41', + 'vid' => '55', + 'uid' => '1', + 'title' => 'node title 41 revision 55', + 'body' => "Attachments:\r\nduplicate-name.png\r\nduplicate-name.png", + 'teaser' => "Attachments:\r\nduplicate-name.png\r\nduplicate-name.png", + 'log' => '', + 'timestamp' => '1285709012', + 'format' => '1', )) ->execute(); @@ -415,6 +486,30 @@ 'list' => '1', 'weight' => '0', )) +->values(array( + 'fid' => '12', + 'nid' => '41', + 'vid' => '54', + 'description' => 'duplicate-name.png', + 'list' => '1', + 'weight' => '0', +)) +->values(array( + 'fid' => '13', + 'nid' => '41', + 'vid' => '55', + 'description' => 'first description', + 'list' => '0', + 'weight' => '0', +)) +->values(array( + 'fid' => '14', + 'nid' => '41', + 'vid' => '55', + 'description' => 'second description', + 'list' => '1', + 'weight' => '0', +)) ->execute(); // Add series of entries for invalid node vids to the {upload} table. @@ -431,7 +526,7 @@ ->values(array( 'fid' => $i, 'nid' => '40', - 'vid' => 24 + $i, + 'vid' => 26 + $i, 'description' => 'crazy-basename.png', 'list' => '1', 'weight' => '0', @@ -440,7 +535,7 @@ ->values(array( 'fid' => 2, 'nid' => '40', - 'vid' => 24 + $i + 1, + 'vid' => 26 + $i + 1, 'description' => 'crazy-basename.png', 'list' => '1', 'weight' => '0', diff --git a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test index 58a4d5c1..51402ed7 100644 --- a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test +++ b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test @@ -74,9 +74,10 @@ class UpgradePathTaxonomyTestCase extends UpgradePathTestCase { $this->assertEqual($voc_keys, $inst_keys, 'Node type page has instances for every vocabulary.'); // Ensure instance variables are getting through. - foreach ($instances as $instance) { - $this->assertTrue(isset($instance['required']), 'The required setting was preserved during the upgrade path.'); - $this->assertTrue($instance['description'], 'The description was preserved during the upgrade path'); + foreach (array_unique($instances) as $instance) { + $field_instance = field_info_instance('node', $instance, 'page'); + $this->assertTrue(isset($field_instance['required']), 'The required setting was preserved during the upgrade path.'); + $this->assertTrue($field_instance['description'], 'The description was preserved during the upgrade path'); } // Node type 'story' was not explicitly in $vocabulary->nodes but diff --git a/modules/simpletest/tests/upgrade/upgrade.upload.test b/modules/simpletest/tests/upgrade/upgrade.upload.test index be352bd4..dfa94a00 100644 --- a/modules/simpletest/tests/upgrade/upgrade.upload.test +++ b/modules/simpletest/tests/upgrade/upgrade.upload.test @@ -64,12 +64,35 @@ class UploadUpgradePathTestCase extends UpgradePathTestCase { } $this->assertIdentical($filenames, $recorded_filenames, 'The uploaded files are present in the same order after the upgrade.'); } + // Test for the file with repeating basename to only have the streaming // path replaced. $node = node_load(40, 53); $repeated_basename_file = $node->upload[LANGUAGE_NONE][4]; $this->assertEqual($repeated_basename_file['uri'], 'private://drupal-6/file/directory/path/crazy-basename.png', "The file with the repeated basename path only had the stream portion replaced"); + // Ensure that filepaths are deduplicated. + $node0 = node_load(41, 54); + $node1 = node_load(41, 55); + // Ensure that both revisions point to the same file ID. + $items0 = field_get_items('node', $node0, 'upload'); + $this->assertEqual(count($items0), 1); + $items1 = field_get_items('node', $node1, 'upload'); + $this->assertEqual(count($items1), 2); + $this->assertEqual($items0[0]['fid'], $items1[0]['fid']); + $this->assertEqual($items0[0]['fid'], $items1[1]['fid']); + // The revision with more than one reference to the same file should retain + // the original settings for each reference. + $this->assertEqual($items1[0]['description'], 'first description'); + $this->assertEqual($items1[0]['display'], 0); + $this->assertEqual($items1[1]['description'], 'second description'); + $this->assertEqual($items1[1]['display'], 1); + // Ensure that the latest version of the files are used. + $this->assertEqual($items1[0]['filesize'], 316); + $this->assertEqual($items1[1]['filesize'], 316); + // No duplicate files should remain on the Drupal 7 site. + $this->assertEqual(0, db_query("SELECT COUNT(*) FROM {file_managed} GROUP BY uri HAVING COUNT(fid) > 1")->fetchField()); + // Make sure the file settings were properly migrated. $d6_file_directory_temp = '/drupal-6/file/directory/temp'; $d6_file_directory_path = '/drupal-6/file/directory/path'; diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info index 8af9f248..e4d1812f 100644 --- a/modules/simpletest/tests/url_alter_test.info +++ b/modules/simpletest/tests/url_alter_test.info @@ -5,8 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/xmlrpc.test b/modules/simpletest/tests/xmlrpc.test index 1a9ef234..bb74f059 100644 --- a/modules/simpletest/tests/xmlrpc.test +++ b/modules/simpletest/tests/xmlrpc.test @@ -246,4 +246,38 @@ class XMLRPCMessagesTestCase extends DrupalWebTestCase { $this->assertEqual($removed, 'system.methodSignature', 'Hiding builting system.methodSignature with hook_xmlrpc_alter works'); } + /** + * Test limits on system.multicall that can prevent brute-force attacks. + */ + function testMulticallLimit() { + $url = url(NULL, array('absolute' => TRUE)) . 'xmlrpc.php'; + $multicall_args = array(); + $num_method_calls = 10; + for ($i = 0; $i < $num_method_calls; $i++) { + $struct = array('i' => $i); + $multicall_args[] = array('methodName' => 'validator1.echoStructTest', 'params' => array($struct)); + } + // Test limits of 1, 5, 9, 13. + for ($limit = 1; $limit < $num_method_calls + 4; $limit += 4) { + variable_set('xmlrpc_multicall_duplicate_method_limit', $limit); + $results = xmlrpc($url, array('system.multicall' => array($multicall_args))); + $this->assertEqual($num_method_calls, count($results)); + for ($i = 0; $i < min($limit, $num_method_calls); $i++) { + $x = array_shift($results); + $this->assertTrue(empty($x->is_error), "Result $i is not an error"); + $this->assertEqual($multicall_args[$i]['params'][0], $x); + } + for (; $i < $num_method_calls; $i++) { + $x = array_shift($results); + $this->assertFalse(empty($x->is_error), "Result $i is an error"); + $this->assertEqual(-156579, $x->code); + } + } + variable_set('xmlrpc_multicall_duplicate_method_limit', -1); + $results = xmlrpc($url, array('system.multicall' => array($multicall_args))); + $this->assertEqual($num_method_calls, count($results)); + foreach ($results as $i => $x) { + $this->assertTrue(empty($x->is_error), "Result $i is not an error"); + } + } } diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info index 0cf5bbac..70c09ca8 100644 --- a/modules/simpletest/tests/xmlrpc_test.info +++ b/modules/simpletest/tests/xmlrpc_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info index 92756356..8d711697 100644 --- a/modules/statistics/statistics.info +++ b/modules/statistics/statistics.info @@ -6,8 +6,7 @@ core = 7.x files[] = statistics.test configure = admin/config/system/statistics -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index f665a14f..356a0e25 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -118,10 +118,9 @@ function statistics_node_view($node, $view_mode) { // Attach Ajax node count statistics if configured. if (variable_get('statistics_count_content_views', 0) && variable_get('statistics_count_content_views_ajax', 0)) { if (!empty($node->nid) && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) { - $node->content['#attached']['js'] = array( - drupal_get_path('module', 'statistics') . '/statistics.js' => array( - 'scope' => 'footer' - ), + $statistics = drupal_get_path('module', 'statistics') . '/statistics.js'; + $node->content['#attached']['js'][$statistics] = array( + 'scope' => 'footer', ); $settings = array('data' => array('nid' => $node->nid), 'url' => url(drupal_get_path('module', 'statistics') . '/statistics.php')); $node->content['#attached']['js'][] = array( @@ -246,7 +245,7 @@ function statistics_user_delete($account) { * Implements hook_cron(). */ function statistics_cron() { - $statistics_timestamp = variable_get('statistics_day_timestamp', ''); + $statistics_timestamp = variable_get('statistics_day_timestamp', 0); if ((REQUEST_TIME - $statistics_timestamp) >= 86400) { // Reset day counts. diff --git a/modules/statistics/statistics.php b/modules/statistics/statistics.php index f00e0397..48340c89 100644 --- a/modules/statistics/statistics.php +++ b/modules/statistics/statistics.php @@ -15,17 +15,19 @@ include_once DRUPAL_ROOT . '/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES); if (variable_get('statistics_count_content_views', 0) && variable_get('statistics_count_content_views_ajax', 0)) { - $nid = $_POST['nid']; - if (is_numeric($nid)) { - db_merge('node_counter') - ->key(array('nid' => $nid)) - ->fields(array( - 'daycount' => 1, - 'totalcount' => 1, - 'timestamp' => REQUEST_TIME, - )) - ->expression('daycount', 'daycount + 1') - ->expression('totalcount', 'totalcount + 1') - ->execute(); + if (isset($_POST['nid'])) { + $nid = $_POST['nid']; + if (is_numeric($nid)) { + db_merge('node_counter') + ->key(array('nid' => $nid)) + ->fields(array( + 'daycount' => 1, + 'totalcount' => 1, + 'timestamp' => REQUEST_TIME, + )) + ->expression('daycount', 'daycount + 1') + ->expression('totalcount', 'totalcount + 1') + ->execute(); + } } } diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index 7e038d61..50accd74 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -35,7 +35,7 @@ class StatisticsTestCase extends DrupalWebTestCase { 'title' => 'test', 'path' => 'node/1', 'url' => 'http://example.com', - 'hostname' => '192.168.1.1', + 'hostname' => '1.2.3.3', 'uid' => 0, 'sid' => 10, 'timer' => 10, @@ -268,7 +268,7 @@ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase { */ function testIPAddressBlocking() { // IP address for testing. - $test_ip_address = '192.168.1.1'; + $test_ip_address = '1.2.3.3'; // Verify the IP address from accesslog appears on the top visitors page // and that a 'block IP address' link is displayed. diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info index e0b8a44a..5d3304ec 100644 --- a/modules/syslog/syslog.info +++ b/modules/syslog/syslog.info @@ -6,8 +6,7 @@ core = 7.x files[] = syslog.test configure = admin/config/development/logging -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/system/image.gd.inc b/modules/system/image.gd.inc index 913b0de5..3d0797e4 100644 --- a/modules/system/image.gd.inc +++ b/modules/system/image.gd.inc @@ -116,38 +116,62 @@ function image_gd_rotate(stdClass $image, $degrees, $background = NULL) { return FALSE; } - $width = $image->info['width']; - $height = $image->info['height']; + // PHP 5.5 GD bug: https://bugs.php.net/bug.php?id=65148: To prevent buggy + // behavior on negative multiples of 90 degrees we convert any negative + // angle to a positive one between 0 and 360 degrees. + $degrees -= floor($degrees / 360) * 360; - // Convert the hexadecimal background value to a color index value. + // Convert the hexadecimal background value to a RGBA array. if (isset($background)) { - $rgb = array(); - for ($i = 16; $i >= 0; $i -= 8) { - $rgb[] = (($background >> $i) & 0xFF); - } - $background = imagecolorallocatealpha($image->resource, $rgb[0], $rgb[1], $rgb[2], 0); + $background = array( + 'red' => $background >> 16 & 0xFF, + 'green' => $background >> 8 & 0xFF, + 'blue' => $background & 0xFF, + 'alpha' => 0, + ); } - // Set the background color as transparent if $background is NULL. else { - // Get the current transparent color. - $background = imagecolortransparent($image->resource); - - // If no transparent colors, use white. - if ($background == 0) { - $background = imagecolorallocatealpha($image->resource, 255, 255, 255, 0); - } + // Background color is not specified: use transparent white as background. + $background = array( + 'red' => 255, + 'green' => 255, + 'blue' => 255, + 'alpha' => 127 + ); } + // Store the color index for the background as that is what GD uses. + $background_idx = imagecolorallocatealpha($image->resource, $background['red'], $background['green'], $background['blue'], $background['alpha']); + // Images are assigned a new color palette when rotating, removing any // transparency flags. For GIF images, keep a record of the transparent color. if ($image->info['extension'] == 'gif') { - $transparent_index = imagecolortransparent($image->resource); - if ($transparent_index != 0) { - $transparent_gif_color = imagecolorsforindex($image->resource, $transparent_index); + // GIF does not work with a transparency channel, but can define 1 color + // in its palette to act as transparent. + + // Get the current transparent color, if any. + $gif_transparent_id = imagecolortransparent($image->resource); + if ($gif_transparent_id !== -1) { + // The gif already has a transparent color set: remember it to set it on + // the rotated image as well. + $transparent_gif_color = imagecolorsforindex($image->resource, $gif_transparent_id); + + if ($background['alpha'] >= 127) { + // We want a transparent background: use the color already set to act + // as transparent, as background. + $background_idx = $gif_transparent_id; + } + } + else { + // The gif does not currently have a transparent color set. + if ($background['alpha'] >= 127) { + // But as the background is transparent, it should get one. + $transparent_gif_color = $background; + } } } - $image->resource = imagerotate($image->resource, 360 - $degrees, $background); + $image->resource = imagerotate($image->resource, 360 - $degrees, $background_idx); // GIFs need to reassign the transparent color after performing the rotate. if (isset($transparent_gif_color)) { diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 0f525c6c..cdcc78fb 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1856,7 +1856,7 @@ function system_image_toolkit_settings() { if (count($toolkits_available) == 0) { variable_del('image_toolkit'); $form['image_toolkit_help'] = array( - '#markup' => t("No image toolkits were detected. Drupal includes support for PHP's built-in image processing functions but they were not detected on this system. You should consult your system administrator to have them enabled, or try using a third party toolkit.", array('gd-link' => url('http://php.net/gd'))), + '#markup' => t("No image toolkits were detected. Drupal includes support for PHP's built-in image processing functions but they were not detected on this system. You should consult your system administrator to have them enabled, or try using a third party toolkit.", array('!gd-link' => url('http://php.net/gd'))), ); return $form; } @@ -2202,6 +2202,11 @@ function system_add_date_format_type_form_submit($form, &$form_state) { * Return the date for a given format string via Ajax. */ function system_date_time_lookup() { + // This callback is protected with a CSRF token because user input from the + // query string is reflected in the output. + if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], 'admin/config/regional/date-time/formats/lookup')) { + return MENU_ACCESS_DENIED; + } $result = format_date(REQUEST_TIME, 'custom', $_GET['format']); drupal_json_output($result); } @@ -2592,6 +2597,8 @@ function theme_status_report($variables) { if (empty($requirement['#type'])) { $severity = $severities[isset($requirement['severity']) ? (int) $requirement['severity'] : REQUIREMENT_OK]; $severity['icon'] = '
- * @copyright 1997-2008 The Authors
- * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: Id: Tar.php,v 1.43 2008/10/30 17:58:42 dufuz Exp
- * @link http://pear.php.net/package/Archive_Tar
+ * @category File_Formats
+ * @package Archive_Tar
+ * @author Vincent Blavet
+ * @copyright 1997-2010 The Authors
+ * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id$
+ * @link http://pear.php.net/package/Archive_Tar
+ */
+
+ /**
+ * Note on Drupal 8 porting.
+ * This file origin is Tar.php, release 1.4.0 (stable) with some code
+ * from PEAR.php, release 1.9.5 (stable) both at http://pear.php.net.
+ * To simplify future porting from pear of this file, you should not
+ * do cosmetic or other non significant changes to this file.
+ * The following changes have been done:
+ * Added namespace Drupal\Core\Archiver.
+ * Removed require_once 'PEAR.php'.
+ * Added defintion of OS_WINDOWS taken from PEAR.php.
+ * Renamed class to ArchiveTar.
+ * Removed extends PEAR from class.
+ * Removed call parent:: __construct().
+ * Changed PEAR::loadExtension($extname) to this->loadExtension($extname).
+ * Added function loadExtension() taken from PEAR.php.
+ * Changed all calls of unlink() to drupal_unlink().
+ * Changed $this->error_object = &$this->raiseError($p_message)
+ * to throw new \Exception($p_message).
+ */
+
+ /**
+ * Note on Drupal 7 backporting from Drupal 8.
+ * File origin is core/lib/Drupal/Core/Archiver/ArchiveTar.php from Drupal 8.
+ * The following changes have been done:
+ * Removed namespace Drupal\Core\Archiver.
+ * Renamed class to Archive_Tar.
+ * Changed \Exception to Exception.
*/
-//require_once 'PEAR.php';
-//
-//
-define ('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
-define ('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
+
+// Drupal removal require_once 'PEAR.php'.
+
+// Drupal addition OS_WINDOWS as defined in PEAR.php.
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+ define('OS_WINDOWS', true);
+} else {
+ define('OS_WINDOWS', false);
+}
+
+define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
+define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
+
+if (!function_exists('gzopen') && function_exists('gzopen64')) {
+ function gzopen($filename, $mode, $use_include_path = 0)
+ {
+ return gzopen64($filename, $mode, $use_include_path);
+ }
+}
+
+if (!function_exists('gztell') && function_exists('gztell64')) {
+ function gztell($zp)
+ {
+ return gztell64($zp);
+ }
+}
+
+if (!function_exists('gzseek') && function_exists('gzseek64')) {
+ function gzseek($zp, $offset, $whence = SEEK_SET)
+ {
+ return gzseek64($zp, $offset, $whence);
+ }
+}
/**
-* Creates a (compressed) Tar archive
-*
-* @author Vincent Blavet
-* @version Revision: 1.43
-* @license http://www.opensource.org/licenses/bsd-license.php New BSD License
-* @package Archive_Tar
-*/
-class Archive_Tar // extends PEAR
+ * Creates a (compressed) Tar archive
+ *
+ * @package Archive_Tar
+ * @author Vincent Blavet
+ * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version $Revision$
+ */
+// Drupal change class Archive_Tar extends PEAR.
+class Archive_Tar
{
/**
- * @var string Name of the Tar
- */
- var $_tarname='';
+ * @var string Name of the Tar
+ */
+ public $_tarname = '';
/**
- * @var boolean if true, the Tar file will be gzipped
- */
- var $_compress=false;
+ * @var boolean if true, the Tar file will be gzipped
+ */
+ public $_compress = false;
/**
- * @var string Type of compression : 'none', 'gz' or 'bz2'
- */
- var $_compress_type='none';
+ * @var string Type of compression : 'none', 'gz', 'bz2' or 'lzma2'
+ */
+ public $_compress_type = 'none';
/**
- * @var string Explode separator
- */
- var $_separator=' ';
+ * @var string Explode separator
+ */
+ public $_separator = ' ';
/**
- * @var file descriptor
- */
- var $_file=0;
+ * @var file descriptor
+ */
+ public $_file = 0;
/**
- * @var string Local Tar name of a remote Tar (http:// or ftp://)
- */
- var $_temp_tarname='';
+ * @var string Local Tar name of a remote Tar (http:// or ftp://)
+ */
+ public $_temp_tarname = '';
- // {{{ constructor
/**
- * Archive_Tar Class constructor. This flavour of the constructor only
- * declare a new Archive_Tar object, identifying it by the name of the
- * tar file.
- * If the compress argument is set the tar will be read or created as a
- * gzip or bz2 compressed TAR file.
- *
- * @param string $p_tarname The name of the tar archive to create
- * @param string $p_compress can be null, 'gz' or 'bz2'. This
- * parameter indicates if gzip or bz2 compression
- * is required. For compatibility reason the
- * boolean value 'true' means 'gz'.
- * @access public
- */
-// function Archive_Tar($p_tarname, $p_compress = null)
- function __construct($p_tarname, $p_compress = null)
+ * @var string regular expression for ignoring files or directories
+ */
+ public $_ignore_regexp = '';
+
+ /**
+ * @var object PEAR_Error object
+ */
+ public $error_object = null;
+
+ /**
+ * Archive_Tar Class constructor. This flavour of the constructor only
+ * declare a new Archive_Tar object, identifying it by the name of the
+ * tar file.
+ * If the compress argument is set the tar will be read or created as a
+ * gzip or bz2 compressed TAR file.
+ *
+ * @param string $p_tarname The name of the tar archive to create
+ * @param string $p_compress can be null, 'gz', 'bz2' or 'lzma2'. This
+ * parameter indicates if gzip, bz2 or lzma2 compression
+ * is required. For compatibility reason the
+ * boolean value 'true' means 'gz'.
+ *
+ * @return bool
+ */
+ public function __construct($p_tarname, $p_compress = null)
{
-// $this->PEAR();
+ // Drupal removal parent::__construct().
+
$this->_compress = false;
$this->_compress_type = 'none';
if (($p_compress === null) || ($p_compress == '')) {
@@ -116,10 +183,13 @@ class Archive_Tar // extends PEAR
if ($data == "\37\213") {
$this->_compress = true;
$this->_compress_type = 'gz';
- // No sure it's enought for a magic code ....
+ // No sure it's enought for a magic code ....
} elseif ($data == "BZ") {
$this->_compress = true;
$this->_compress_type = 'bz2';
+ } elseif (file_get_contents($p_tarname, false, null, 1, 4) == '7zXZ') {
+ $this->_compress = true;
+ $this->_compress_type = 'lzma2';
}
}
} else {
@@ -129,151 +199,177 @@ class Archive_Tar // extends PEAR
$this->_compress = true;
$this->_compress_type = 'gz';
} elseif ((substr($p_tarname, -3) == 'bz2') ||
- (substr($p_tarname, -2) == 'bz')) {
+ (substr($p_tarname, -2) == 'bz')
+ ) {
$this->_compress = true;
$this->_compress_type = 'bz2';
+ } else {
+ if (substr($p_tarname, -2) == 'xz') {
+ $this->_compress = true;
+ $this->_compress_type = 'lzma2';
+ }
}
}
} else {
if (($p_compress === true) || ($p_compress == 'gz')) {
$this->_compress = true;
$this->_compress_type = 'gz';
- } else if ($p_compress == 'bz2') {
- $this->_compress = true;
- $this->_compress_type = 'bz2';
} else {
- die("Unsupported compression type '$p_compress'\n".
- "Supported types are 'gz' and 'bz2'.\n");
- return false;
+ if ($p_compress == 'bz2') {
+ $this->_compress = true;
+ $this->_compress_type = 'bz2';
+ } else {
+ if ($p_compress == 'lzma2') {
+ $this->_compress = true;
+ $this->_compress_type = 'lzma2';
+ } else {
+ $this->_error(
+ "Unsupported compression type '$p_compress'\n" .
+ "Supported types are 'gz', 'bz2' and 'lzma2'.\n"
+ );
+ return false;
+ }
+ }
}
}
$this->_tarname = $p_tarname;
- if ($this->_compress) { // assert zlib or bz2 extension support
- if ($this->_compress_type == 'gz')
+ if ($this->_compress) { // assert zlib or bz2 or xz extension support
+ if ($this->_compress_type == 'gz') {
$extname = 'zlib';
- else if ($this->_compress_type == 'bz2')
- $extname = 'bz2';
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ $extname = 'bz2';
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ $extname = 'xz';
+ }
+ }
+ }
if (!extension_loaded($extname)) {
-// PEAR::loadExtension($extname);
+ // Drupal change PEAR::loadExtension($extname).
$this->loadExtension($extname);
}
if (!extension_loaded($extname)) {
- die("The extension '$extname' couldn't be found.\n".
- "Please make sure your version of PHP was built ".
- "with '$extname' support.\n");
+ $this->_error(
+ "The extension '$extname' couldn't be found.\n" .
+ "Please make sure your version of PHP was built " .
+ "with '$extname' support.\n"
+ );
return false;
}
}
}
- // }}}
+ public function __destruct()
+ {
+ $this->_close();
+ // ----- Look for a local copy to delete
+ if ($this->_temp_tarname != '') {
+ @drupal_unlink($this->_temp_tarname);
+ }
+ }
+
+ // Drupal addition from PEAR.php.
/**
* OS independent PHP extension load. Remember to take care
* on the correct extension name for case sensitive OSes.
- * The function is the copy of PEAR::loadExtension().
*
* @param string $ext The extension name
* @return bool Success or not on the dl() call
*/
function loadExtension($ext)
{
- if (!extension_loaded($ext)) {
- // if either returns true dl() will produce a FATAL error, stop that
- if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
- return false;
- }
+ if (extension_loaded($ext)) {
+ return true;
+ }
- if (OS_WINDOWS) {
- $suffix = '.dll';
- } elseif (PHP_OS == 'HP-UX') {
- $suffix = '.sl';
- } elseif (PHP_OS == 'AIX') {
- $suffix = '.a';
- } elseif (PHP_OS == 'OSX') {
- $suffix = '.bundle';
- } else {
- $suffix = '.so';
- }
+ // if either returns true dl() will produce a FATAL error, stop that
+ if (
+ function_exists('dl') === false ||
+ ini_get('enable_dl') != 1 ||
+ ini_get('safe_mode') == 1
+ ) {
+ return false;
+ }
- return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+ if (OS_WINDOWS) {
+ $suffix = '.dll';
+ } elseif (PHP_OS == 'HP-UX') {
+ $suffix = '.sl';
+ } elseif (PHP_OS == 'AIX') {
+ $suffix = '.a';
+ } elseif (PHP_OS == 'OSX') {
+ $suffix = '.bundle';
+ } else {
+ $suffix = '.so';
}
- return true;
+ return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
}
- // {{{ destructor
-// function _Archive_Tar()
- function __destruct()
- {
- $this->_close();
- // ----- Look for a local copy to delete
- if ($this->_temp_tarname != '')
- @drupal_unlink($this->_temp_tarname);
-// $this->_PEAR();
- }
- // }}}
-
- // {{{ create()
/**
- * This method creates the archive file and add the files / directories
- * that are listed in $p_filelist.
- * If a file with the same name exist and is writable, it is replaced
- * by the new tar.
- * The method return false and a PEAR error text.
- * The $p_filelist parameter can be an array of string, each string
- * representing a filename or a directory name with their path if
- * needed. It can also be a single string with names separated by a
- * single blank.
- * For each directory added in the archive, the files and
- * sub-directories are also added.
- * See also createModify() method for more details.
- *
- * @param array $p_filelist An array of filenames and directory names, or a
- * single string with names separated by a single
- * blank space.
- * @return true on success, false on error.
- * @see createModify()
- * @access public
- */
- function create($p_filelist)
+ * This method creates the archive file and add the files / directories
+ * that are listed in $p_filelist.
+ * If a file with the same name exist and is writable, it is replaced
+ * by the new tar.
+ * The method return false and a PEAR error text.
+ * The $p_filelist parameter can be an array of string, each string
+ * representing a filename or a directory name with their path if
+ * needed. It can also be a single string with names separated by a
+ * single blank.
+ * For each directory added in the archive, the files and
+ * sub-directories are also added.
+ * See also createModify() method for more details.
+ *
+ * @param array $p_filelist An array of filenames and directory names, or a
+ * single string with names separated by a single
+ * blank space.
+ *
+ * @return true on success, false on error.
+ * @see createModify()
+ */
+ public function create($p_filelist)
{
return $this->createModify($p_filelist, '', '');
}
- // }}}
- // {{{ add()
/**
- * This method add the files / directories that are listed in $p_filelist in
- * the archive. If the archive does not exist it is created.
- * The method return false and a PEAR error text.
- * The files and directories listed are only added at the end of the archive,
- * even if a file with the same name is already archived.
- * See also createModify() method for more details.
- *
- * @param array $p_filelist An array of filenames and directory names, or a
- * single string with names separated by a single
- * blank space.
- * @return true on success, false on error.
- * @see createModify()
- * @access public
- */
- function add($p_filelist)
+ * This method add the files / directories that are listed in $p_filelist in
+ * the archive. If the archive does not exist it is created.
+ * The method return false and a PEAR error text.
+ * The files and directories listed are only added at the end of the archive,
+ * even if a file with the same name is already archived.
+ * See also createModify() method for more details.
+ *
+ * @param array $p_filelist An array of filenames and directory names, or a
+ * single string with names separated by a single
+ * blank space.
+ *
+ * @return true on success, false on error.
+ * @see createModify()
+ * @access public
+ */
+ public function add($p_filelist)
{
return $this->addModify($p_filelist, '', '');
}
- // }}}
- // {{{ extract()
- function extract($p_path='')
+ /**
+ * @param string $p_path
+ * @param bool $p_preserve
+ * @return bool
+ */
+ public function extract($p_path = '', $p_preserve = false)
{
- return $this->extractModify($p_path, '');
+ return $this->extractModify($p_path, '', $p_preserve);
}
- // }}}
- // {{{ listContent()
- function listContent()
+ /**
+ * @return array|int
+ */
+ public function listContent()
{
$v_list_detail = array();
@@ -287,57 +383,56 @@ class Archive_Tar // extends PEAR
return $v_list_detail;
}
- // }}}
- // {{{ createModify()
/**
- * This method creates the archive file and add the files / directories
- * that are listed in $p_filelist.
- * If the file already exists and is writable, it is replaced by the
- * new tar. It is a create and not an add. If the file exists and is
- * read-only or is a directory it is not replaced. The method return
- * false and a PEAR error text.
- * The $p_filelist parameter can be an array of string, each string
- * representing a filename or a directory name with their path if
- * needed. It can also be a single string with names separated by a
- * single blank.
- * The path indicated in $p_remove_dir will be removed from the
- * memorized path of each file / directory listed when this path
- * exists. By default nothing is removed (empty path '')
- * The path indicated in $p_add_dir will be added at the beginning of
- * the memorized path of each file / directory listed. However it can
- * be set to empty ''. The adding of a path is done after the removing
- * of path.
- * The path add/remove ability enables the user to prepare an archive
- * for extraction in a different path than the origin files are.
- * See also addModify() method for file adding properties.
- *
- * @param array $p_filelist An array of filenames and directory names,
- * or a single string with names separated by
- * a single blank space.
- * @param string $p_add_dir A string which contains a path to be added
- * to the memorized path of each element in
- * the list.
- * @param string $p_remove_dir A string which contains a path to be
- * removed from the memorized path of each
- * element in the list, when relevant.
- * @return boolean true on success, false on error.
- * @access public
- * @see addModify()
- */
- function createModify($p_filelist, $p_add_dir, $p_remove_dir='')
+ * This method creates the archive file and add the files / directories
+ * that are listed in $p_filelist.
+ * If the file already exists and is writable, it is replaced by the
+ * new tar. It is a create and not an add. If the file exists and is
+ * read-only or is a directory it is not replaced. The method return
+ * false and a PEAR error text.
+ * The $p_filelist parameter can be an array of string, each string
+ * representing a filename or a directory name with their path if
+ * needed. It can also be a single string with names separated by a
+ * single blank.
+ * The path indicated in $p_remove_dir will be removed from the
+ * memorized path of each file / directory listed when this path
+ * exists. By default nothing is removed (empty path '')
+ * The path indicated in $p_add_dir will be added at the beginning of
+ * the memorized path of each file / directory listed. However it can
+ * be set to empty ''. The adding of a path is done after the removing
+ * of path.
+ * The path add/remove ability enables the user to prepare an archive
+ * for extraction in a different path than the origin files are.
+ * See also addModify() method for file adding properties.
+ *
+ * @param array $p_filelist An array of filenames and directory names,
+ * or a single string with names separated by
+ * a single blank space.
+ * @param string $p_add_dir A string which contains a path to be added
+ * to the memorized path of each element in
+ * the list.
+ * @param string $p_remove_dir A string which contains a path to be
+ * removed from the memorized path of each
+ * element in the list, when relevant.
+ *
+ * @return boolean true on success, false on error.
+ * @see addModify()
+ */
+ public function createModify($p_filelist, $p_add_dir, $p_remove_dir = '')
{
$v_result = true;
- if (!$this->_openWrite())
+ if (!$this->_openWrite()) {
return false;
+ }
if ($p_filelist != '') {
- if (is_array($p_filelist))
+ if (is_array($p_filelist)) {
$v_list = $p_filelist;
- elseif (is_string($p_filelist))
+ } elseif (is_string($p_filelist)) {
$v_list = explode($this->_separator, $p_filelist);
- else {
+ } else {
$this->_cleanFile();
$this->_error('Invalid file list');
return false;
@@ -349,67 +444,69 @@ class Archive_Tar // extends PEAR
if ($v_result) {
$this->_writeFooter();
$this->_close();
- } else
+ } else {
$this->_cleanFile();
+ }
return $v_result;
}
- // }}}
- // {{{ addModify()
/**
- * This method add the files / directories listed in $p_filelist at the
- * end of the existing archive. If the archive does not yet exists it
- * is created.
- * The $p_filelist parameter can be an array of string, each string
- * representing a filename or a directory name with their path if
- * needed. It can also be a single string with names separated by a
- * single blank.
- * The path indicated in $p_remove_dir will be removed from the
- * memorized path of each file / directory listed when this path
- * exists. By default nothing is removed (empty path '')
- * The path indicated in $p_add_dir will be added at the beginning of
- * the memorized path of each file / directory listed. However it can
- * be set to empty ''. The adding of a path is done after the removing
- * of path.
- * The path add/remove ability enables the user to prepare an archive
- * for extraction in a different path than the origin files are.
- * If a file/dir is already in the archive it will only be added at the
- * end of the archive. There is no update of the existing archived
- * file/dir. However while extracting the archive, the last file will
- * replace the first one. This results in a none optimization of the
- * archive size.
- * If a file/dir does not exist the file/dir is ignored. However an
- * error text is send to PEAR error.
- * If a file/dir is not readable the file/dir is ignored. However an
- * error text is send to PEAR error.
- *
- * @param array $p_filelist An array of filenames and directory
- * names, or a single string with names
- * separated by a single blank space.
- * @param string $p_add_dir A string which contains a path to be
- * added to the memorized path of each
- * element in the list.
- * @param string $p_remove_dir A string which contains a path to be
- * removed from the memorized path of
- * each element in the list, when
- * relevant.
- * @return true on success, false on error.
- * @access public
- */
- function addModify($p_filelist, $p_add_dir, $p_remove_dir='')
+ * This method add the files / directories listed in $p_filelist at the
+ * end of the existing archive. If the archive does not yet exists it
+ * is created.
+ * The $p_filelist parameter can be an array of string, each string
+ * representing a filename or a directory name with their path if
+ * needed. It can also be a single string with names separated by a
+ * single blank.
+ * The path indicated in $p_remove_dir will be removed from the
+ * memorized path of each file / directory listed when this path
+ * exists. By default nothing is removed (empty path '')
+ * The path indicated in $p_add_dir will be added at the beginning of
+ * the memorized path of each file / directory listed. However it can
+ * be set to empty ''. The adding of a path is done after the removing
+ * of path.
+ * The path add/remove ability enables the user to prepare an archive
+ * for extraction in a different path than the origin files are.
+ * If a file/dir is already in the archive it will only be added at the
+ * end of the archive. There is no update of the existing archived
+ * file/dir. However while extracting the archive, the last file will
+ * replace the first one. This results in a none optimization of the
+ * archive size.
+ * If a file/dir does not exist the file/dir is ignored. However an
+ * error text is send to PEAR error.
+ * If a file/dir is not readable the file/dir is ignored. However an
+ * error text is send to PEAR error.
+ *
+ * @param array $p_filelist An array of filenames and directory
+ * names, or a single string with names
+ * separated by a single blank space.
+ * @param string $p_add_dir A string which contains a path to be
+ * added to the memorized path of each
+ * element in the list.
+ * @param string $p_remove_dir A string which contains a path to be
+ * removed from the memorized path of
+ * each element in the list, when
+ * relevant.
+ *
+ * @return true on success, false on error.
+ */
+ public function addModify($p_filelist, $p_add_dir, $p_remove_dir = '')
{
$v_result = true;
- if (!$this->_isArchive())
- $v_result = $this->createModify($p_filelist, $p_add_dir,
- $p_remove_dir);
- else {
- if (is_array($p_filelist))
+ if (!$this->_isArchive()) {
+ $v_result = $this->createModify(
+ $p_filelist,
+ $p_add_dir,
+ $p_remove_dir
+ );
+ } else {
+ if (is_array($p_filelist)) {
$v_list = $p_filelist;
- elseif (is_string($p_filelist))
+ } elseif (is_string($p_filelist)) {
$v_list = explode($this->_separator, $p_filelist);
- else {
+ } else {
$this->_error('Invalid file list');
return false;
}
@@ -419,24 +516,41 @@ class Archive_Tar // extends PEAR
return $v_result;
}
- // }}}
- // {{{ addString()
/**
- * This method add a single string as a file at the
- * end of the existing archive. If the archive does not yet exists it
- * is created.
- *
- * @param string $p_filename A string which contains the full
- * filename path that will be associated
- * with the string.
- * @param string $p_string The content of the file added in
- * the archive.
- * @return true on success, false on error.
- * @access public
- */
- function addString($p_filename, $p_string)
+ * This method add a single string as a file at the
+ * end of the existing archive. If the archive does not yet exists it
+ * is created.
+ *
+ * @param string $p_filename A string which contains the full
+ * filename path that will be associated
+ * with the string.
+ * @param string $p_string The content of the file added in
+ * the archive.
+ * @param bool|int $p_datetime A custom date/time (unix timestamp)
+ * for the file (optional).
+ * @param array $p_params An array of optional params:
+ * stamp => the datetime (replaces
+ * datetime above if it exists)
+ * mode => the permissions on the
+ * file (600 by default)
+ * type => is this a link? See the
+ * tar specification for details.
+ * (default = regular file)
+ * uid => the user ID of the file
+ * (default = 0 = root)
+ * gid => the group ID of the file
+ * (default = 0 = root)
+ *
+ * @return true on success, false on error.
+ */
+ public function addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
{
+ $p_stamp = @$p_params["stamp"] ? $p_params["stamp"] : ($p_datetime ? $p_datetime : time());
+ $p_mode = @$p_params["mode"] ? $p_params["mode"] : 0600;
+ $p_type = @$p_params["type"] ? $p_params["type"] : "";
+ $p_uid = @$p_params["uid"] ? $p_params["uid"] : "";
+ $p_gid = @$p_params["gid"] ? $p_params["gid"] : "";
$v_result = true;
if (!$this->_isArchive()) {
@@ -446,11 +560,12 @@ class Archive_Tar // extends PEAR
$this->_close();
}
- if (!$this->_openAppend())
+ if (!$this->_openAppend()) {
return false;
+ }
// Need to check the get back to the temporary file ? ....
- $v_result = $this->_addString($p_filename, $p_string);
+ $v_result = $this->_addString($p_filename, $p_string, $p_datetime, $p_params);
$this->_writeFooter();
@@ -458,131 +573,138 @@ class Archive_Tar // extends PEAR
return $v_result;
}
- // }}}
- // {{{ extractModify()
/**
- * This method extract all the content of the archive in the directory
- * indicated by $p_path. When relevant the memorized path of the
- * files/dir can be modified by removing the $p_remove_path path at the
- * beginning of the file/dir path.
- * While extracting a file, if the directory path does not exists it is
- * created.
- * While extracting a file, if the file already exists it is replaced
- * without looking for last modification date.
- * While extracting a file, if the file already exists and is write
- * protected, the extraction is aborted.
- * While extracting a file, if a directory with the same name already
- * exists, the extraction is aborted.
- * While extracting a directory, if a file with the same name already
- * exists, the extraction is aborted.
- * While extracting a file/directory if the destination directory exist
- * and is write protected, or does not exist but can not be created,
- * the extraction is aborted.
- * If after extraction an extracted file does not show the correct
- * stored file size, the extraction is aborted.
- * When the extraction is aborted, a PEAR error text is set and false
- * is returned. However the result can be a partial extraction that may
- * need to be manually cleaned.
- *
- * @param string $p_path The path of the directory where the
- * files/dir need to by extracted.
- * @param string $p_remove_path Part of the memorized path that can be
- * removed if present at the beginning of
- * the file/dir path.
- * @return boolean true on success, false on error.
- * @access public
- * @see extractList()
- */
- function extractModify($p_path, $p_remove_path)
+ * This method extract all the content of the archive in the directory
+ * indicated by $p_path. When relevant the memorized path of the
+ * files/dir can be modified by removing the $p_remove_path path at the
+ * beginning of the file/dir path.
+ * While extracting a file, if the directory path does not exists it is
+ * created.
+ * While extracting a file, if the file already exists it is replaced
+ * without looking for last modification date.
+ * While extracting a file, if the file already exists and is write
+ * protected, the extraction is aborted.
+ * While extracting a file, if a directory with the same name already
+ * exists, the extraction is aborted.
+ * While extracting a directory, if a file with the same name already
+ * exists, the extraction is aborted.
+ * While extracting a file/directory if the destination directory exist
+ * and is write protected, or does not exist but can not be created,
+ * the extraction is aborted.
+ * If after extraction an extracted file does not show the correct
+ * stored file size, the extraction is aborted.
+ * When the extraction is aborted, a PEAR error text is set and false
+ * is returned. However the result can be a partial extraction that may
+ * need to be manually cleaned.
+ *
+ * @param string $p_path The path of the directory where the
+ * files/dir need to by extracted.
+ * @param string $p_remove_path Part of the memorized path that can be
+ * removed if present at the beginning of
+ * the file/dir path.
+ * @param boolean $p_preserve Preserve user/group ownership of files
+ *
+ * @return boolean true on success, false on error.
+ * @see extractList()
+ */
+ public function extractModify($p_path, $p_remove_path, $p_preserve = false)
{
$v_result = true;
$v_list_detail = array();
if ($v_result = $this->_openRead()) {
- $v_result = $this->_extractList($p_path, $v_list_detail,
- "complete", 0, $p_remove_path);
+ $v_result = $this->_extractList(
+ $p_path,
+ $v_list_detail,
+ "complete",
+ 0,
+ $p_remove_path,
+ $p_preserve
+ );
$this->_close();
}
return $v_result;
}
- // }}}
- // {{{ extractInString()
/**
- * This method extract from the archive one file identified by $p_filename.
- * The return value is a string with the file content, or NULL on error.
- * @param string $p_filename The path of the file to extract in a string.
- * @return a string with the file content or NULL.
- * @access public
- */
- function extractInString($p_filename)
+ * This method extract from the archive one file identified by $p_filename.
+ * The return value is a string with the file content, or NULL on error.
+ *
+ * @param string $p_filename The path of the file to extract in a string.
+ *
+ * @return a string with the file content or NULL.
+ */
+ public function extractInString($p_filename)
{
if ($this->_openRead()) {
$v_result = $this->_extractInString($p_filename);
$this->_close();
} else {
- $v_result = NULL;
+ $v_result = null;
}
return $v_result;
}
- // }}}
- // {{{ extractList()
/**
- * This method extract from the archive only the files indicated in the
- * $p_filelist. These files are extracted in the current directory or
- * in the directory indicated by the optional $p_path parameter.
- * If indicated the $p_remove_path can be used in the same way as it is
- * used in extractModify() method.
- * @param array $p_filelist An array of filenames and directory names,
- * or a single string with names separated
- * by a single blank space.
- * @param string $p_path The path of the directory where the
- * files/dir need to by extracted.
- * @param string $p_remove_path Part of the memorized path that can be
- * removed if present at the beginning of
- * the file/dir path.
- * @return true on success, false on error.
- * @access public
- * @see extractModify()
- */
- function extractList($p_filelist, $p_path='', $p_remove_path='')
+ * This method extract from the archive only the files indicated in the
+ * $p_filelist. These files are extracted in the current directory or
+ * in the directory indicated by the optional $p_path parameter.
+ * If indicated the $p_remove_path can be used in the same way as it is
+ * used in extractModify() method.
+ *
+ * @param array $p_filelist An array of filenames and directory names,
+ * or a single string with names separated
+ * by a single blank space.
+ * @param string $p_path The path of the directory where the
+ * files/dir need to by extracted.
+ * @param string $p_remove_path Part of the memorized path that can be
+ * removed if present at the beginning of
+ * the file/dir path.
+ * @param boolean $p_preserve Preserve user/group ownership of files
+ *
+ * @return true on success, false on error.
+ * @see extractModify()
+ */
+ public function extractList($p_filelist, $p_path = '', $p_remove_path = '', $p_preserve = false)
{
$v_result = true;
$v_list_detail = array();
- if (is_array($p_filelist))
+ if (is_array($p_filelist)) {
$v_list = $p_filelist;
- elseif (is_string($p_filelist))
+ } elseif (is_string($p_filelist)) {
$v_list = explode($this->_separator, $p_filelist);
- else {
+ } else {
$this->_error('Invalid string list');
return false;
}
if ($v_result = $this->_openRead()) {
- $v_result = $this->_extractList($p_path, $v_list_detail, "partial",
- $v_list, $p_remove_path);
+ $v_result = $this->_extractList(
+ $p_path,
+ $v_list_detail,
+ "partial",
+ $v_list,
+ $p_remove_path,
+ $p_preserve
+ );
$this->_close();
}
return $v_result;
}
- // }}}
- // {{{ setAttribute()
/**
- * This method set specific attributes of the archive. It uses a variable
- * list of parameters, in the format attribute code + attribute values :
- * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
- * @param mixed $argv variable list of attributes and values
- * @return true on success, false on error.
- * @access public
- */
- function setAttribute()
+ * This method set specific attributes of the archive. It uses a variable
+ * list of parameters, in the format attribute code + attribute values :
+ * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
+ *
+ * @return true on success, false on error.
+ */
+ public function setAttribute()
{
$v_result = true;
@@ -592,30 +714,32 @@ class Archive_Tar // extends PEAR
}
// ----- Get the arguments
- $v_att_list = &func_get_args();
+ $v_att_list = & func_get_args();
// ----- Read the attributes
- $i=0;
- while ($i<$v_size) {
+ $i = 0;
+ while ($i < $v_size) {
// ----- Look for next option
switch ($v_att_list[$i]) {
// ----- Look for options that request a string value
case ARCHIVE_TAR_ATT_SEPARATOR :
// ----- Check the number of parameters
- if (($i+1) >= $v_size) {
- $this->_error('Invalid number of parameters for '
- .'attribute ARCHIVE_TAR_ATT_SEPARATOR');
+ if (($i + 1) >= $v_size) {
+ $this->_error(
+ 'Invalid number of parameters for '
+ . 'attribute ARCHIVE_TAR_ATT_SEPARATOR'
+ );
return false;
}
// ----- Get the value
- $this->_separator = $v_att_list[$i+1];
+ $this->_separator = $v_att_list[$i + 1];
$i++;
- break;
+ break;
default :
- $this->_error('Unknow attribute code '.$v_att_list[$i].'');
+ $this->_error('Unknown attribute code ' . $v_att_list[$i] . '');
return false;
}
@@ -625,151 +749,248 @@ class Archive_Tar // extends PEAR
return $v_result;
}
- // }}}
- // {{{ _error()
- function _error($p_message)
+ /**
+ * This method sets the regular expression for ignoring files and directories
+ * at import, for example:
+ * $arch->setIgnoreRegexp("#CVS|\.svn#");
+ *
+ * @param string $regexp regular expression defining which files or directories to ignore
+ */
+ public function setIgnoreRegexp($regexp)
+ {
+ $this->_ignore_regexp = $regexp;
+ }
+
+ /**
+ * This method sets the regular expression for ignoring all files and directories
+ * matching the filenames in the array list at import, for example:
+ * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
+ *
+ * @param array $list a list of file or directory names to ignore
+ *
+ * @access public
+ */
+ public function setIgnoreList($list)
+ {
+ $regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
+ $regexp = '#/' . join('$|/', $list) . '#';
+ $this->setIgnoreRegexp($regexp);
+ }
+
+ /**
+ * @param string $p_message
+ */
+ public function _error($p_message)
{
- // ----- To be completed
-// $this->raiseError($p_message);
+ // Drupal change $this->error_object = $this->raiseError($p_message).
throw new Exception($p_message);
}
- // }}}
- // {{{ _warning()
- function _warning($p_message)
+ /**
+ * @param string $p_message
+ */
+ public function _warning($p_message)
{
- // ----- To be completed
-// $this->raiseError($p_message);
+ // Drupal change $this->error_object = $this->raiseError($p_message).
throw new Exception($p_message);
}
- // }}}
- // {{{ _isArchive()
- function _isArchive($p_filename=NULL)
+ /**
+ * @param string $p_filename
+ * @return bool
+ */
+ public function _isArchive($p_filename = null)
{
- if ($p_filename == NULL) {
+ if ($p_filename == null) {
$p_filename = $this->_tarname;
}
clearstatcache();
return @is_file($p_filename) && !@is_link($p_filename);
}
- // }}}
- // {{{ _openWrite()
- function _openWrite()
+ /**
+ * @return bool
+ */
+ public function _openWrite()
{
- if ($this->_compress_type == 'gz')
+ if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
$this->_file = @gzopen($this->_tarname, "wb9");
- else if ($this->_compress_type == 'bz2')
- $this->_file = @bzopen($this->_tarname, "w");
- else if ($this->_compress_type == 'none')
- $this->_file = @fopen($this->_tarname, "wb");
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
+ } else {
+ if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
+ $this->_file = @bzopen($this->_tarname, "w");
+ } else {
+ if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
+ $this->_file = @xzopen($this->_tarname, 'w');
+ } else {
+ if ($this->_compress_type == 'none') {
+ $this->_file = @fopen($this->_tarname, "wb");
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ return false;
+ }
+ }
+ }
+ }
if ($this->_file == 0) {
- $this->_error('Unable to open in write mode \''
- .$this->_tarname.'\'');
+ $this->_error(
+ 'Unable to open in write mode \''
+ . $this->_tarname . '\''
+ );
return false;
}
return true;
}
- // }}}
- // {{{ _openRead()
- function _openRead()
+ /**
+ * @return bool
+ */
+ public function _openRead()
{
if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
- // ----- Look if a local copy need to be done
- if ($this->_temp_tarname == '') {
- $this->_temp_tarname = uniqid('tar').'.tmp';
- if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
- $this->_error('Unable to open in read mode \''
- .$this->_tarname.'\'');
- $this->_temp_tarname = '';
- return false;
- }
- if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
- $this->_error('Unable to open in write mode \''
- .$this->_temp_tarname.'\'');
- $this->_temp_tarname = '';
- return false;
- }
- while ($v_data = @fread($v_file_from, 1024))
- @fwrite($v_file_to, $v_data);
- @fclose($v_file_from);
- @fclose($v_file_to);
- }
+ // ----- Look if a local copy need to be done
+ if ($this->_temp_tarname == '') {
+ $this->_temp_tarname = uniqid('tar') . '.tmp';
+ if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+ $this->_error(
+ 'Unable to open in read mode \''
+ . $this->_tarname . '\''
+ );
+ $this->_temp_tarname = '';
+ return false;
+ }
+ if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+ $this->_error(
+ 'Unable to open in write mode \''
+ . $this->_temp_tarname . '\''
+ );
+ $this->_temp_tarname = '';
+ return false;
+ }
+ while ($v_data = @fread($v_file_from, 1024)) {
+ @fwrite($v_file_to, $v_data);
+ }
+ @fclose($v_file_from);
+ @fclose($v_file_to);
+ }
- // ----- File to open if the local copy
- $v_filename = $this->_temp_tarname;
+ // ----- File to open if the local copy
+ $v_filename = $this->_temp_tarname;
+ } else {
+ // ----- File to open if the normal Tar file
- } else
- // ----- File to open if the normal Tar file
- $v_filename = $this->_tarname;
+ $v_filename = $this->_tarname;
+ }
- if ($this->_compress_type == 'gz')
+ if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
$this->_file = @gzopen($v_filename, "rb");
- else if ($this->_compress_type == 'bz2')
- $this->_file = @bzopen($v_filename, "r");
- else if ($this->_compress_type == 'none')
- $this->_file = @fopen($v_filename, "rb");
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
+ } else {
+ if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
+ $this->_file = @bzopen($v_filename, "r");
+ } else {
+ if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
+ $this->_file = @xzopen($v_filename, "r");
+ } else {
+ if ($this->_compress_type == 'none') {
+ $this->_file = @fopen($v_filename, "rb");
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ return false;
+ }
+ }
+ }
+ }
if ($this->_file == 0) {
- $this->_error('Unable to open in read mode \''.$v_filename.'\'');
+ $this->_error('Unable to open in read mode \'' . $v_filename . '\'');
return false;
}
return true;
}
- // }}}
- // {{{ _openReadWrite()
- function _openReadWrite()
+ /**
+ * @return bool
+ */
+ public function _openReadWrite()
{
- if ($this->_compress_type == 'gz')
+ if ($this->_compress_type == 'gz') {
$this->_file = @gzopen($this->_tarname, "r+b");
- else if ($this->_compress_type == 'bz2') {
- $this->_error('Unable to open bz2 in read/write mode \''
- .$this->_tarname.'\' (limitation of bz2 extension)');
- return false;
- } else if ($this->_compress_type == 'none')
- $this->_file = @fopen($this->_tarname, "r+b");
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ $this->_error(
+ 'Unable to open bz2 in read/write mode \''
+ . $this->_tarname . '\' (limitation of bz2 extension)'
+ );
+ return false;
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ $this->_error(
+ 'Unable to open lzma2 in read/write mode \''
+ . $this->_tarname . '\' (limitation of lzma2 extension)'
+ );
+ return false;
+ } else {
+ if ($this->_compress_type == 'none') {
+ $this->_file = @fopen($this->_tarname, "r+b");
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ return false;
+ }
+ }
+ }
+ }
if ($this->_file == 0) {
- $this->_error('Unable to open in read/write mode \''
- .$this->_tarname.'\'');
+ $this->_error(
+ 'Unable to open in read/write mode \''
+ . $this->_tarname . '\''
+ );
return false;
}
return true;
}
- // }}}
- // {{{ _close()
- function _close()
+ /**
+ * @return bool
+ */
+ public function _close()
{
//if (isset($this->_file)) {
if (is_resource($this->_file)) {
- if ($this->_compress_type == 'gz')
+ if ($this->_compress_type == 'gz') {
@gzclose($this->_file);
- else if ($this->_compress_type == 'bz2')
- @bzclose($this->_file);
- else if ($this->_compress_type == 'none')
- @fclose($this->_file);
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ @bzclose($this->_file);
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ @xzclose($this->_file);
+ } else {
+ if ($this->_compress_type == 'none') {
+ @fclose($this->_file);
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ }
+ }
+ }
+ }
$this->_file = 0;
}
@@ -783,10 +1004,11 @@ class Archive_Tar // extends PEAR
return true;
}
- // }}}
- // {{{ _cleanFile()
- function _cleanFile()
+ /**
+ * @return bool
+ */
+ public function _cleanFile()
{
$this->_close();
@@ -803,296 +1025,419 @@ class Archive_Tar // extends PEAR
return true;
}
- // }}}
- // {{{ _writeBlock()
- function _writeBlock($p_binary_data, $p_len=null)
+ /**
+ * @param mixed $p_binary_data
+ * @param integer $p_len
+ * @return bool
+ */
+ public function _writeBlock($p_binary_data, $p_len = null)
{
- if (is_resource($this->_file)) {
- if ($p_len === null) {
- if ($this->_compress_type == 'gz')
- @gzputs($this->_file, $p_binary_data);
- else if ($this->_compress_type == 'bz2')
- @bzwrite($this->_file, $p_binary_data);
- else if ($this->_compress_type == 'none')
- @fputs($this->_file, $p_binary_data);
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
- } else {
- if ($this->_compress_type == 'gz')
- @gzputs($this->_file, $p_binary_data, $p_len);
- else if ($this->_compress_type == 'bz2')
- @bzwrite($this->_file, $p_binary_data, $p_len);
- else if ($this->_compress_type == 'none')
- @fputs($this->_file, $p_binary_data, $p_len);
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
-
- }
- }
- return true;
+ if (is_resource($this->_file)) {
+ if ($p_len === null) {
+ if ($this->_compress_type == 'gz') {
+ @gzputs($this->_file, $p_binary_data);
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ @bzwrite($this->_file, $p_binary_data);
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ @xzwrite($this->_file, $p_binary_data);
+ } else {
+ if ($this->_compress_type == 'none') {
+ @fputs($this->_file, $p_binary_data);
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ }
+ }
+ }
+ }
+ } else {
+ if ($this->_compress_type == 'gz') {
+ @gzputs($this->_file, $p_binary_data, $p_len);
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ @bzwrite($this->_file, $p_binary_data, $p_len);
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ @xzwrite($this->_file, $p_binary_data, $p_len);
+ } else {
+ if ($this->_compress_type == 'none') {
+ @fputs($this->_file, $p_binary_data, $p_len);
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ }
+ }
+ }
+ }
+ }
+ }
+ return true;
}
- // }}}
- // {{{ _readBlock()
- function _readBlock()
+ /**
+ * @return null|string
+ */
+ public function _readBlock()
{
- $v_block = null;
- if (is_resource($this->_file)) {
- if ($this->_compress_type == 'gz')
- $v_block = @gzread($this->_file, 512);
- else if ($this->_compress_type == 'bz2')
- $v_block = @bzread($this->_file, 512);
- else if ($this->_compress_type == 'none')
- $v_block = @fread($this->_file, 512);
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
- }
- return $v_block;
+ $v_block = null;
+ if (is_resource($this->_file)) {
+ if ($this->_compress_type == 'gz') {
+ $v_block = @gzread($this->_file, 512);
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ $v_block = @bzread($this->_file, 512);
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ $v_block = @xzread($this->_file, 512);
+ } else {
+ if ($this->_compress_type == 'none') {
+ $v_block = @fread($this->_file, 512);
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ }
+ }
+ }
+ }
+ }
+ return $v_block;
}
- // }}}
- // {{{ _jumpBlock()
- function _jumpBlock($p_len=null)
- {
- if (is_resource($this->_file)) {
- if ($p_len === null)
- $p_len = 1;
-
- if ($this->_compress_type == 'gz') {
- @gzseek($this->_file, gztell($this->_file)+($p_len*512));
- }
- else if ($this->_compress_type == 'bz2') {
- // ----- Replace missing bztell() and bzseek()
- for ($i=0; $i<$p_len; $i++)
- $this->_readBlock();
- } else if ($this->_compress_type == 'none')
- @fseek($this->_file, ftell($this->_file)+($p_len*512));
- else
- $this->_error('Unknown or missing compression type ('
- .$this->_compress_type.')');
-
- }
- return true;
- }
- // }}}
+ /**
+ * @param null $p_len
+ * @return bool
+ */
+ public function _jumpBlock($p_len = null)
+ {
+ if (is_resource($this->_file)) {
+ if ($p_len === null) {
+ $p_len = 1;
+ }
+
+ if ($this->_compress_type == 'gz') {
+ @gzseek($this->_file, gztell($this->_file) + ($p_len * 512));
+ } else {
+ if ($this->_compress_type == 'bz2') {
+ // ----- Replace missing bztell() and bzseek()
+ for ($i = 0; $i < $p_len; $i++) {
+ $this->_readBlock();
+ }
+ } else {
+ if ($this->_compress_type == 'lzma2') {
+ // ----- Replace missing xztell() and xzseek()
+ for ($i = 0; $i < $p_len; $i++) {
+ $this->_readBlock();
+ }
+ } else {
+ if ($this->_compress_type == 'none') {
+ @fseek($this->_file, $p_len * 512, SEEK_CUR);
+ } else {
+ $this->_error(
+ 'Unknown or missing compression type ('
+ . $this->_compress_type . ')'
+ );
+ }
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @return bool
+ */
+ public function _writeFooter()
+ {
+ if (is_resource($this->_file)) {
+ // ----- Write the last 0 filled block for end of archive
+ $v_binary_data = pack('a1024', '');
+ $this->_writeBlock($v_binary_data);
+ }
+ return true;
+ }
+
+ /**
+ * @param array $p_list
+ * @param string $p_add_dir
+ * @param string $p_remove_dir
+ * @return bool
+ */
+ public function _addList($p_list, $p_add_dir, $p_remove_dir)
+ {
+ $v_result = true;
+ $v_header = array();
+
+ // ----- Remove potential windows directory separator
+ $p_add_dir = $this->_translateWinPath($p_add_dir);
+ $p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
+
+ if (!$this->_file) {
+ $this->_error('Invalid file descriptor');
+ return false;
+ }
+
+ if (sizeof($p_list) == 0) {
+ return true;
+ }
+
+ foreach ($p_list as $v_filename) {
+ if (!$v_result) {
+ break;
+ }
+
+ // ----- Skip the current tar name
+ if ($v_filename == $this->_tarname) {
+ continue;
+ }
+
+ if ($v_filename == '') {
+ continue;
+ }
+
+ // ----- ignore files and directories matching the ignore regular expression
+ if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/' . $v_filename)) {
+ $this->_warning("File '$v_filename' ignored");
+ continue;
+ }
+
+ if (!file_exists($v_filename) && !is_link($v_filename)) {
+ $this->_warning("File '$v_filename' does not exist");
+ continue;
+ }
+
+ // ----- Add the file or directory header
+ if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir)) {
+ return false;
+ }
+
+ if (@is_dir($v_filename) && !@is_link($v_filename)) {
+ if (!($p_hdir = opendir($v_filename))) {
+ $this->_warning("Directory '$v_filename' can not be read");
+ continue;
+ }
+ while (false !== ($p_hitem = readdir($p_hdir))) {
+ if (($p_hitem != '.') && ($p_hitem != '..')) {
+ if ($v_filename != ".") {
+ $p_temp_list[0] = $v_filename . '/' . $p_hitem;
+ } else {
+ $p_temp_list[0] = $p_hitem;
+ }
+
+ $v_result = $this->_addList(
+ $p_temp_list,
+ $p_add_dir,
+ $p_remove_dir
+ );
+ }
+ }
+
+ unset($p_temp_list);
+ unset($p_hdir);
+ unset($p_hitem);
+ }
+ }
- // {{{ _writeFooter()
- function _writeFooter()
- {
- if (is_resource($this->_file)) {
- // ----- Write the last 0 filled block for end of archive
- $v_binary_data = pack('a1024', '');
- $this->_writeBlock($v_binary_data);
- }
- return true;
+ return $v_result;
}
- // }}}
- // {{{ _addList()
- function _addList($p_list, $p_add_dir, $p_remove_dir)
+ /**
+ * @param string $p_filename
+ * @param mixed $p_header
+ * @param string $p_add_dir
+ * @param string $p_remove_dir
+ * @param null $v_stored_filename
+ * @return bool
+ */
+ public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_stored_filename = null)
{
- $v_result=true;
- $v_header = array();
+ if (!$this->_file) {
+ $this->_error('Invalid file descriptor');
+ return false;
+ }
- // ----- Remove potential windows directory separator
- $p_add_dir = $this->_translateWinPath($p_add_dir);
- $p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
+ if ($p_filename == '') {
+ $this->_error('Invalid file name');
+ return false;
+ }
- if (!$this->_file) {
- $this->_error('Invalid file descriptor');
- return false;
- }
+ if (is_null($v_stored_filename)) {
+ // ----- Calculate the stored filename
+ $p_filename = $this->_translateWinPath($p_filename, false);
+ $v_stored_filename = $p_filename;
- if (sizeof($p_list) == 0)
- return true;
+ if (strcmp($p_filename, $p_remove_dir) == 0) {
+ return true;
+ }
- foreach ($p_list as $v_filename) {
- if (!$v_result) {
- break;
- }
+ if ($p_remove_dir != '') {
+ if (substr($p_remove_dir, -1) != '/') {
+ $p_remove_dir .= '/';
+ }
- // ----- Skip the current tar name
- if ($v_filename == $this->_tarname)
- continue;
+ if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir) {
+ $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
+ }
+ }
- if ($v_filename == '')
- continue;
+ $v_stored_filename = $this->_translateWinPath($v_stored_filename);
+ if ($p_add_dir != '') {
+ if (substr($p_add_dir, -1) == '/') {
+ $v_stored_filename = $p_add_dir . $v_stored_filename;
+ } else {
+ $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
+ }
+ }
- if (!file_exists($v_filename)) {
- $this->_warning("File '$v_filename' does not exist");
- continue;
+ $v_stored_filename = $this->_pathReduction($v_stored_filename);
}
- // ----- Add the file or directory header
- if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir))
- return false;
+ if ($this->_isArchive($p_filename)) {
+ if (($v_file = @fopen($p_filename, "rb")) == 0) {
+ $this->_warning(
+ "Unable to open file '" . $p_filename
+ . "' in binary read mode"
+ );
+ return true;
+ }
- if (@is_dir($v_filename) && !@is_link($v_filename)) {
- if (!($p_hdir = opendir($v_filename))) {
- $this->_warning("Directory '$v_filename' can not be read");
- continue;
+ if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
+ return false;
}
- while (false !== ($p_hitem = readdir($p_hdir))) {
- if (($p_hitem != '.') && ($p_hitem != '..')) {
- if ($v_filename != ".")
- $p_temp_list[0] = $v_filename.'/'.$p_hitem;
- else
- $p_temp_list[0] = $p_hitem;
-
- $v_result = $this->_addList($p_temp_list,
- $p_add_dir,
- $p_remove_dir);
- }
+
+ while (($v_buffer = fread($v_file, 512)) != '') {
+ $v_binary_data = pack("a512", "$v_buffer");
+ $this->_writeBlock($v_binary_data);
}
- unset($p_temp_list);
- unset($p_hdir);
- unset($p_hitem);
+ fclose($v_file);
+ } else {
+ // ----- Only header for dir
+ if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
+ return false;
+ }
}
- }
- return $v_result;
+ return true;
}
- // }}}
- // {{{ _addFile()
- function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir)
+ /**
+ * @param string $p_filename
+ * @param string $p_string
+ * @param bool $p_datetime
+ * @param array $p_params
+ * @return bool
+ */
+ public function _addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
{
- if (!$this->_file) {
- $this->_error('Invalid file descriptor');
- return false;
- }
-
- if ($p_filename == '') {
- $this->_error('Invalid file name');
- return false;
- }
-
- // ----- Calculate the stored filename
- $p_filename = $this->_translateWinPath($p_filename, false);;
- $v_stored_filename = $p_filename;
- if (strcmp($p_filename, $p_remove_dir) == 0) {
- return true;
- }
- if ($p_remove_dir != '') {
- if (substr($p_remove_dir, -1) != '/')
- $p_remove_dir .= '/';
-
- if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
- $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
- }
- $v_stored_filename = $this->_translateWinPath($v_stored_filename);
- if ($p_add_dir != '') {
- if (substr($p_add_dir, -1) == '/')
- $v_stored_filename = $p_add_dir.$v_stored_filename;
- else
- $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
- }
-
- $v_stored_filename = $this->_pathReduction($v_stored_filename);
-
- if ($this->_isArchive($p_filename)) {
- if (($v_file = @fopen($p_filename, "rb")) == 0) {
- $this->_warning("Unable to open file '".$p_filename
- ."' in binary read mode");
- return true;
- }
-
- if (!$this->_writeHeader($p_filename, $v_stored_filename))
- return false;
-
- while (($v_buffer = fread($v_file, 512)) != '') {
- $v_binary_data = pack("a512", "$v_buffer");
- $this->_writeBlock($v_binary_data);
- }
-
- fclose($v_file);
-
- } else {
- // ----- Only header for dir
- if (!$this->_writeHeader($p_filename, $v_stored_filename))
- return false;
- }
-
- return true;
- }
- // }}}
+ $p_stamp = @$p_params["stamp"] ? $p_params["stamp"] : ($p_datetime ? $p_datetime : time());
+ $p_mode = @$p_params["mode"] ? $p_params["mode"] : 0600;
+ $p_type = @$p_params["type"] ? $p_params["type"] : "";
+ $p_uid = @$p_params["uid"] ? $p_params["uid"] : 0;
+ $p_gid = @$p_params["gid"] ? $p_params["gid"] : 0;
+ if (!$this->_file) {
+ $this->_error('Invalid file descriptor');
+ return false;
+ }
- // {{{ _addString()
- function _addString($p_filename, $p_string)
- {
- if (!$this->_file) {
- $this->_error('Invalid file descriptor');
- return false;
- }
-
- if ($p_filename == '') {
- $this->_error('Invalid file name');
- return false;
- }
-
- // ----- Calculate the stored filename
- $p_filename = $this->_translateWinPath($p_filename, false);;
-
- if (!$this->_writeHeaderBlock($p_filename, strlen($p_string),
- time(), 384, "", 0, 0))
- return false;
-
- $i=0;
- while (($v_buffer = substr($p_string, (($i++)*512), 512)) != '') {
- $v_binary_data = pack("a512", $v_buffer);
- $this->_writeBlock($v_binary_data);
- }
-
- return true;
+ if ($p_filename == '') {
+ $this->_error('Invalid file name');
+ return false;
+ }
+
+ // ----- Calculate the stored filename
+ $p_filename = $this->_translateWinPath($p_filename, false);
+
+ // ----- If datetime is not specified, set current time
+ if ($p_datetime === false) {
+ $p_datetime = time();
+ }
+
+ if (!$this->_writeHeaderBlock(
+ $p_filename,
+ strlen($p_string),
+ $p_stamp,
+ $p_mode,
+ $p_type,
+ $p_uid,
+ $p_gid
+ )
+ ) {
+ return false;
+ }
+
+ $i = 0;
+ while (($v_buffer = substr($p_string, (($i++) * 512), 512)) != '') {
+ $v_binary_data = pack("a512", $v_buffer);
+ $this->_writeBlock($v_binary_data);
+ }
+
+ return true;
}
- // }}}
- // {{{ _writeHeader()
- function _writeHeader($p_filename, $p_stored_filename)
+ /**
+ * @param string $p_filename
+ * @param string $p_stored_filename
+ * @return bool
+ */
+ public function _writeHeader($p_filename, $p_stored_filename)
{
- if ($p_stored_filename == '')
+ if ($p_stored_filename == '') {
$p_stored_filename = $p_filename;
+ }
$v_reduce_filename = $this->_pathReduction($p_stored_filename);
if (strlen($v_reduce_filename) > 99) {
- if (!$this->_writeLongHeader($v_reduce_filename))
- return false;
+ if (!$this->_writeLongHeader($v_reduce_filename)) {
+ return false;
+ }
}
$v_info = lstat($p_filename);
- $v_uid = sprintf("%6s ", DecOct($v_info[4]));
- $v_gid = sprintf("%6s ", DecOct($v_info[5]));
- $v_perms = sprintf("%6s ", DecOct($v_info['mode']));
+ $v_uid = sprintf("%07s", DecOct($v_info[4]));
+ $v_gid = sprintf("%07s", DecOct($v_info[5]));
+ $v_perms = sprintf("%07s", DecOct($v_info['mode'] & 000777));
- $v_mtime = sprintf("%11s", DecOct($v_info['mode']));
+ $v_mtime = sprintf("%011s", DecOct($v_info['mtime']));
$v_linkname = '';
if (@is_link($p_filename)) {
- $v_typeflag = '2';
- $v_linkname = readlink($p_filename);
- $v_size = sprintf("%11s ", DecOct(0));
+ $v_typeflag = '2';
+ $v_linkname = readlink($p_filename);
+ $v_size = sprintf("%011s", DecOct(0));
} elseif (@is_dir($p_filename)) {
- $v_typeflag = "5";
- $v_size = sprintf("%11s ", DecOct(0));
+ $v_typeflag = "5";
+ $v_size = sprintf("%011s", DecOct(0));
} else {
- $v_typeflag = '';
- clearstatcache();
- $v_size = sprintf("%11s ", DecOct($v_info['size']));
+ $v_typeflag = '0';
+ clearstatcache();
+ $v_size = sprintf("%011s", DecOct($v_info['size']));
}
- $v_magic = '';
+ $v_magic = 'ustar ';
- $v_version = '';
+ $v_version = ' ';
- $v_uname = '';
+ if (function_exists('posix_getpwuid')) {
+ $userinfo = posix_getpwuid($v_info[4]);
+ $groupinfo = posix_getgrgid($v_info[5]);
- $v_gname = '';
+ $v_uname = $userinfo['name'];
+ $v_gname = $groupinfo['name'];
+ } else {
+ $v_uname = '';
+ $v_gname = '';
+ }
$v_devmajor = '';
@@ -1100,31 +1445,49 @@ class Archive_Tar // extends PEAR
$v_prefix = '';
- $v_binary_data_first = pack("a100a8a8a8a12A12",
- $v_reduce_filename, $v_perms, $v_uid,
- $v_gid, $v_size, $v_mtime);
- $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
- $v_typeflag, $v_linkname, $v_magic,
- $v_version, $v_uname, $v_gname,
- $v_devmajor, $v_devminor, $v_prefix, '');
+ $v_binary_data_first = pack(
+ "a100a8a8a8a12a12",
+ $v_reduce_filename,
+ $v_perms,
+ $v_uid,
+ $v_gid,
+ $v_size,
+ $v_mtime
+ );
+ $v_binary_data_last = pack(
+ "a1a100a6a2a32a32a8a8a155a12",
+ $v_typeflag,
+ $v_linkname,
+ $v_magic,
+ $v_version,
+ $v_uname,
+ $v_gname,
+ $v_devmajor,
+ $v_devminor,
+ $v_prefix,
+ ''
+ );
// ----- Calculate the checksum
$v_checksum = 0;
// ..... First part of the header
- for ($i=0; $i<148; $i++)
- $v_checksum += ord(substr($v_binary_data_first,$i,1));
+ for ($i = 0; $i < 148; $i++) {
+ $v_checksum += ord(substr($v_binary_data_first, $i, 1));
+ }
// ..... Ignore the checksum value and replace it by ' ' (space)
- for ($i=148; $i<156; $i++)
+ for ($i = 148; $i < 156; $i++) {
$v_checksum += ord(' ');
+ }
// ..... Last part of the header
- for ($i=156, $j=0; $i<512; $i++, $j++)
- $v_checksum += ord(substr($v_binary_data_last,$j,1));
+ for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+ $v_checksum += ord(substr($v_binary_data_last, $j, 1));
+ }
// ----- Write the first 148 bytes of the header in the archive
$this->_writeBlock($v_binary_data_first, 148);
// ----- Write the calculated checksum
- $v_checksum = sprintf("%6s ", DecOct($v_checksum));
+ $v_checksum = sprintf("%06s ", DecOct($v_checksum));
$v_binary_data = pack("a8", $v_checksum);
$this->_writeBlock($v_binary_data, 8);
@@ -1133,40 +1496,62 @@ class Archive_Tar // extends PEAR
return true;
}
- // }}}
- // {{{ _writeHeaderBlock()
- function _writeHeaderBlock($p_filename, $p_size, $p_mtime=0, $p_perms=0,
- $p_type='', $p_uid=0, $p_gid=0)
- {
+ /**
+ * @param string $p_filename
+ * @param int $p_size
+ * @param int $p_mtime
+ * @param int $p_perms
+ * @param string $p_type
+ * @param int $p_uid
+ * @param int $p_gid
+ * @return bool
+ */
+ public function _writeHeaderBlock(
+ $p_filename,
+ $p_size,
+ $p_mtime = 0,
+ $p_perms = 0,
+ $p_type = '',
+ $p_uid = 0,
+ $p_gid = 0
+ ) {
$p_filename = $this->_pathReduction($p_filename);
if (strlen($p_filename) > 99) {
- if (!$this->_writeLongHeader($p_filename))
- return false;
+ if (!$this->_writeLongHeader($p_filename)) {
+ return false;
+ }
}
if ($p_type == "5") {
- $v_size = sprintf("%11s ", DecOct(0));
+ $v_size = sprintf("%011s", DecOct(0));
} else {
- $v_size = sprintf("%11s ", DecOct($p_size));
+ $v_size = sprintf("%011s", DecOct($p_size));
}
- $v_uid = sprintf("%6s ", DecOct($p_uid));
- $v_gid = sprintf("%6s ", DecOct($p_gid));
- $v_perms = sprintf("%6s ", DecOct($p_perms));
+ $v_uid = sprintf("%07s", DecOct($p_uid));
+ $v_gid = sprintf("%07s", DecOct($p_gid));
+ $v_perms = sprintf("%07s", DecOct($p_perms & 000777));
$v_mtime = sprintf("%11s", DecOct($p_mtime));
$v_linkname = '';
- $v_magic = '';
+ $v_magic = 'ustar ';
- $v_version = '';
+ $v_version = ' ';
- $v_uname = '';
+ if (function_exists('posix_getpwuid')) {
+ $userinfo = posix_getpwuid($p_uid);
+ $groupinfo = posix_getgrgid($p_gid);
- $v_gname = '';
+ $v_uname = $userinfo['name'];
+ $v_gname = $groupinfo['name'];
+ } else {
+ $v_uname = '';
+ $v_gname = '';
+ }
$v_devmajor = '';
@@ -1174,31 +1559,49 @@ class Archive_Tar // extends PEAR
$v_prefix = '';
- $v_binary_data_first = pack("a100a8a8a8a12A12",
- $p_filename, $v_perms, $v_uid, $v_gid,
- $v_size, $v_mtime);
- $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
- $p_type, $v_linkname, $v_magic,
- $v_version, $v_uname, $v_gname,
- $v_devmajor, $v_devminor, $v_prefix, '');
+ $v_binary_data_first = pack(
+ "a100a8a8a8a12A12",
+ $p_filename,
+ $v_perms,
+ $v_uid,
+ $v_gid,
+ $v_size,
+ $v_mtime
+ );
+ $v_binary_data_last = pack(
+ "a1a100a6a2a32a32a8a8a155a12",
+ $p_type,
+ $v_linkname,
+ $v_magic,
+ $v_version,
+ $v_uname,
+ $v_gname,
+ $v_devmajor,
+ $v_devminor,
+ $v_prefix,
+ ''
+ );
// ----- Calculate the checksum
$v_checksum = 0;
// ..... First part of the header
- for ($i=0; $i<148; $i++)
- $v_checksum += ord(substr($v_binary_data_first,$i,1));
+ for ($i = 0; $i < 148; $i++) {
+ $v_checksum += ord(substr($v_binary_data_first, $i, 1));
+ }
// ..... Ignore the checksum value and replace it by ' ' (space)
- for ($i=148; $i<156; $i++)
+ for ($i = 148; $i < 156; $i++) {
$v_checksum += ord(' ');
+ }
// ..... Last part of the header
- for ($i=156, $j=0; $i<512; $i++, $j++)
- $v_checksum += ord(substr($v_binary_data_last,$j,1));
+ for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+ $v_checksum += ord(substr($v_binary_data_last, $j, 1));
+ }
// ----- Write the first 148 bytes of the header in the archive
$this->_writeBlock($v_binary_data_first, 148);
// ----- Write the calculated checksum
- $v_checksum = sprintf("%6s ", DecOct($v_checksum));
+ $v_checksum = sprintf("%06s ", DecOct($v_checksum));
$v_binary_data = pack("a8", $v_checksum);
$this->_writeBlock($v_binary_data, 8);
@@ -1207,10 +1610,12 @@ class Archive_Tar // extends PEAR
return true;
}
- // }}}
- // {{{ _writeLongHeader()
- function _writeLongHeader($p_filename)
+ /**
+ * @param string $p_filename
+ * @return bool
+ */
+ public function _writeLongHeader($p_filename)
{
$v_size = sprintf("%11s ", DecOct(strlen($p_filename)));
@@ -1232,30 +1637,49 @@ class Archive_Tar // extends PEAR
$v_prefix = '';
- $v_binary_data_first = pack("a100a8a8a8a12A12",
- '././@LongLink', 0, 0, 0, $v_size, 0);
- $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
- $v_typeflag, $v_linkname, $v_magic,
- $v_version, $v_uname, $v_gname,
- $v_devmajor, $v_devminor, $v_prefix, '');
+ $v_binary_data_first = pack(
+ "a100a8a8a8a12a12",
+ '././@LongLink',
+ 0,
+ 0,
+ 0,
+ $v_size,
+ 0
+ );
+ $v_binary_data_last = pack(
+ "a1a100a6a2a32a32a8a8a155a12",
+ $v_typeflag,
+ $v_linkname,
+ $v_magic,
+ $v_version,
+ $v_uname,
+ $v_gname,
+ $v_devmajor,
+ $v_devminor,
+ $v_prefix,
+ ''
+ );
// ----- Calculate the checksum
$v_checksum = 0;
// ..... First part of the header
- for ($i=0; $i<148; $i++)
- $v_checksum += ord(substr($v_binary_data_first,$i,1));
+ for ($i = 0; $i < 148; $i++) {
+ $v_checksum += ord(substr($v_binary_data_first, $i, 1));
+ }
// ..... Ignore the checksum value and replace it by ' ' (space)
- for ($i=148; $i<156; $i++)
+ for ($i = 148; $i < 156; $i++) {
$v_checksum += ord(' ');
+ }
// ..... Last part of the header
- for ($i=156, $j=0; $i<512; $i++, $j++)
- $v_checksum += ord(substr($v_binary_data_last,$j,1));
+ for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+ $v_checksum += ord(substr($v_binary_data_last, $j, 1));
+ }
// ----- Write the first 148 bytes of the header in the archive
$this->_writeBlock($v_binary_data_first, 148);
// ----- Write the calculated checksum
- $v_checksum = sprintf("%6s ", DecOct($v_checksum));
+ $v_checksum = sprintf("%06s ", DecOct($v_checksum));
$v_binary_data = pack("a8", $v_checksum);
$this->_writeBlock($v_binary_data, 8);
@@ -1263,27 +1687,30 @@ class Archive_Tar // extends PEAR
$this->_writeBlock($v_binary_data_last, 356);
// ----- Write the filename as content of the block
- $i=0;
- while (($v_buffer = substr($p_filename, (($i++)*512), 512)) != '') {
+ $i = 0;
+ while (($v_buffer = substr($p_filename, (($i++) * 512), 512)) != '') {
$v_binary_data = pack("a512", "$v_buffer");
$this->_writeBlock($v_binary_data);
}
return true;
}
- // }}}
- // {{{ _readHeader()
- function _readHeader($v_binary_data, &$v_header)
+ /**
+ * @param mixed $v_binary_data
+ * @param mixed $v_header
+ * @return bool
+ */
+ public function _readHeader($v_binary_data, &$v_header)
{
- if (strlen($v_binary_data)==0) {
+ if (strlen($v_binary_data) == 0) {
$v_header['filename'] = '';
return true;
}
if (strlen($v_binary_data) != 512) {
$v_header['filename'] = '';
- $this->_error('Invalid block size : '.strlen($v_binary_data));
+ $this->_error('Invalid block size : ' . strlen($v_binary_data));
return false;
}
@@ -1293,19 +1720,32 @@ class Archive_Tar // extends PEAR
// ----- Calculate the checksum
$v_checksum = 0;
// ..... First part of the header
- for ($i=0; $i<148; $i++)
- $v_checksum+=ord(substr($v_binary_data,$i,1));
+ for ($i = 0; $i < 148; $i++) {
+ $v_checksum += ord(substr($v_binary_data, $i, 1));
+ }
// ..... Ignore the checksum value and replace it by ' ' (space)
- for ($i=148; $i<156; $i++)
+ for ($i = 148; $i < 156; $i++) {
$v_checksum += ord(' ');
+ }
// ..... Last part of the header
- for ($i=156; $i<512; $i++)
- $v_checksum+=ord(substr($v_binary_data,$i,1));
+ for ($i = 156; $i < 512; $i++) {
+ $v_checksum += ord(substr($v_binary_data, $i, 1));
+ }
- $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
- ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
- ."a32uname/a32gname/a8devmajor/a8devminor",
- $v_binary_data);
+ if (version_compare(PHP_VERSION, "5.5.0-dev") < 0) {
+ $fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
+ "a8checksum/a1typeflag/a100link/a6magic/a2version/" .
+ "a32uname/a32gname/a8devmajor/a8devminor/a131prefix";
+ } else {
+ $fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" .
+ "Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" .
+ "Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix";
+ }
+ $v_data = unpack($fmt, $v_binary_data);
+
+ if (strlen($v_data["prefix"]) > 0) {
+ $v_data["filename"] = "$v_data[prefix]/$v_data[filename]";
+ }
// ----- Extract the checksum
$v_header['checksum'] = OctDec(trim($v_data['checksum']));
@@ -1313,20 +1753,25 @@ class Archive_Tar // extends PEAR
$v_header['filename'] = '';
// ----- Look for last block (empty block)
- if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+ if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
return true;
+ }
- $this->_error('Invalid checksum for file "'.$v_data['filename']
- .'" : '.$v_checksum.' calculated, '
- .$v_header['checksum'].' expected');
+ $this->_error(
+ 'Invalid checksum for file "' . $v_data['filename']
+ . '" : ' . $v_checksum . ' calculated, '
+ . $v_header['checksum'] . ' expected'
+ );
return false;
}
// ----- Extract the properties
- $v_header['filename'] = trim($v_data['filename']);
+ $v_header['filename'] = rtrim($v_data['filename'], "\0");
if ($this->_maliciousFilename($v_header['filename'])) {
- $this->_error('Malicious .tar detected, file "' . $v_header['filename'] .
- '" will not install in desired directory tree');
+ $this->_error(
+ 'Malicious .tar detected, file "' . $v_header['filename'] .
+ '" will not install in desired directory tree'
+ );
return false;
}
$v_header['mode'] = OctDec(trim($v_data['mode']));
@@ -1335,11 +1780,11 @@ class Archive_Tar // extends PEAR
$v_header['size'] = OctDec(trim($v_data['size']));
$v_header['mtime'] = OctDec(trim($v_data['mtime']));
if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
- $v_header['size'] = 0;
+ $v_header['size'] = 0;
}
$v_header['link'] = trim($v_data['link']);
/* ----- All these fields are removed form the header because
- they do not carry interesting info
+ they do not carry interesting info
$v_header[magic] = trim($v_data[magic]);
$v_header[version] = trim($v_data[version]);
$v_header[uname] = trim($v_data[uname]);
@@ -1350,17 +1795,15 @@ class Archive_Tar // extends PEAR
return true;
}
- // }}}
- // {{{ _maliciousFilename()
/**
* Detect and report a malicious file name
*
* @param string $file
+ *
* @return bool
- * @access private
*/
- function _maliciousFilename($file)
+ private function _maliciousFilename($file)
{
if (strpos($file, '/../') !== false) {
return true;
@@ -1370,386 +1813,507 @@ class Archive_Tar // extends PEAR
}
return false;
}
- // }}}
- // {{{ _readLongHeader()
- function _readLongHeader(&$v_header)
+ /**
+ * @param $v_header
+ * @return bool
+ */
+ public function _readLongHeader(&$v_header)
{
- $v_filename = '';
- $n = floor($v_header['size']/512);
- for ($i=0; $i<$n; $i++) {
- $v_content = $this->_readBlock();
- $v_filename .= $v_content;
- }
- if (($v_header['size'] % 512) != 0) {
- $v_content = $this->_readBlock();
- $v_filename .= $v_content;
- }
-
- // ----- Read the next header
- $v_binary_data = $this->_readBlock();
-
- if (!$this->_readHeader($v_binary_data, $v_header))
- return false;
+ $v_filename = '';
+ $v_filesize = $v_header['size'];
+ $n = floor($v_header['size'] / 512);
+ for ($i = 0; $i < $n; $i++) {
+ $v_content = $this->_readBlock();
+ $v_filename .= $v_content;
+ }
+ if (($v_header['size'] % 512) != 0) {
+ $v_content = $this->_readBlock();
+ $v_filename .= $v_content;
+ }
- $v_filename = trim($v_filename);
- $v_header['filename'] = $v_filename;
+ // ----- Read the next header
+ $v_binary_data = $this->_readBlock();
+
+ if (!$this->_readHeader($v_binary_data, $v_header)) {
+ return false;
+ }
+
+ $v_filename = rtrim(substr($v_filename, 0, $v_filesize), "\0");
+ $v_header['filename'] = $v_filename;
if ($this->_maliciousFilename($v_filename)) {
- $this->_error('Malicious .tar detected, file "' . $v_filename .
- '" will not install in desired directory tree');
+ $this->_error(
+ 'Malicious .tar detected, file "' . $v_filename .
+ '" will not install in desired directory tree'
+ );
return false;
- }
+ }
- return true;
+ return true;
}
- // }}}
- // {{{ _extractInString()
/**
- * This method extract from the archive one file identified by $p_filename.
- * The return value is a string with the file content, or NULL on error.
- * @param string $p_filename The path of the file to extract in a string.
- * @return a string with the file content or NULL.
- * @access private
- */
- function _extractInString($p_filename)
+ * This method extract from the archive one file identified by $p_filename.
+ * The return value is a string with the file content, or null on error.
+ *
+ * @param string $p_filename The path of the file to extract in a string.
+ *
+ * @return a string with the file content or null.
+ */
+ private function _extractInString($p_filename)
{
$v_result_str = "";
- While (strlen($v_binary_data = $this->_readBlock()) != 0)
- {
- if (!$this->_readHeader($v_binary_data, $v_header))
- return NULL;
-
- if ($v_header['filename'] == '')
- continue;
-
- // ----- Look for long filename
- if ($v_header['typeflag'] == 'L') {
- if (!$this->_readLongHeader($v_header))
- return NULL;
- }
-
- if ($v_header['filename'] == $p_filename) {
- if ($v_header['typeflag'] == "5") {
- $this->_error('Unable to extract in string a directory '
- .'entry {'.$v_header['filename'].'}');
- return NULL;
- } else {
- $n = floor($v_header['size']/512);
- for ($i=0; $i<$n; $i++) {
- $v_result_str .= $this->_readBlock();
- }
- if (($v_header['size'] % 512) != 0) {
- $v_content = $this->_readBlock();
- $v_result_str .= substr($v_content, 0,
- ($v_header['size'] % 512));
- }
- return $v_result_str;
- }
- } else {
- $this->_jumpBlock(ceil(($v_header['size']/512)));
- }
- }
-
- return NULL;
- }
- // }}}
+ while (strlen($v_binary_data = $this->_readBlock()) != 0) {
+ if (!$this->_readHeader($v_binary_data, $v_header)) {
+ return null;
+ }
- // {{{ _extractList()
- function _extractList($p_path, &$p_list_detail, $p_mode,
- $p_file_list, $p_remove_path)
- {
- $v_result=true;
- $v_nb = 0;
- $v_extract_all = true;
- $v_listing = false;
-
- $p_path = $this->_translateWinPath($p_path, false);
- if ($p_path == '' || (substr($p_path, 0, 1) != '/'
- && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
- $p_path = "./".$p_path;
- }
- $p_remove_path = $this->_translateWinPath($p_remove_path);
-
- // ----- Look for path to remove format (should end by /)
- if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
- $p_remove_path .= '/';
- $p_remove_path_size = strlen($p_remove_path);
-
- switch ($p_mode) {
- case "complete" :
- $v_extract_all = TRUE;
- $v_listing = FALSE;
- break;
- case "partial" :
- $v_extract_all = FALSE;
- $v_listing = FALSE;
- break;
- case "list" :
- $v_extract_all = FALSE;
- $v_listing = TRUE;
- break;
- default :
- $this->_error('Invalid extract mode ('.$p_mode.')');
- return false;
+ if ($v_header['filename'] == '') {
+ continue;
+ }
+
+ // ----- Look for long filename
+ if ($v_header['typeflag'] == 'L') {
+ if (!$this->_readLongHeader($v_header)) {
+ return null;
+ }
+ }
+
+ if ($v_header['filename'] == $p_filename) {
+ if ($v_header['typeflag'] == "5") {
+ $this->_error(
+ 'Unable to extract in string a directory '
+ . 'entry {' . $v_header['filename'] . '}'
+ );
+ return null;
+ } else {
+ $n = floor($v_header['size'] / 512);
+ for ($i = 0; $i < $n; $i++) {
+ $v_result_str .= $this->_readBlock();
+ }
+ if (($v_header['size'] % 512) != 0) {
+ $v_content = $this->_readBlock();
+ $v_result_str .= substr(
+ $v_content,
+ 0,
+ ($v_header['size'] % 512)
+ );
+ }
+ return $v_result_str;
+ }
+ } else {
+ $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+ }
+ }
+
+ return null;
}
- clearstatcache();
+ /**
+ * @param string $p_path
+ * @param string $p_list_detail
+ * @param string $p_mode
+ * @param string $p_file_list
+ * @param string $p_remove_path
+ * @param bool $p_preserve
+ * @return bool
+ */
+ public function _extractList(
+ $p_path,
+ &$p_list_detail,
+ $p_mode,
+ $p_file_list,
+ $p_remove_path,
+ $p_preserve = false
+ ) {
+ $v_result = true;
+ $v_nb = 0;
+ $v_extract_all = true;
+ $v_listing = false;
+
+ $p_path = $this->_translateWinPath($p_path, false);
+ if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+ && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))
+ ) {
+ $p_path = "./" . $p_path;
+ }
+ $p_remove_path = $this->_translateWinPath($p_remove_path);
+
+ // ----- Look for path to remove format (should end by /)
+ if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
+ $p_remove_path .= '/';
+ }
+ $p_remove_path_size = strlen($p_remove_path);
- while (strlen($v_binary_data = $this->_readBlock()) != 0)
- {
- $v_extract_file = FALSE;
- $v_extraction_stopped = 0;
+ switch ($p_mode) {
+ case "complete" :
+ $v_extract_all = true;
+ $v_listing = false;
+ break;
+ case "partial" :
+ $v_extract_all = false;
+ $v_listing = false;
+ break;
+ case "list" :
+ $v_extract_all = false;
+ $v_listing = true;
+ break;
+ default :
+ $this->_error('Invalid extract mode (' . $p_mode . ')');
+ return false;
+ }
- if (!$this->_readHeader($v_binary_data, $v_header))
- return false;
+ clearstatcache();
- if ($v_header['filename'] == '') {
- continue;
- }
-
- // ----- Look for long filename
- if ($v_header['typeflag'] == 'L') {
- if (!$this->_readLongHeader($v_header))
- return false;
- }
-
- if ((!$v_extract_all) && (is_array($p_file_list))) {
- // ----- By default no unzip if the file is not found
- $v_extract_file = false;
-
- for ($i=0; $i strlen($p_file_list[$i]))
- && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
- == $p_file_list[$i])) {
- $v_extract_file = TRUE;
- break;
+ while (strlen($v_binary_data = $this->_readBlock()) != 0) {
+ $v_extract_file = false;
+ $v_extraction_stopped = 0;
+
+ if (!$this->_readHeader($v_binary_data, $v_header)) {
+ return false;
+ }
+
+ if ($v_header['filename'] == '') {
+ continue;
}
- }
-
- // ----- It is a file, so compare the file names
- elseif ($p_file_list[$i] == $v_header['filename']) {
- $v_extract_file = TRUE;
- break;
- }
- }
- } else {
- $v_extract_file = TRUE;
- }
-
- // ----- Look if this file need to be extracted
- if (($v_extract_file) && (!$v_listing))
- {
- if (($p_remove_path != '')
- && (substr($v_header['filename'], 0, $p_remove_path_size)
- == $p_remove_path))
- $v_header['filename'] = substr($v_header['filename'],
- $p_remove_path_size);
- if (($p_path != './') && ($p_path != '/')) {
- while (substr($p_path, -1) == '/')
- $p_path = substr($p_path, 0, strlen($p_path)-1);
-
- if (substr($v_header['filename'], 0, 1) == '/')
- $v_header['filename'] = $p_path.$v_header['filename'];
- else
- $v_header['filename'] = $p_path.'/'.$v_header['filename'];
- }
- if (file_exists($v_header['filename'])) {
- if ( (@is_dir($v_header['filename']))
- && ($v_header['typeflag'] == '')) {
- $this->_error('File '.$v_header['filename']
- .' already exists as a directory');
- return false;
- }
- if ( ($this->_isArchive($v_header['filename']))
- && ($v_header['typeflag'] == "5")) {
- $this->_error('Directory '.$v_header['filename']
- .' already exists as a file');
- return false;
- }
- if (!is_writeable($v_header['filename'])) {
- $this->_error('File '.$v_header['filename']
- .' already exists and is write protected');
- return false;
- }
- if (filemtime($v_header['filename']) > $v_header['mtime']) {
- // To be completed : An error or silent no replace ?
- }
- }
-
- // ----- Check the directory availability and create it if necessary
- elseif (($v_result
- = $this->_dirCheck(($v_header['typeflag'] == "5"
- ?$v_header['filename']
- :dirname($v_header['filename'])))) != 1) {
- $this->_error('Unable to create path for '.$v_header['filename']);
- return false;
- }
- if ($v_extract_file) {
- if ($v_header['typeflag'] == "5") {
- if (!@file_exists($v_header['filename'])) {
- // Drupal integration.
- // Changed the code to use drupal_mkdir() instead of mkdir().
- if (!@drupal_mkdir($v_header['filename'], 0777)) {
- $this->_error('Unable to create directory {'
- .$v_header['filename'].'}');
+ // ----- Look for long filename
+ if ($v_header['typeflag'] == 'L') {
+ if (!$this->_readLongHeader($v_header)) {
return false;
}
}
- } elseif ($v_header['typeflag'] == "2") {
- if (@file_exists($v_header['filename'])) {
- @drupal_unlink($v_header['filename']);
- }
- if (!@symlink($v_header['link'], $v_header['filename'])) {
- $this->_error('Unable to extract symbolic link {'
- .$v_header['filename'].'}');
- return false;
- }
- } else {
- if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
- $this->_error('Error while opening {'.$v_header['filename']
- .'} in write binary mode');
- return false;
- } else {
- $n = floor($v_header['size']/512);
- for ($i=0; $i<$n; $i++) {
- $v_content = $this->_readBlock();
- fwrite($v_dest_file, $v_content, 512);
- }
- if (($v_header['size'] % 512) != 0) {
- $v_content = $this->_readBlock();
- fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
- }
- @fclose($v_dest_file);
+ // ignore extended / pax headers
+ if ($v_header['typeflag'] == 'x' || $v_header['typeflag'] == 'g') {
+ $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+ continue;
+ }
- // ----- Change the file mode, mtime
- @touch($v_header['filename'], $v_header['mtime']);
- if ($v_header['mode'] & 0111) {
- // make file executable, obey umask
- $mode = fileperms($v_header['filename']) | (~umask() & 0111);
- @chmod($v_header['filename'], $mode);
+ if ((!$v_extract_all) && (is_array($p_file_list))) {
+ // ----- By default no unzip if the file is not found
+ $v_extract_file = false;
+
+ for ($i = 0; $i < sizeof($p_file_list); $i++) {
+ // ----- Look if it is a directory
+ if (substr($p_file_list[$i], -1) == '/') {
+ // ----- Look if the directory is in the filename path
+ if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+ && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+ == $p_file_list[$i])
+ ) {
+ $v_extract_file = true;
+ break;
+ }
+ } // ----- It is a file, so compare the file names
+ elseif ($p_file_list[$i] == $v_header['filename']) {
+ $v_extract_file = true;
+ break;
+ }
+ }
+ } else {
+ $v_extract_file = true;
}
- }
-
- // ----- Check the file size
- clearstatcache();
- if (filesize($v_header['filename']) != $v_header['size']) {
- $this->_error('Extracted file '.$v_header['filename']
- .' does not have the correct file size \''
- .filesize($v_header['filename'])
- .'\' ('.$v_header['size']
- .' expected). Archive may be corrupted.');
- return false;
- }
- }
- } else {
- $this->_jumpBlock(ceil(($v_header['size']/512)));
- }
- } else {
- $this->_jumpBlock(ceil(($v_header['size']/512)));
- }
- /* TBC : Seems to be unused ...
- if ($this->_compress)
- $v_end_of_file = @gzeof($this->_file);
- else
- $v_end_of_file = @feof($this->_file);
- */
+ // ----- Look if this file need to be extracted
+ if (($v_extract_file) && (!$v_listing)) {
+ if (($p_remove_path != '')
+ && (substr($v_header['filename'] . '/', 0, $p_remove_path_size)
+ == $p_remove_path)
+ ) {
+ $v_header['filename'] = substr(
+ $v_header['filename'],
+ $p_remove_path_size
+ );
+ if ($v_header['filename'] == '') {
+ continue;
+ }
+ }
+ if (($p_path != './') && ($p_path != '/')) {
+ while (substr($p_path, -1) == '/') {
+ $p_path = substr($p_path, 0, strlen($p_path) - 1);
+ }
- if ($v_listing || $v_extract_file || $v_extraction_stopped) {
- // ----- Log extracted files
- if (($v_file_dir = dirname($v_header['filename']))
- == $v_header['filename'])
- $v_file_dir = '';
- if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
- $v_file_dir = '/';
+ if (substr($v_header['filename'], 0, 1) == '/') {
+ $v_header['filename'] = $p_path . $v_header['filename'];
+ } else {
+ $v_header['filename'] = $p_path . '/' . $v_header['filename'];
+ }
+ }
+ if (file_exists($v_header['filename'])) {
+ if ((@is_dir($v_header['filename']))
+ && ($v_header['typeflag'] == '')
+ ) {
+ $this->_error(
+ 'File ' . $v_header['filename']
+ . ' already exists as a directory'
+ );
+ return false;
+ }
+ if (($this->_isArchive($v_header['filename']))
+ && ($v_header['typeflag'] == "5")
+ ) {
+ $this->_error(
+ 'Directory ' . $v_header['filename']
+ . ' already exists as a file'
+ );
+ return false;
+ }
+ if (!is_writeable($v_header['filename'])) {
+ $this->_error(
+ 'File ' . $v_header['filename']
+ . ' already exists and is write protected'
+ );
+ return false;
+ }
+ if (filemtime($v_header['filename']) > $v_header['mtime']) {
+ // To be completed : An error or silent no replace ?
+ }
+ } // ----- Check the directory availability and create it if necessary
+ elseif (($v_result
+ = $this->_dirCheck(
+ ($v_header['typeflag'] == "5"
+ ? $v_header['filename']
+ : dirname($v_header['filename']))
+ )) != 1
+ ) {
+ $this->_error('Unable to create path for ' . $v_header['filename']);
+ return false;
+ }
- $p_list_detail[$v_nb++] = $v_header;
- if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
- return true;
+ if ($v_extract_file) {
+ if ($v_header['typeflag'] == "5") {
+ if (!@file_exists($v_header['filename'])) {
+ if (!@mkdir($v_header['filename'], 0777)) {
+ $this->_error(
+ 'Unable to create directory {'
+ . $v_header['filename'] . '}'
+ );
+ return false;
+ }
+ }
+ } elseif ($v_header['typeflag'] == "2") {
+ if (@file_exists($v_header['filename'])) {
+ @drupal_unlink($v_header['filename']);
+ }
+ if (!@symlink($v_header['link'], $v_header['filename'])) {
+ $this->_error(
+ 'Unable to extract symbolic link {'
+ . $v_header['filename'] . '}'
+ );
+ return false;
+ }
+ } else {
+ if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+ $this->_error(
+ 'Error while opening {' . $v_header['filename']
+ . '} in write binary mode'
+ );
+ return false;
+ } else {
+ $n = floor($v_header['size'] / 512);
+ for ($i = 0; $i < $n; $i++) {
+ $v_content = $this->_readBlock();
+ fwrite($v_dest_file, $v_content, 512);
+ }
+ if (($v_header['size'] % 512) != 0) {
+ $v_content = $this->_readBlock();
+ fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+ }
+
+ @fclose($v_dest_file);
+
+ if ($p_preserve) {
+ @chown($v_header['filename'], $v_header['uid']);
+ @chgrp($v_header['filename'], $v_header['gid']);
+ }
+
+ // ----- Change the file mode, mtime
+ @touch($v_header['filename'], $v_header['mtime']);
+ if ($v_header['mode'] & 0111) {
+ // make file executable, obey umask
+ $mode = fileperms($v_header['filename']) | (~umask() & 0111);
+ @chmod($v_header['filename'], $mode);
+ }
+ }
+
+ // ----- Check the file size
+ clearstatcache();
+ if (!is_file($v_header['filename'])) {
+ $this->_error(
+ 'Extracted file ' . $v_header['filename']
+ . 'does not exist. Archive may be corrupted.'
+ );
+ return false;
+ }
+
+ $filesize = filesize($v_header['filename']);
+ if ($filesize != $v_header['size']) {
+ $this->_error(
+ 'Extracted file ' . $v_header['filename']
+ . ' does not have the correct file size \''
+ . $filesize
+ . '\' (' . $v_header['size']
+ . ' expected). Archive may be corrupted.'
+ );
+ return false;
+ }
+ }
+ } else {
+ $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+ }
+ } else {
+ $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+ }
+
+ /* TBC : Seems to be unused ...
+ if ($this->_compress)
+ $v_end_of_file = @gzeof($this->_file);
+ else
+ $v_end_of_file = @feof($this->_file);
+ */
+
+ if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+ // ----- Log extracted files
+ if (($v_file_dir = dirname($v_header['filename']))
+ == $v_header['filename']
+ ) {
+ $v_file_dir = '';
+ }
+ if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == '')) {
+ $v_file_dir = '/';
+ }
+
+ $p_list_detail[$v_nb++] = $v_header;
+ if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
+ return true;
+ }
+ }
}
- }
- }
return true;
}
- // }}}
- // {{{ _openAppend()
- function _openAppend()
+ /**
+ * @return bool
+ */
+ public function _openAppend()
{
- if (filesize($this->_tarname) == 0)
- return $this->_openWrite();
+ if (filesize($this->_tarname) == 0) {
+ return $this->_openWrite();
+ }
if ($this->_compress) {
$this->_close();
- if (!@rename($this->_tarname, $this->_tarname.".tmp")) {
- $this->_error('Error while renaming \''.$this->_tarname
- .'\' to temporary file \''.$this->_tarname
- .'.tmp\'');
+ if (!@rename($this->_tarname, $this->_tarname . ".tmp")) {
+ $this->_error(
+ 'Error while renaming \'' . $this->_tarname
+ . '\' to temporary file \'' . $this->_tarname
+ . '.tmp\''
+ );
return false;
}
- if ($this->_compress_type == 'gz')
- $v_temp_tar = @gzopen($this->_tarname.".tmp", "rb");
- elseif ($this->_compress_type == 'bz2')
- $v_temp_tar = @bzopen($this->_tarname.".tmp", "r");
+ if ($this->_compress_type == 'gz') {
+ $v_temp_tar = @gzopen($this->_tarname . ".tmp", "rb");
+ } elseif ($this->_compress_type == 'bz2') {
+ $v_temp_tar = @bzopen($this->_tarname . ".tmp", "r");
+ } elseif ($this->_compress_type == 'lzma2') {
+ $v_temp_tar = @xzopen($this->_tarname . ".tmp", "r");
+ }
+
if ($v_temp_tar == 0) {
- $this->_error('Unable to open file \''.$this->_tarname
- .'.tmp\' in binary read mode');
- @rename($this->_tarname.".tmp", $this->_tarname);
+ $this->_error(
+ 'Unable to open file \'' . $this->_tarname
+ . '.tmp\' in binary read mode'
+ );
+ @rename($this->_tarname . ".tmp", $this->_tarname);
return false;
}
if (!$this->_openWrite()) {
- @rename($this->_tarname.".tmp", $this->_tarname);
+ @rename($this->_tarname . ".tmp", $this->_tarname);
return false;
}
if ($this->_compress_type == 'gz') {
+ $end_blocks = 0;
+
while (!@gzeof($v_temp_tar)) {
$v_buffer = @gzread($v_temp_tar, 512);
- if ($v_buffer == ARCHIVE_TAR_END_BLOCK) {
+ if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+ $end_blocks++;
// do not copy end blocks, we will re-make them
// after appending
continue;
+ } elseif ($end_blocks > 0) {
+ for ($i = 0; $i < $end_blocks; $i++) {
+ $this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+ }
+ $end_blocks = 0;
}
$v_binary_data = pack("a512", $v_buffer);
$this->_writeBlock($v_binary_data);
}
@gzclose($v_temp_tar);
- }
- elseif ($this->_compress_type == 'bz2') {
+ } elseif ($this->_compress_type == 'bz2') {
+ $end_blocks = 0;
+
while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) {
- if ($v_buffer == ARCHIVE_TAR_END_BLOCK) {
+ if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+ $end_blocks++;
+ // do not copy end blocks, we will re-make them
+ // after appending
continue;
+ } elseif ($end_blocks > 0) {
+ for ($i = 0; $i < $end_blocks; $i++) {
+ $this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+ }
+ $end_blocks = 0;
}
$v_binary_data = pack("a512", $v_buffer);
$this->_writeBlock($v_binary_data);
}
@bzclose($v_temp_tar);
- }
+ } elseif ($this->_compress_type == 'lzma2') {
+ $end_blocks = 0;
+
+ while (strlen($v_buffer = @xzread($v_temp_tar, 512)) > 0) {
+ if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+ $end_blocks++;
+ // do not copy end blocks, we will re-make them
+ // after appending
+ continue;
+ } elseif ($end_blocks > 0) {
+ for ($i = 0; $i < $end_blocks; $i++) {
+ $this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+ }
+ $end_blocks = 0;
+ }
+ $v_binary_data = pack("a512", $v_buffer);
+ $this->_writeBlock($v_binary_data);
+ }
- if (!@drupal_unlink($this->_tarname.".tmp")) {
- $this->_error('Error while deleting temporary file \''
- .$this->_tarname.'.tmp\'');
+ @xzclose($v_temp_tar);
}
+ if (!@drupal_unlink($this->_tarname . ".tmp")) {
+ $this->_error(
+ 'Error while deleting temporary file \''
+ . $this->_tarname . '.tmp\''
+ );
+ }
} else {
// ----- For not compressed tar, just add files before the last
- // one or two 512 bytes block
- if (!$this->_openReadWrite())
- return false;
+ // one or two 512 bytes block
+ if (!$this->_openReadWrite()) {
+ return false;
+ }
clearstatcache();
$v_size = filesize($this->_tarname);
@@ -1760,32 +2324,34 @@ class Archive_Tar // extends PEAR
fseek($this->_file, $v_size - 1024);
if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
fseek($this->_file, $v_size - 1024);
- }
- elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
+ } elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
fseek($this->_file, $v_size - 512);
}
}
return true;
}
- // }}}
- // {{{ _append()
- function _append($p_filelist, $p_add_dir='', $p_remove_dir='')
+ /**
+ * @param $p_filelist
+ * @param string $p_add_dir
+ * @param string $p_remove_dir
+ * @return bool
+ */
+ public function _append($p_filelist, $p_add_dir = '', $p_remove_dir = '')
{
- if (!$this->_openAppend())
+ if (!$this->_openAppend()) {
return false;
+ }
- if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir))
- $this->_writeFooter();
+ if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir)) {
+ $this->_writeFooter();
+ }
$this->_close();
return true;
}
- // }}}
-
- // {{{ _dirCheck()
/**
* Check if a directory exists and create it (including parent
@@ -1793,24 +2359,25 @@ class Archive_Tar // extends PEAR
*
* @param string $p_dir directory to check
*
- * @return bool TRUE if the directory exists or was created
+ * @return bool true if the directory exists or was created
*/
- function _dirCheck($p_dir)
+ public function _dirCheck($p_dir)
{
clearstatcache();
- if ((@is_dir($p_dir)) || ($p_dir == ''))
+ if ((@is_dir($p_dir)) || ($p_dir == '')) {
return true;
+ }
$p_parent_dir = dirname($p_dir);
if (($p_parent_dir != $p_dir) &&
($p_parent_dir != '') &&
- (!$this->_dirCheck($p_parent_dir)))
- return false;
+ (!$this->_dirCheck($p_parent_dir))
+ ) {
+ return false;
+ }
- // Drupal integration.
- // Changed the code to use drupal_mkdir() instead of mkdir().
- if (!@drupal_mkdir($p_dir, 0777)) {
+ if (!@mkdir($p_dir, 0777)) {
$this->_error("Unable to create directory '$p_dir'");
return false;
}
@@ -1818,10 +2385,6 @@ class Archive_Tar // extends PEAR
return true;
}
- // }}}
-
- // {{{ _pathReduction()
-
/**
* Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
* rand emove double slashes.
@@ -1829,11 +2392,8 @@ class Archive_Tar // extends PEAR
* @param string $p_dir path to reduce
*
* @return string reduced path
- *
- * @access private
- *
*/
- function _pathReduction($p_dir)
+ private function _pathReduction($p_dir)
{
$v_result = '';
@@ -1843,50 +2403,57 @@ class Archive_Tar // extends PEAR
$v_list = explode('/', $p_dir);
// ----- Study directories from last to first
- for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+ for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
// ----- Look for current path
if ($v_list[$i] == ".") {
// ----- Ignore this directory
// Should be the first $i=0, but no check is done
- }
- else if ($v_list[$i] == "..") {
- // ----- Ignore it and ignore the $i-1
- $i--;
- }
- else if ( ($v_list[$i] == '')
- && ($i!=(sizeof($v_list)-1))
- && ($i!=0)) {
- // ----- Ignore only the double '//' in path,
- // but not the first and last /
} else {
- $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?'/'
- .$v_result:'');
+ if ($v_list[$i] == "..") {
+ // ----- Ignore it and ignore the $i-1
+ $i--;
+ } else {
+ if (($v_list[$i] == '')
+ && ($i != (sizeof($v_list) - 1))
+ && ($i != 0)
+ ) {
+ // ----- Ignore only the double '//' in path,
+ // but not the first and last /
+ } else {
+ $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/'
+ . $v_result : '');
+ }
+ }
}
}
}
- $v_result = strtr($v_result, '\\', '/');
+
+ if (defined('OS_WINDOWS') && OS_WINDOWS) {
+ $v_result = strtr($v_result, '\\', '/');
+ }
+
return $v_result;
}
- // }}}
-
- // {{{ _translateWinPath()
- function _translateWinPath($p_path, $p_remove_disk_letter=true)
+ /**
+ * @param $p_path
+ * @param bool $p_remove_disk_letter
+ * @return string
+ */
+ public function _translateWinPath($p_path, $p_remove_disk_letter = true)
{
- if (defined('OS_WINDOWS') && OS_WINDOWS) {
- // ----- Look for potential disk letter
- if ( ($p_remove_disk_letter)
- && (($v_position = strpos($p_path, ':')) != false)) {
- $p_path = substr($p_path, $v_position+1);
- }
- // ----- Change potential windows directory separator
- if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
- $p_path = strtr($p_path, '\\', '/');
- }
- }
- return $p_path;
+ if (defined('OS_WINDOWS') && OS_WINDOWS) {
+ // ----- Look for potential disk letter
+ if (($p_remove_disk_letter)
+ && (($v_position = strpos($p_path, ':')) != false)
+ ) {
+ $p_path = substr($p_path, $v_position + 1);
+ }
+ // ----- Change potential windows directory separator
+ if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+ $p_path = strtr($p_path, '\\', '/');
+ }
+ }
+ return $p_path;
}
- // }}}
-
}
-?>
diff --git a/modules/system/system.test b/modules/system/system.test
index d4c98f0a..9eaf562b 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -389,6 +389,18 @@ class ModuleDependencyTestCase extends ModuleTestCase {
);
}
+ /**
+ * Checks functionality of project namespaces for dependencies.
+ */
+ function testProjectNamespaceForDependencies() {
+ // Enable module with project namespace to ensure nothing breaks.
+ $edit = array(
+ 'modules[Testing][system_project_namespace_test][enable]' => TRUE,
+ );
+ $this->drupalPost('admin/modules', $edit, t('Save configuration'));
+ $this->assertModules(array('system_project_namespace_test'), TRUE);
+ }
+
/**
* Attempt to enable translation module without locale enabled.
*/
@@ -714,7 +726,7 @@ class IPAddressBlockingTestCase extends DrupalWebTestCase {
// Block a valid IP address.
$edit = array();
- $edit['ip'] = '192.168.1.1';
+ $edit['ip'] = '1.2.3.3';
$this->drupalPost('admin/config/people/ip-blocking', $edit, t('Add'));
$ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
$this->assertTrue($ip, t('IP address found in database.'));
@@ -722,7 +734,7 @@ class IPAddressBlockingTestCase extends DrupalWebTestCase {
// Try to block an IP address that's already blocked.
$edit = array();
- $edit['ip'] = '192.168.1.1';
+ $edit['ip'] = '1.2.3.3';
$this->drupalPost('admin/config/people/ip-blocking', $edit, t('Add'));
$this->assertText(t('This IP address is already blocked.'));
@@ -758,6 +770,25 @@ class IPAddressBlockingTestCase extends DrupalWebTestCase {
// $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
// $this->assertText(t('You may not block your own IP address.'));
}
+
+ /**
+ * Test duplicate IP addresses are not present in the 'blocked_ips' table.
+ */
+ function testDuplicateIpAddress() {
+ drupal_static_reset('ip_address');
+ $submit_ip = $_SERVER['REMOTE_ADDR'] = '192.168.1.1';
+ system_block_ip_action();
+ system_block_ip_action();
+ $ip_count = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $submit_ip))->rowCount();
+ $this->assertEqual('1', $ip_count);
+ drupal_static_reset('ip_address');
+ $submit_ip = $_SERVER['REMOTE_ADDR'] = ' ';
+ system_block_ip_action();
+ system_block_ip_action();
+ system_block_ip_action();
+ $ip_count = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $submit_ip))->rowCount();
+ $this->assertEqual('1', $ip_count);
+ }
}
class CronRunTestCase extends DrupalWebTestCase {
@@ -893,6 +924,29 @@ class CronRunTestCase extends DrupalWebTestCase {
$result = variable_get('common_test_cron');
$this->assertEqual($result, 'success', 'Cron correctly handles exceptions thrown during hook_cron() invocations.');
}
+
+ /**
+ * Tests that hook_flush_caches() is not invoked on every single cron run.
+ *
+ * @see system_cron()
+ */
+ public function testCronCacheExpiration() {
+ module_enable(array('system_cron_test'));
+ variable_del('system_cron_test_flush_caches');
+
+ // Invoke cron the first time: hook_flush_caches() should be called and then
+ // get cached.
+ drupal_cron_run();
+ $this->assertEqual(variable_get('system_cron_test_flush_caches'), 1, 'hook_flush_caches() was invoked the first time.');
+ $cache = cache_get('system_cache_tables');
+ $this->assertEqual(empty($cache), FALSE, 'Cache is filled with cache table data.');
+
+ // Run cron again and ensure that hook_flush_caches() is not called.
+ variable_del('system_cron_test_flush_caches');
+ drupal_cron_run();
+ $this->assertNull(variable_get('system_cron_test_flush_caches'), 'hook_flush_caches() was not invoked the second time.');
+ }
+
}
/**
@@ -911,7 +965,7 @@ class CronQueueTestCase extends DrupalWebTestCase {
}
function setUp() {
- parent::setUp(array('common_test', 'common_test_cron_helper'));
+ parent::setUp(array('common_test', 'common_test_cron_helper', 'cron_queue_test'));
}
/**
@@ -931,6 +985,23 @@ class CronQueueTestCase extends DrupalWebTestCase {
$this->assertEqual($queue->numberOfItems(), 1, 'Failing item still in the queue after throwing an exception.');
}
+ /**
+ * Tests worker defined as a class method callable.
+ */
+ function testCallable() {
+ $queue = DrupalQueue::get('cron_queue_test_callback');
+
+ // Enqueue an item for processing.
+ $queue->createItem(array($this->randomName() => $this->randomName()));
+
+ // Run cron; the worker should perform the task and delete the item from the
+ // queue.
+ $this->cronRun();
+
+ // The queue should be empty.
+ $this->assertEqual($queue->numberOfItems(), 0);
+ }
+
}
class AdminMetaTagTestCase extends DrupalWebTestCase {
@@ -1298,7 +1369,23 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
$this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.');
$this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.');
+ // Check that ajax callback is protected by CSRF token.
+ $this->drupalGet('admin/config/regional/date-time/formats/lookup', array('query' => array('format' => 'Y m d')));
+ $this->assertResponse(403, 'Access denied with no token');
+ $this->drupalGet('admin/config/regional/date-time/formats/lookup', array('query' => array('token' => 'invalid', 'format' => 'Y m d')));
+ $this->assertResponse(403, 'Access denied with invalid token');
+ $this->drupalGet('admin/config/regional/date-time/formats');
+ $this->clickLink(t('edit'));
+ $settings = $this->drupalGetSettings();
+ $lookup_url = $settings['dateTime']['date-format']['lookup'];
+ preg_match('/token=([^&]+)/', $lookup_url, $matches);
+ $this->assertFalse(empty($matches[1]), 'Found token value');
+ $this->drupalGet('admin/config/regional/date-time/formats/lookup', array('query' => array('token' => $matches[1], 'format' => 'Y m d')));
+ $this->assertResponse(200, 'Access allowed with valid token');
+ $this->assertText(format_date(time(), 'custom', 'Y m d'));
+
// Delete custom date format.
+ $this->drupalGet('admin/config/regional/date-time/formats');
$this->clickLink(t('delete'));
$this->drupalPost($this->getUrl(), array(), t('Remove'));
$this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.');
@@ -1374,6 +1461,60 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
}
}
+/**
+ * Tests date format configuration.
+ */
+class DateFormatTestCase extends DrupalWebTestCase {
+ public static function getInfo() {
+ return array(
+ 'name' => 'Date format',
+ 'description' => 'Test date format configuration and defaults.',
+ 'group' => 'System',
+ );
+ }
+
+ function setUp() {
+ parent::setUp();
+
+ // Create admin user and log in admin user.
+ $this->admin_user = $this->drupalCreateUser(array('administer site configuration'));
+ $this->drupalLogin($this->admin_user);
+ }
+
+ /**
+ * Test the default date type formats are consistent.
+ */
+ function testDefaultDateFormats() {
+ // These are the default format values from format_date().
+ $default_formats = array(
+ 'short' => 'm/d/Y - H:i',
+ 'medium' => 'D, m/d/Y - H:i',
+ 'long' => 'l, F j, Y - H:i',
+ );
+
+ // Clear the date format variables.
+ variable_del('date_format_short');
+ variable_del('date_format_medium');
+ variable_del('date_format_long');
+
+ $this->drupalGet('admin/config/regional/date-time');
+
+ foreach ($default_formats as $format_name => $format_value) {
+ $id = 'edit-date-format-' . $format_name;
+ // Check that the configuration fields match the default format.
+ $this->assertOptionSelected(
+ $id,
+ $format_value,
+ format_string('The @type format type matches the expected format @format.',
+ array(
+ '@type' => $format_name,
+ '@format' => $format_value,
+ )
+ ));
+ }
+ }
+}
+
class PageTitleFiltering extends DrupalWebTestCase {
protected $content_user;
protected $saved_title;
@@ -2286,6 +2427,20 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
$this->update_user = $this->drupalCreateUser(array('administer software updates'));
}
+ /**
+ * Tests that there are no pending updates for the first test method.
+ */
+ function testNoPendingUpdates() {
+ // Ensure that for the first test method in a class, there are no pending
+ // updates. This tests a drupal_get_schema_versions() bug that previously
+ // led to the wrong schema version being recorded for the initial install
+ // of a child site during automated testing.
+ $this->drupalLogin($this->update_user);
+ $this->drupalGet($this->update_url, array('external' => TRUE));
+ $this->drupalPost(NULL, array(), t('Continue'));
+ $this->assertText(t('No pending updates.'), 'End of update process was reached.');
+ }
+
/**
* Tests access to the update script.
*/
@@ -2367,6 +2522,12 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
$this->assertText('This is a requirements error provided by the update_script_test module.');
$this->clickLink('try again');
$this->assertText('This is a requirements error provided by the update_script_test module.');
+
+ // Check if the optional 'value' key displays without a notice.
+ variable_set('update_script_test_requirement_type', REQUIREMENT_INFO);
+ $this->drupalGet($this->update_url, array('external' => TRUE));
+ $this->assertText('This is a requirements info provided by the update_script_test module.');
+ $this->assertNoText('Notice: Undefined index: value in theme_status_report()');
}
/**
diff --git a/modules/system/system.updater.inc b/modules/system/system.updater.inc
index a14d788b..2a32c4b5 100644
--- a/modules/system/system.updater.inc
+++ b/modules/system/system.updater.inc
@@ -24,7 +24,7 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface {
* found on your system, and if there was a copy in sites/all, we'd see it.
*/
public function getInstallDirectory() {
- if ($relative_path = drupal_get_path('module', $this->name)) {
+ if ($this->isInstalled() && ($relative_path = drupal_get_path('module', $this->name))) {
$relative_path = dirname($relative_path);
}
else {
@@ -34,7 +34,7 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface {
}
public function isInstalled() {
- return (bool) drupal_get_path('module', $this->name);
+ return (bool) drupal_get_filename('module', $this->name, NULL, FALSE);
}
public static function canUpdateDirectory($directory) {
@@ -109,7 +109,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
* found on your system, and if there was a copy in sites/all, we'd see it.
*/
public function getInstallDirectory() {
- if ($relative_path = drupal_get_path('theme', $this->name)) {
+ if ($this->isInstalled() && ($relative_path = drupal_get_path('theme', $this->name))) {
$relative_path = dirname($relative_path);
}
else {
@@ -119,7 +119,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
}
public function isInstalled() {
- return (bool) drupal_get_path('theme', $this->name);
+ return (bool) drupal_get_filename('theme', $this->name, NULL, FALSE);
}
static function canUpdateDirectory($directory) {
diff --git a/modules/system/tests/cron_queue_test.info b/modules/system/tests/cron_queue_test.info
index 09f8a323..ef94eeda 100644
--- a/modules/system/tests/cron_queue_test.info
+++ b/modules/system/tests/cron_queue_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/system/tests/cron_queue_test.module b/modules/system/tests/cron_queue_test.module
index e95c6b6a..0df6396a 100644
--- a/modules/system/tests/cron_queue_test.module
+++ b/modules/system/tests/cron_queue_test.module
@@ -7,9 +7,21 @@ function cron_queue_test_cron_queue_info() {
$queues['cron_queue_test_exception'] = array(
'worker callback' => 'cron_queue_test_exception',
);
+ $queues['cron_queue_test_callback'] = array(
+ 'worker callback' => array('CronQueueTestCallbackClass', 'foo'),
+ );
+
return $queues;
}
function cron_queue_test_exception($item) {
throw new Exception('That is not supposed to happen.');
}
+
+class CronQueueTestCallbackClass {
+
+ static public function foo() {
+ // Do nothing.
+ }
+
+}
diff --git a/modules/system/tests/system_cron_test.info b/modules/system/tests/system_cron_test.info
new file mode 100644
index 00000000..d9d4edd3
--- /dev/null
+++ b/modules/system/tests/system_cron_test.info
@@ -0,0 +1,11 @@
+name = System Cron Test
+description = 'Support module for testing the system_cron().'
+package = Testing
+version = VERSION
+core = 7.x
+hidden = TRUE
+
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
+project = "drupal"
+datestamp = "1539816636"
diff --git a/modules/system/tests/system_cron_test.module b/modules/system/tests/system_cron_test.module
new file mode 100644
index 00000000..9ef80e23
--- /dev/null
+++ b/modules/system/tests/system_cron_test.module
@@ -0,0 +1,15 @@
+ $bundle->type,
'settings' => array(),
'description' => 'Debris left over after upgrade from Drupal 6',
+ 'required' => FALSE,
'widget' => array(
'type' => 'taxonomy_autocomplete',
'module' => 'taxonomy',
@@ -557,7 +558,7 @@ function taxonomy_update_7005(&$sandbox) {
// of term references stored so far for the current revision, which
// provides the delta value for each term reference data insert. The
// deltas are reset for each new revision.
-
+
$conditions = array(
'type' => 'taxonomy_term_reference',
'deleted' => 0,
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index e147c1ca..981649d2 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -25,7 +25,7 @@ function taxonomy_help($path, $arg) {
$output .= '
';
+
+ _commerce_amazon_lpa_render_helper($render, array(
+ 'callbacks' => array(
+ array(
+ 'callback' => 'Drupal.AmazonLPA.PaymentButton',
+ 'param' => $variables['html_id'],
+ ),
+ ),
+ ));
+
+ return render($render);
+}
+
+/**
+ * Address book widget theme function.
+ *
+ * @param array $variables
+ * Variables array.
+ *
+ * @return string
+ * Address book widget HTML string.
+ */
+function theme_commerce_amazon_addressbook_widget($variables) {
+ $element_id = drupal_html_id($variables['html_id']);
+
+ $addressbook_size = explode('x', variable_get('commerce_amazon_lpa_addressbook_size')) + array('', '250');
+ $addressbook_width = ($addressbook_size[0]) ? $addressbook_size[0] . 'px' : '100%';
+ $attributes = array(
+ 'id' => $element_id,
+ 'style' => array(
+ 'max-width: 100%;',
+ 'width: ' . $addressbook_width . ';',
+ 'height: ' . $addressbook_size[1] . 'px;',
+ 'display: inline-block;',
+ ),
+ );
+
+ $render['#markup'] = '' . t('Use this page to create a new custom block.') . '
'; } @@ -189,6 +190,7 @@ function _block_themes_access($theme) { * @param $theme * The theme whose blocks are being configured. If not set, the default theme * is assumed. + * * @return * The theme that should be used for the block configuration page, or NULL * to indicate that the default theme should be used. @@ -283,8 +285,7 @@ function block_page_build(&$page) { // Append region description if we are rendering the regions demo page. $item = menu_get_item(); if ($item['path'] == 'admin/structure/block/demo/' . $theme) { - $visible_regions = array_keys(system_region_list($theme, REGIONS_VISIBLE)); - foreach ($visible_regions as $region) { + foreach (system_region_list($theme, REGIONS_VISIBLE, FALSE) as $region) { $description = '' . $all_regions[$region] . '
';
$page[$region]['block_description'] = array(
'#markup' => $description,
@@ -343,14 +344,17 @@ function _block_get_renderable_array($list = array()) {
// to perform contextual actions on the help block, and the links needlessly
// draw attention on it.
if ($key != 'system_main' && $key != 'system_help') {
- $build[$key]['#contextual_links']['block'] = array('admin/structure/block/manage', array($block->module, $block->delta));
+ $build[$key]['#contextual_links']['block'] = array(
+ 'admin/structure/block/manage',
+ array($block->module, $block->delta),
+ );
}
$build[$key] += array(
'#block' => $block,
'#weight' => ++$weight,
);
- $build[$key]['#theme_wrappers'][] ='block';
+ $build[$key]['#theme_wrappers'][] = 'block';
}
$build['#sorted'] = TRUE;
return $build;
@@ -386,18 +390,20 @@ function _block_rehash($theme = NULL) {
// Gather the blocks defined by modules.
foreach (module_implements('block_info') as $module) {
$module_blocks = module_invoke($module, 'block_info');
+ $delta_list = array();
foreach ($module_blocks as $delta => $block) {
// Compile a condition to retrieve this block from the database.
- $condition = db_and()
- ->condition('module', $module)
- ->condition('delta', $delta);
- $or->condition($condition);
// Add identifiers.
+ $delta_list[] = $delta;
$block['module'] = $module;
- $block['delta'] = $delta;
- $block['theme'] = $theme;
+ $block['delta'] = $delta;
+ $block['theme'] = $theme;
$current_blocks[$module][$delta] = $block;
}
+ if (!empty($delta_list)) {
+ $condition = db_and()->condition('module', $module)->condition('delta', $delta_list);
+ $or->condition($condition);
+ }
}
// Save the blocks defined in code for alter context.
$code_blocks = $current_blocks;
@@ -426,23 +432,20 @@ function _block_rehash($theme = NULL) {
drupal_alter('block_info', $current_blocks, $theme, $code_blocks);
foreach ($current_blocks as $module => $module_blocks) {
foreach ($module_blocks as $delta => $block) {
- if (!isset($block['pages'])) {
- // {block}.pages is type 'text', so it cannot have a
- // default value, and not null, so we need to provide
- // value if the module did not.
- $block['pages'] = '';
- }
- // Make sure weight is set.
- if (!isset($block['weight'])) {
- $block['weight'] = 0;
- }
+ // Make sure certain attributes are set.
+ $block += array(
+ 'pages' => '',
+ 'weight' => 0,
+ 'status' => 0,
+ );
+ // Check for active blocks in regions that are not available.
if (!empty($block['region']) && $block['region'] != BLOCK_REGION_NONE && !isset($regions[$block['region']]) && $block['status'] == 1) {
drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block['info'], '%region' => $block['region'])), 'warning');
// Disabled modules are moved into the BLOCK_REGION_NONE later so no
// need to move the block to another region.
$block['status'] = 0;
}
- // Set region to none if not enabled and make sure status is set.
+ // Set region to none if not enabled.
if (empty($block['status'])) {
$block['status'] = 0;
$block['region'] = BLOCK_REGION_NONE;
@@ -644,7 +647,8 @@ function block_theme_initialize($theme) {
$regions = system_region_list($theme, REGIONS_VISIBLE);
$result = db_query("SELECT * FROM {block} WHERE theme = :theme", array(':theme' => $default_theme), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $block) {
- // If the region isn't supported by the theme, assign the block to the theme's default region.
+ // If the region isn't supported by the theme, assign the block to the
+ // theme's default region.
if ($block['status'] && !isset($regions[$block['region']])) {
$block['region'] = system_default_region($theme);
}
@@ -812,17 +816,18 @@ function block_block_list_alter(&$blocks) {
// with different case. Ex: /Page, /page, /PAGE.
$pages = drupal_strtolower($block->pages);
if ($block->visibility < BLOCK_VISIBILITY_PHP) {
- // Convert the Drupal path to lowercase
+ // Convert the Drupal path to lowercase.
$path = drupal_strtolower(drupal_get_path_alias($_GET['q']));
// Compare the lowercase internal and lowercase path alias (if any).
$page_match = drupal_match_path($path, $pages);
if ($path != $_GET['q']) {
$page_match = $page_match || drupal_match_path($_GET['q'], $pages);
}
- // When $block->visibility has a value of 0 (BLOCK_VISIBILITY_NOTLISTED),
- // the block is displayed on all pages except those listed in $block->pages.
- // When set to 1 (BLOCK_VISIBILITY_LISTED), it is displayed only on those
- // pages listed in $block->pages.
+ // When $block->visibility has a value of 0
+ // (BLOCK_VISIBILITY_NOTLISTED), the block is displayed on all pages
+ // except those listed in $block->pages. When set to 1
+ // (BLOCK_VISIBILITY_LISTED), it is displayed only on those pages
+ // listed in $block->pages.
$page_match = !($block->visibility xor $page_match);
}
elseif (module_exists('php')) {
@@ -845,7 +850,8 @@ function block_block_list_alter(&$blocks) {
* Render the content and subject for a set of blocks.
*
* @param $region_blocks
- * An array of block objects such as returned for one region by _block_load_blocks().
+ * An array of block objects such as returned for one region by
+ * _block_load_blocks().
*
* @return
* An array of visible blocks as expected by drupal_render().
@@ -953,6 +959,8 @@ function _block_render_blocks($region_blocks) {
* Theme and language contexts are automatically differentiated.
*
* @param $block
+ * The block to get the cache_id from.
+ *
* @return
* The string used as cache_id for the block.
*/
@@ -967,6 +975,7 @@ function _block_get_cache_id($block) {
// Start with common sub-patterns: block identification, theme, language.
$cid_parts[] = $block->module;
$cid_parts[] = $block->delta;
+ drupal_alter('block_cid_parts', $cid_parts, $block);
$cid_parts = array_merge($cid_parts, drupal_render_cid_parts($block->cache));
return implode(':', $cid_parts);
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index 59a1c5b8..f62fdd7e 100644
--- a/modules/block/tests/block_test.info
+++ b/modules/block/tests/block_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info
index 0dc755e5..4ce61da1 100644
--- a/modules/block/tests/themes/block_test_theme/block_test_theme.info
+++ b/modules/block/tests/themes/block_test_theme/block_test_theme.info
@@ -13,8 +13,7 @@ regions[footer] = Footer
regions[highlighted] = Highlighted
regions[help] = Help
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index c876ba60..ea026380 100644
--- a/modules/blog/blog.info
+++ b/modules/blog/blog.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = blog.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 11e3ab95..d7b882f4 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -152,7 +152,7 @@ function blog_menu_local_tasks_alter(&$data, $router_item, $root_path) {
}
}
// Provide a helper action link to the author on the 'blog/%' page.
- elseif ($root_path == 'blog/%' && $router_item['page_arguments'][0]->uid == $user->uid) {
+ elseif ($root_path == 'blog/%' && isset($router_item['page_arguments'][0]->uid) && $router_item['page_arguments'][0]->uid == $user->uid) {
$data['actions']['output']['blog'] = array(
'#theme' => 'menu_local_action',
);
diff --git a/modules/book/book.info b/modules/book/book.info
index fd33b32b..98aca934 100644
--- a/modules/book/book.info
+++ b/modules/book/book.info
@@ -7,8 +7,7 @@ files[] = book.test
configure = admin/content/book/settings
stylesheets[all][] = book.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/color/color.info b/modules/color/color.info
index 994091b3..9ca6bcce 100644
--- a/modules/color/color.info
+++ b/modules/color/color.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = color.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/color/color.test b/modules/color/color.test
index 09043250..f29c0c26 100644
--- a/modules/color/color.test
+++ b/modules/color/color.test
@@ -122,7 +122,7 @@ class ColorTestCase extends DrupalWebTestCase {
$edit['palette[bg]'] = $color;
$this->drupalPost($settings_path, $edit, t('Save configuration'));
- if($is_valid) {
+ if ($is_valid) {
$this->assertText('The configuration options have been saved.');
}
else {
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index 77cf16aa..5ea180dc 100644
--- a/modules/comment/comment.info
+++ b/modules/comment/comment.info
@@ -9,8 +9,7 @@ files[] = comment.test
configure = admin/content/comment
stylesheets[all][] = comment.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index dc7aad3e..e087a717 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -11,9 +11,15 @@ class CommentHelperCase extends DrupalWebTestCase {
protected $node;
function setUp() {
- parent::setUp('comment', 'search');
+ $modules = func_get_args();
+ if (isset($modules[0]) && is_array($modules[0])) {
+ $modules = $modules[0];
+ }
+ $modules[] = 'comment';
+ parent::setUp($modules);
+
// Create users and test node.
- $this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer blocks', 'administer actions'));
+ $this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer blocks', 'administer actions', 'administer fields'));
$this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content', 'edit own comments'));
$this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->uid));
}
@@ -1490,7 +1496,7 @@ class CommentNodeAccessTest extends CommentHelperCase {
}
function setUp() {
- DrupalWebTestCase::setUp('comment', 'search', 'node_access_test');
+ parent::setUp('search', 'node_access_test');
node_access_rebuild();
// Create users and test node.
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 08e50f99..63cf78c5 100644
--- a/modules/contact/contact.info
+++ b/modules/contact/contact.info
@@ -6,8 +6,7 @@ core = 7.x
files[] = contact.test
configure = admin/structure/contact
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 9a48f231..9c6671a9 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -234,7 +234,14 @@ function contact_form_user_profile_form_alter(&$form, &$form_state) {
* Implements hook_user_presave().
*/
function contact_user_presave(&$edit, $account, $category) {
- $edit['data']['contact'] = isset($edit['contact']) ? $edit['contact'] : variable_get('contact_default_status', 1);
+ if (isset($edit['contact'])) {
+ // Set new value.
+ $edit['data']['contact'] = $edit['contact'];
+ }
+ elseif (!isset($account->data['contact'])) {
+ // Use default if none has been set.
+ $edit['data']['contact'] = variable_get('contact_default_status', 1);
+ }
}
/**
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index 6693b574..6a1674a0 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -346,6 +346,28 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
$this->drupalGet('user/' . $this->contact_user->uid . '/contact');
$this->assertResponse(200);
+ // Test that users can disable their contact form.
+ $this->drupalLogin($this->contact_user);
+ $edit = array('contact' => FALSE);
+ $this->drupalPost('user/' . $this->contact_user->uid . '/edit', $edit, 'Save');
+ $this->drupalLogout();
+ $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->assertResponse(403);
+
+ // Test that user's contact status stays disabled when saving.
+ $contact_user_temp = user_load($this->contact_user->uid, TRUE);
+ user_save($contact_user_temp);
+ $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->assertResponse(403);
+
+ // Test that users can enable their contact form.
+ $this->drupalLogin($this->contact_user);
+ $edit = array('contact' => TRUE);
+ $this->drupalPost('user/' . $this->contact_user->uid . '/edit', $edit, 'Save');
+ $this->drupalLogout();
+ $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->assertResponse(200);
+
// Revoke the personal contact permission for the anonymous user.
user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms'));
$this->drupalGet('user/' . $this->contact_user->uid . '/contact');
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index c7df84a0..c2f68e3b 100644
--- a/modules/contextual/contextual.info
+++ b/modules/contextual/contextual.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = contextual.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index 201d71eb..d4778c67 100644
--- a/modules/dashboard/dashboard.info
+++ b/modules/dashboard/dashboard.info
@@ -7,8 +7,7 @@ files[] = dashboard.test
dependencies[] = block
configure = admin/dashboard/customize
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index 7c1c0e20..f8a00c26 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -294,11 +294,18 @@ function theme_dblog_message($variables) {
else {
$output = t($event->message, unserialize($event->variables));
}
+ // If the output is expected to be a link, strip all the tags and
+ // special characters by using filter_xss() without any allowed tags.
+ // If not, use filter_xss_admin() to allow some tags.
if ($variables['link'] && isset($event->wid)) {
- // Truncate message to 56 chars.
+ // Truncate message to 56 chars after stripping all the tags.
$output = truncate_utf8(filter_xss($output, array()), 56, TRUE, TRUE);
$output = l($output, 'admin/reports/event/' . $event->wid, array('html' => TRUE));
}
+ else {
+ // Prevent XSS in log detail pages.
+ $output = filter_xss_admin($output);
+ }
}
return $output;
}
@@ -413,6 +420,6 @@ function dblog_clear_log_form($form) {
*/
function dblog_clear_log_submit() {
$_SESSION['dblog_overview_filter'] = array();
- db_delete('watchdog')->execute();
+ db_truncate('watchdog')->execute();
drupal_set_message(t('Database log cleared.'));
}
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 9b5f5d74..9c78e1b4 100644
--- a/modules/dblog/dblog.info
+++ b/modules/dblog/dblog.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
files[] = dblog.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install
index abfd9a2c..c2e41192 100644
--- a/modules/dblog/dblog.install
+++ b/modules/dblog/dblog.install
@@ -154,6 +154,15 @@ function dblog_update_7002() {
db_add_index('watchdog', 'severity', array('severity'));
}
+/**
+ * Account for possible legacy systems where dblog was not installed.
+ */
+function dblog_update_7003() {
+ if (!db_table_exists('watchdog')) {
+ db_create_table('watchdog', drupal_get_schema_unprocessed('dblog', 'watchdog'));
+ }
+}
+
/**
* @} End of "addtogroup updates-7.x-extra".
*/
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module
index 9183eed6..df305a2c 100644
--- a/modules/dblog/dblog.module
+++ b/modules/dblog/dblog.module
@@ -144,20 +144,30 @@ function _dblog_get_message_types() {
* Note: Some values may be truncated to meet database column size restrictions.
*/
function dblog_watchdog(array $log_entry) {
- Database::getConnection('default', 'default')->insert('watchdog')
- ->fields(array(
- 'uid' => $log_entry['uid'],
- 'type' => substr($log_entry['type'], 0, 64),
- 'message' => $log_entry['message'],
- 'variables' => serialize($log_entry['variables']),
- 'severity' => $log_entry['severity'],
- 'link' => substr($log_entry['link'], 0, 255),
- 'location' => $log_entry['request_uri'],
- 'referer' => $log_entry['referer'],
- 'hostname' => substr($log_entry['ip'], 0, 128),
- 'timestamp' => $log_entry['timestamp'],
- ))
- ->execute();
+ if (!function_exists('drupal_substr')) {
+ require_once DRUPAL_ROOT . '/includes/unicode.inc';
+ }
+ try {
+ Database::getConnection('default', 'default')->insert('watchdog')
+ ->fields(array(
+ 'uid' => $log_entry['uid'],
+ 'type' => drupal_substr($log_entry['type'], 0, 64),
+ 'message' => $log_entry['message'],
+ 'variables' => serialize($log_entry['variables']),
+ 'severity' => $log_entry['severity'],
+ 'link' => drupal_substr($log_entry['link'], 0, 255),
+ 'location' => $log_entry['request_uri'],
+ 'referer' => $log_entry['referer'],
+ 'hostname' => drupal_substr($log_entry['ip'], 0, 128),
+ 'timestamp' => $log_entry['timestamp'],
+ ))
+ ->execute();
+ }
+ catch (Exception $e) {
+ // Exception is ignored so that watchdog does not break pages during the
+ // installation process or is not able to create the watchdog table during
+ // installation.
+ }
}
/**
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index bf409c94..b0a58ba4 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -119,13 +119,18 @@ class DBLogTestCase extends DrupalWebTestCase {
private function generateLogEntries($count, $type = 'custom', $severity = WATCHDOG_NOTICE) {
global $base_root;
+ // This long URL makes it just a little bit harder to pass the link part of
+ // the test with a mix of English words and a repeating series of random
+ // percent-encoded Chinese characters.
+ $link = urldecode('/content/xo%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A-lake-isabelle');
+
// Prepare the fields to be logged
$log = array(
'type' => $type,
'message' => 'Log entry added to test the dblog row limit.',
'variables' => array(),
'severity' => $severity,
- 'link' => NULL,
+ 'link' => $link,
'user' => $this->big_user,
'uid' => isset($this->big_user->uid) ? $this->big_user->uid : 0,
'request_uri' => $base_root . request_uri(),
@@ -515,6 +520,33 @@ class DBLogTestCase extends DrupalWebTestCase {
$this->assertText(t('Database log cleared.'), 'Confirmation message found');
}
+ /**
+ * Verifies that exceptions are caught in dblog_watchdog().
+ */
+ protected function testDBLogException() {
+ $log = array(
+ 'type' => 'custom',
+ 'message' => 'Log entry added to test watchdog handling of Exceptions.',
+ 'variables' => array(),
+ 'severity' => WATCHDOG_NOTICE,
+ 'link' => NULL,
+ 'user' => $this->big_user,
+ 'uid' => isset($this->big_user->uid) ? $this->big_user->uid : 0,
+ 'request_uri' => request_uri(),
+ 'referer' => $_SERVER['HTTP_REFERER'],
+ 'ip' => ip_address(),
+ 'timestamp' => REQUEST_TIME,
+ );
+
+ // Remove watchdog table temporarily to simulate it missing during
+ // installation.
+ db_query("DROP TABLE {watchdog}");
+
+ // Add a watchdog entry.
+ // This should not throw an Exception, but fail silently.
+ dblog_watchdog($log);
+ }
+
/**
* Gets the database log event information from the browser page.
*
@@ -633,5 +665,32 @@ class DBLogTestCase extends DrupalWebTestCase {
// Document Object Model (DOM).
$this->assertLink(html_entity_decode($message_text), 0, $message);
}
-}
+ /**
+ * Make sure HTML tags are filtered out in the log detail page.
+ */
+ public function testLogMessageSanitized() {
+ $this->drupalLogin($this->big_user);
+
+ // Make sure dangerous HTML tags are filtered out in log detail page.
+ $log = array(
+ 'uid' => 0,
+ 'type' => 'custom',
+ 'message' => " Lorem ipsum",
+ 'variables' => NULL,
+ 'severity' => WATCHDOG_NOTICE,
+ 'link' => 'foo/bar',
+ 'request_uri' => 'http://example.com?dblog=1',
+ 'referer' => 'http://example.org?dblog=2',
+ 'ip' => '0.0.1.0',
+ 'timestamp' => REQUEST_TIME,
+ );
+ dblog_watchdog($log);
+
+ $wid = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
+ $this->drupalGet('admin/reports/event/' . $wid);
+ $this->assertResponse(200);
+ $this->assertNoRaw("");
+ $this->assertRaw("alert('foo'); Lorem ipsum");
+ }
+}
diff --git a/modules/field/field.crud.inc b/modules/field/field.crud.inc
index ba377083..7c0e3a15 100644
--- a/modules/field/field.crud.inc
+++ b/modules/field/field.crud.inc
@@ -189,7 +189,7 @@ function field_create_field($field) {
}
// Clear caches
- field_cache_clear(TRUE);
+ field_cache_clear();
// Invoke external hooks after the cache is cleared for API consistency.
module_invoke_all('field_create_field', $field);
@@ -288,7 +288,7 @@ function field_update_field($field) {
drupal_write_record('field_config', $field, $primary_key);
// Clear caches
- field_cache_clear(TRUE);
+ field_cache_clear();
// Invoke external hooks after the cache is cleared for API consistency.
module_invoke_all('field_update_field', $field, $prior_field, $has_data);
@@ -430,7 +430,7 @@ function field_delete_field($field_name) {
->execute();
// Clear the cache.
- field_cache_clear(TRUE);
+ field_cache_clear();
module_invoke_all('field_delete_field', $field);
}
diff --git a/modules/field/field.info b/modules/field/field.info
index c154828c..4cfb0b6c 100644
--- a/modules/field/field.info
+++ b/modules/field/field.info
@@ -11,8 +11,7 @@ dependencies[] = field_sql_storage
required = TRUE
stylesheets[all][] = theme/field.css
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/field.info.class.inc b/modules/field/field.info.class.inc
index f4f1f630..772cd451 100644
--- a/modules/field/field.info.class.inc
+++ b/modules/field/field.info.class.inc
@@ -612,10 +612,12 @@ class FieldInfo {
// Fill in default values.
$display += array(
'label' => 'above',
- 'type' => $field_type_info['default_formatter'],
'settings' => array(),
'weight' => 0,
);
+ if (empty($display['type'])) {
+ $display['type'] = $field_type_info['default_formatter'];
+ }
if ($display['type'] != 'hidden') {
$formatter_type_info = field_info_formatter_types($display['type']);
// Fall back to default formatter if formatter type is not available.
diff --git a/modules/field/field.install b/modules/field/field.install
index f6948e3b..c5dd2dc7 100644
--- a/modules/field/field.install
+++ b/modules/field/field.install
@@ -467,6 +467,27 @@ function field_update_7003() {
// Empty update to force a rebuild of the registry.
}
+/**
+ * Grant the new "administer fields" permission to trusted users.
+ */
+function field_update_7004() {
+ // Assign the permission to anyone that already has a trusted core permission
+ // that would have previously let them administer fields on an entity type.
+ $rids = array();
+ $permissions = array(
+ 'administer site configuration',
+ 'administer content types',
+ 'administer users',
+ );
+ foreach ($permissions as $permission) {
+ $rids = array_merge($rids, array_keys(user_roles(FALSE, $permission)));
+ }
+ $rids = array_unique($rids);
+ foreach ($rids as $rid) {
+ _update_7000_user_role_grant_permissions($rid, array('administer fields'), 'field');
+ }
+}
+
/**
* @} End of "addtogroup updates-7.x-extra".
*/
diff --git a/modules/field/field.module b/modules/field/field.module
index e4039786..8d66813f 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -316,6 +316,21 @@ function field_help($path, $arg) {
}
}
+/**
+ * Implements hook_permission().
+ */
+function field_permission() {
+ return array(
+ 'administer fields' => array(
+ 'title' => t('Administer fields'),
+ 'description' => t('Additional permissions are required based on what the fields are attached to (for example, administer content types to manage fields attached to content).', array(
+ '@url' => '#module-node',
+ )),
+ 'restrict access' => TRUE,
+ ),
+ );
+}
+
/**
* Implements hook_theme().
*/
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info
index dc1631f9..29c7421a 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.info
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -7,8 +7,7 @@ dependencies[] = field
files[] = field_sql_storage.test
required = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index 49e7814f..55c539c0 100644
--- a/modules/field/modules/list/list.info
+++ b/modules/field/modules/list/list.info
@@ -7,8 +7,7 @@ dependencies[] = field
dependencies[] = options
files[] = tests/list.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/modules/list/tests/list.test b/modules/field/modules/list/tests/list.test
index 84de7e89..b476b5aa 100644
--- a/modules/field/modules/list/tests/list.test
+++ b/modules/field/modules/list/tests/list.test
@@ -212,7 +212,7 @@ class ListFieldUITestCase extends FieldTestCase {
parent::setUp('field_test', 'field_ui');
// Create test user.
- $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer taxonomy'));
+ $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer taxonomy', 'administer fields'));
$this->drupalLogin($admin_user);
// Create content type, with underscores.
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index 912d7bf6..ca74fe3c 100644
--- a/modules/field/modules/list/tests/list_test.info
+++ b/modules/field/modules/list/tests/list_test.info
@@ -5,8 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index ce55ee33..c2c57a20 100644
--- a/modules/field/modules/number/number.info
+++ b/modules/field/modules/number/number.info
@@ -6,8 +6,7 @@ core = 7.x
dependencies[] = field
files[] = number.test
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index 60465442..2538bdd1 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -164,6 +164,15 @@ function number_field_presave($entity_type, $entity, $field, $instance, $langcod
}
}
}
+ if ($field['type'] == 'number_float') {
+ // Remove the decimal point from float values with decimal
+ // point but no decimal numbers.
+ foreach ($items as $delta => $item) {
+ if (isset($item['value'])) {
+ $items[$delta]['value'] = floatval($item['value']);
+ }
+ }
+ }
}
/**
@@ -188,7 +197,7 @@ function number_field_formatter_info() {
'label' => t('Default'),
'field types' => array('number_integer'),
'settings' => array(
- 'thousand_separator' => ' ',
+ 'thousand_separator' => '',
// The 'decimal_separator' and 'scale' settings are not configurable
// through the UI, and will therefore keep their default values. They
// are only present so that the 'number_integer' and 'number_decimal'
@@ -202,7 +211,7 @@ function number_field_formatter_info() {
'label' => t('Default'),
'field types' => array('number_decimal', 'number_float'),
'settings' => array(
- 'thousand_separator' => ' ',
+ 'thousand_separator' => '',
'decimal_separator' => '.',
'scale' => 2,
'prefix_suffix' => TRUE,
@@ -222,6 +231,8 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
+ $element = array();
+
if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') {
$options = array(
'' => t('' . $effect['help'] . '
') : NULL; case 'admin/config/media/image-styles/edit/%/effects/%': - $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[6], $arg[4]); + $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[7], $arg[5]); return isset($effect['help']) ? ('' . $effect['help'] . '
') : NULL; } } @@ -801,6 +801,8 @@ function image_style_options($include_empty = TRUE, $output = CHECK_PLAIN) { * * @param $style * The image style + * @param $scheme + * The file scheme, for example 'public' for public files. */ function image_style_deliver($style, $scheme) { $args = func_get_args(); @@ -833,8 +835,8 @@ function image_style_deliver($style, $scheme) { file_download($scheme, file_uri_target($derivative_uri)); } else { - $headers = module_invoke_all('file_download', $image_uri); - if (in_array(-1, $headers) || empty($headers)) { + $headers = file_download_headers($image_uri); + if (empty($headers)) { return MENU_ACCESS_DENIED; } if (count($headers)) { diff --git a/modules/image/image.test b/modules/image/image.test index 35919794..0c26ffa8 100644 --- a/modules/image/image.test +++ b/modules/image/image.test @@ -32,7 +32,7 @@ class ImageFieldTestCase extends DrupalWebTestCase { function setUp() { parent::setUp('image'); - $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles')); + $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles', 'administer fields')); $this->drupalLogin($this->admin_user); } @@ -77,6 +77,24 @@ class ImageFieldTestCase extends DrupalWebTestCase { return field_create_instance($instance); } + /** + * Create a random style. + * + * @return array + * A list containing the details of the generated image style. + */ + function createRandomStyle() { + $style_name = strtolower($this->randomName(10)); + $style_label = $this->randomString(); + image_style_save(array('name' => $style_name, 'label' => $style_label)); + $style_path = 'admin/config/media/image-styles/edit/' . $style_name; + return array( + 'name' => $style_name, + 'label' => $style_label, + 'path' => $style_path, + ); + } + /** * Upload an image to a node. * @@ -183,6 +201,22 @@ class ImageStylesPathAndUrlTestCase extends DrupalWebTestCase { $this->assertResponse(404, 'Accessing an image style URL with a source image that does not exist provides a 404 error response.'); } + /** + * Test that we do not pass an array to drupal_add_http_header. + */ + function testImageContentTypeHeaders() { + $files = $this->drupalGetTestFiles('image'); + $file = array_shift($files); + // Copy the test file to private folder. + $private_file = file_copy($file, 'private://', FILE_EXISTS_RENAME); + // Tell image_module_test module to return the headers we want to test. + variable_set('image_module_test_invalid_headers', $private_file->uri); + // Invoke image_style_deliver so it will try to set headers. + $generated_url = image_style_url($this->style_name, $private_file->uri); + $this->drupalGet($generated_url); + variable_del('image_module_test_invalid_headers'); + } + /** * Test image_style_url(). */ @@ -251,7 +285,7 @@ class ImageStylesPathAndUrlTestCase extends DrupalWebTestCase { $this->assertEqual($this->drupalGetHeader('Content-Length'), $generated_image_info['file_size'], 'Expected Content-Length was reported.'); if ($scheme == 'private') { $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.'); - $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate, post-check=0, pre-check=0', 'Cache-Control header was set to prevent caching.'); + $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate', 'Cache-Control header was set to prevent caching.'); $this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', 'Expected custom header has been added.'); // Make sure that a second request to the already existing derivate works @@ -469,6 +503,58 @@ class ImageEffectsUnitTest extends ImageToolkitTestCase { } } +/** + * Tests the administrative user interface. + */ +class ImageAdminUiTestCase extends ImageFieldTestCase { + public static function getInfo() { + return array( + 'name' => 'Administrative user interface', + 'description' => 'Tests the forms used in the administrative user interface.', + 'group' => 'Image', + ); + } + + function setUp() { + parent::setUp(array('image')); + } + + /** + * Test if the help text is available on the add effect form. + */ + function testAddEffectHelpText() { + // Create a random image style. + $style = $this->createRandomStyle(); + + // Open the add effect form and check for the help text. + $this->drupalGet($style['path'] . '/add/image_crop'); + $this->assertText(t('Cropping will remove portions of an image to make it the specified dimensions.'), 'The image style effect help text was displayed on the add effect page.'); + } + + /** + * Test if the help text is available on the edit effect form. + */ + function testEditEffectHelpText() { + // Create a random image style. + $random_style = $this->createRandomStyle(); + + // Add the crop effect to the image style. + $edit = array(); + $edit['data[width]'] = 20; + $edit['data[height]'] = 20; + $this->drupalPost($random_style['path'] . '/add/image_crop', $edit, t('Add effect')); + + // Open the edit effect form and check for the help text. + drupal_static_reset('image_styles'); + $style = image_style_load($random_style['name']); + + foreach ($style['effects'] as $ieid => $effect) { + $this->drupalGet($random_style['path'] . '/effects/' . $ieid); + $this->assertText(t('Cropping will remove portions of an image to make it the specified dimensions.'), 'The image style effect help text was displayed on the edit effect page.'); + } + } +} + /** * Tests creation, deletion, and editing of image styles and effects. */ diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info index 702e8901..588044e8 100644 --- a/modules/image/tests/image_module_test.info +++ b/modules/image/tests/image_module_test.info @@ -6,8 +6,7 @@ core = 7.x files[] = image_module_test.module hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/image/tests/image_module_test.module b/modules/image/tests/image_module_test.module index 8a322fb9..fc66d9b8 100644 --- a/modules/image/tests/image_module_test.module +++ b/modules/image/tests/image_module_test.module @@ -9,6 +9,9 @@ function image_module_test_file_download($uri) { if (variable_get('image_module_test_file_download', FALSE) == $uri) { return array('X-Image-Owned-By' => 'image_module_test'); } + if (variable_get('image_module_test_invalid_headers', FALSE) == $uri) { + return array('Content-Type' => 'image/png'); + } } /** diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc index e813962d..acf6eb2e 100644 --- a/modules/locale/locale.admin.inc +++ b/modules/locale/locale.admin.inc @@ -1194,7 +1194,7 @@ function locale_translate_edit_form_submit($form, &$form_state) { $translation = db_query("SELECT translation FROM {locales_target} WHERE lid = :lid AND language = :language", array(':lid' => $lid, ':language' => $key))->fetchField(); if (!empty($value)) { // Only update or insert if we have a value to use. - if (!empty($translation)) { + if (is_string($translation)) { db_update('locales_target') ->fields(array( 'translation' => $value, diff --git a/modules/locale/locale.info b/modules/locale/locale.info index 61abe8a6..45d1d677 100644 --- a/modules/locale/locale.info +++ b/modules/locale/locale.info @@ -6,8 +6,7 @@ core = 7.x files[] = locale.test configure = admin/config/regional/language -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 90865872..db87e055 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -393,6 +393,16 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { // The indicator should not be here. $this->assertNoRaw($language_indicator, 'String is translated.'); + // Verify that a translation set which has an empty target string can be + // updated without any database error. + db_update('locales_target') + ->fields(array('translation' => '')) + ->condition('language', $langcode, '=') + ->condition('lid', $lid, '=') + ->execute(); + $this->drupalPost('admin/config/regional/translate/edit/' . $lid, $edit, t('Save translations')); + $this->assertText(t('The string has been saved.'), 'The string has been saved.'); + // Try to edit a non-existent string and ensure we're redirected correctly. // Assuming we don't have 999,999 strings already. $random_lid = 999999; @@ -809,7 +819,7 @@ class LocalePluralFormatTest extends DrupalWebTestCase { * Additional options to pass to the translation import form. */ function importPoFile($contents, array $options = array()) { - $name = tempnam('temporary://', "po_") . '.po'; + $name = drupal_tempnam('temporary://', "po_") . '.po'; file_put_contents($name, $contents); $options['files[file]'] = $name; $this->drupalPost('admin/config/regional/translate/import', $options, t('Import')); @@ -1103,7 +1113,7 @@ class LocaleImportFunctionalTest extends DrupalWebTestCase { * Additional options to pass to the translation import form. */ function importPoFile($contents, array $options = array()) { - $name = tempnam('temporary://', "po_") . '.po'; + $name = drupal_tempnam('temporary://', "po_") . '.po'; file_put_contents($name, $contents); $options['files[file]'] = $name; $this->drupalPost('admin/config/regional/translate/import', $options, t('Import')); @@ -1330,7 +1340,7 @@ class LocaleExportFunctionalTest extends DrupalWebTestCase { function testExportTranslation() { // First import some known translations. // This will also automatically enable the 'fr' language. - $name = tempnam('temporary://', "po_") . '.po'; + $name = drupal_tempnam('temporary://', "po_") . '.po'; file_put_contents($name, $this->getPoFile()); $this->drupalPost('admin/config/regional/translate/import', array( 'langcode' => 'fr', @@ -2237,6 +2247,37 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase { $this->drupalLogout(); } + + /** + * Verifies that nodes may be created with different languages. + */ + function testNodeCreationWithLanguage() { + // Create an admin user and log them in. + $perms = array( + // Standard node permissions. + 'create page content', + 'administer content types', + 'administer nodes', + 'bypass node access', + // Locale. + 'administer languages', + ); + $web_user = $this->drupalCreateUser($perms); + $this->drupalLogin($web_user); + + // Create some test nodes using different langcodes. + foreach (array(LANGUAGE_NONE, 'en', 'fr') as $langcode) { + $node_args = array( + 'type' => 'page', + 'promote' => 1, + 'language' => $langcode, + ); + $node = $this->drupalCreateNode($node_args); + $node_reloaded = node_load($node->nid, NULL, TRUE); + $this->assertEqual($node_reloaded->language, $langcode, format_string('The language code of the node was successfully set to @langcode.', array('@langcode' => $langcode))); + } + } + } /** @@ -2629,6 +2670,68 @@ class LocaleUrlRewritingTest extends DrupalWebTestCase { $this->drupalGet("$prefix/$path"); $this->assertResponse(404, $message2); } + + /** + * Check URL rewriting when using a domain name and a non-standard port. + */ + function testDomainNameNegotiationPort() { + $language_domain = 'example.fr'; + $edit = array( + 'locale_language_negotiation_url_part' => 1, + ); + $this->drupalPost('admin/config/regional/language/configure/url', $edit, t('Save configuration')); + $edit = array( + 'prefix' => '', + 'domain' => $language_domain + ); + $this->drupalPost('admin/config/regional/language/edit/fr', $edit, t('Save language')); + + // Enable domain configuration. + variable_set('locale_language_negotiation_url_part', LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN); + + // Reset static caching. + drupal_static_reset('language_list'); + drupal_static_reset('language_url_outbound_alter'); + drupal_static_reset('language_url_rewrite_url'); + + // In case index.php is part of the URLs, we need to adapt the asserted + // URLs as well. + $index_php = strpos(url('', array('absolute' => TRUE)), 'index.php') !== FALSE; + + // Remember current HTTP_HOST. + $http_host = $_SERVER['HTTP_HOST']; + + // Fake a different port. + $_SERVER['HTTP_HOST'] .= ':88'; + + // Create an absolute French link. + $languages = language_list(); + $language = $languages['fr']; + $url = url('', array( + 'absolute' => TRUE, + 'language' => $language + )); + + $expected = 'http://example.fr:88/'; + $expected .= $index_php ? 'index.php/' : ''; + + $this->assertEqual($url, $expected, 'The right port is used.'); + + // If we set the port explicitly in url(), it should not be overriden. + $url = url('', array( + 'absolute' => TRUE, + 'language' => $language, + 'base_url' => $GLOBALS['base_url'] . ':90', + )); + + $expected = 'http://example.fr:90/'; + $expected .= $index_php ? 'index.php/' : ''; + + $this->assertEqual($url, $expected, 'A given port is not overriden.'); + + // Restore HTTP_HOST. + $_SERVER['HTTP_HOST'] = $http_host; + } } /** @@ -3141,3 +3244,46 @@ class LocaleCSSAlterTest extends DrupalWebTestCase { $this->assertRaw('@import url("' . $base_url . '/modules/system/system.messages.css' . $query_string . '");' . "\n" . '@import url("' . $base_url . '/modules/system/system.messages-rtl.css' . $query_string . '");' . "\n", 'CSS: system.messages-rtl.css is added directly after system.messages.css.'); } } + +/** + * Tests locale translation safe string handling. + */ +class LocaleStringIsSafeTest extends DrupalWebTestCase { + public static function getInfo() { + return array( + 'name' => 'Test if a string is safe', + 'description' => 'Tests locale translation safe string handling.', + 'group' => 'Locale', + ); + } + + function setUp() { + parent::setUp('locale'); + } + + /** + * Tests for locale_string_is_safe(). + */ + public function testLocaleStringIsSafe() { + // Check a translatable string without HTML. + $string = 'Hello world!'; + $result = locale_string_is_safe($string); + $this->assertTrue($result); + + // Check a translatable string which includes trustable HTML. + $string = 'Hello world!'; + $result = locale_string_is_safe($string); + $this->assertTrue($result); + + // Check an untranslatable string which includes untrustable HTML (according + // to the locale_string_is_safe() function definition). + $string = 'Hello!';
+ $result = locale_string_is_safe($string);
+ $this->assertFalse($result);
+
+ // Check a translatable string which includes a token in an href attribute.
+ $string = 'Hi user';
+ $result = locale_string_is_safe($string);
+ $this->assertTrue($result);
+ }
+}
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index 5e8d50f7..20ae2b47 100644
--- a/modules/locale/tests/locale_test.info
+++ b/modules/locale/tests/locale_test.info
@@ -5,8 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 66bd6f3b..a24703c9 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -281,6 +281,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
$form['link_title'] = array(
'#type' => 'textfield',
'#title' => t('Menu link title'),
+ '#maxlength' => 255,
'#default_value' => $item['link_title'],
'#description' => t('The text to be used for this link in the menu.'),
'#required' => TRUE,
@@ -305,7 +306,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
'#title' => t('Path'),
'#maxlength' => 255,
'#default_value' => $path,
- '#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '',
+ '#suffix' => '
',
'#type' => 'tableselect',
'#header' => $header,
'#options' => $options,
'#multiple' => FALSE,
'#empty' => t('Empty text.'),
+ '#ajax' => array(
+ 'callback' => '_form_test_tableselect_ajax_callback',
+ 'wrapper' => 'tableselect-wrapper',
+ ),
);
$form['submit'] = array(
@@ -697,6 +731,13 @@ function _form_test_vertical_tabs_form($form, &$form_state) {
return $form;
}
+/**
+* Ajax callback that returns the form element.
+*/
+function _form_test_tableselect_ajax_callback($form, &$form_state) {
+ return $form['tableselect'];
+}
+
/**
* A multistep form for testing the form storage.
*
diff --git a/modules/simpletest/tests/image.test b/modules/simpletest/tests/image.test
index 84970221..7ca1d3a0 100644
--- a/modules/simpletest/tests/image.test
+++ b/modules/simpletest/tests/image.test
@@ -207,9 +207,11 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
protected $green = array(0, 255, 0, 0);
protected $blue = array(0, 0, 255, 0);
protected $yellow = array(255, 255, 0, 0);
- protected $fuchsia = array(255, 0, 255, 0); // Used as background colors.
- protected $transparent = array(0, 0, 0, 127);
protected $white = array(255, 255, 255, 0);
+ protected $transparent = array(0, 0, 0, 127);
+ // Used as rotate background colors.
+ protected $fuchsia = array(255, 0, 255, 0);
+ protected $rotate_transparent = array(255, 255, 255, 127);
protected $width = 40;
protected $height = 20;
@@ -275,6 +277,7 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
$files = array(
'image-test.png',
'image-test.gif',
+ 'image-test-no-transparency.gif',
'image-test.jpg',
);
@@ -334,13 +337,6 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
// Systems using non-bundled GD2 don't have imagerotate. Test if available.
if (function_exists('imagerotate')) {
$operations += array(
- 'rotate_5' => array(
- 'function' => 'rotate',
- 'arguments' => array(5, 0xFF00FF), // Fuchsia background.
- 'width' => 42,
- 'height' => 24,
- 'corners' => array_fill(0, 4, $this->fuchsia),
- ),
'rotate_90' => array(
'function' => 'rotate',
'arguments' => array(90, 0xFF00FF), // Fuchsia background.
@@ -348,13 +344,6 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
'height' => 40,
'corners' => array($this->fuchsia, $this->red, $this->green, $this->blue),
),
- 'rotate_transparent_5' => array(
- 'function' => 'rotate',
- 'arguments' => array(5),
- 'width' => 42,
- 'height' => 24,
- 'corners' => array_fill(0, 4, $this->transparent),
- ),
'rotate_transparent_90' => array(
'function' => 'rotate',
'arguments' => array(90),
@@ -363,6 +352,49 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
'corners' => array($this->transparent, $this->red, $this->green, $this->blue),
),
);
+ // As of PHP version 5.5, GD uses a different algorithm to rotate images
+ // than version 5.4 and below, resulting in different dimensions.
+ // See https://bugs.php.net/bug.php?id=65148.
+ // For the 40x20 test images, the dimensions resulting from rotation will
+ // be 1 pixel smaller in both width and height in PHP 5.5 and above.
+ // @todo: If and when the PHP bug gets solved, add an upper limit
+ // version check.
+ if (version_compare(PHP_VERSION, '5.5', '>=')) {
+ $operations += array(
+ 'rotate_5' => array(
+ 'function' => 'rotate',
+ 'arguments' => array(5, 0xFF00FF), // Fuchsia background.
+ 'width' => 41,
+ 'height' => 23,
+ 'corners' => array_fill(0, 4, $this->fuchsia),
+ ),
+ 'rotate_transparent_5' => array(
+ 'function' => 'rotate',
+ 'arguments' => array(5),
+ 'width' => 41,
+ 'height' => 23,
+ 'corners' => array_fill(0, 4, $this->rotate_transparent),
+ ),
+ );
+ }
+ else {
+ $operations += array(
+ 'rotate_5' => array(
+ 'function' => 'rotate',
+ 'arguments' => array(5, 0xFF00FF), // Fuchsia background.
+ 'width' => 42,
+ 'height' => 24,
+ 'corners' => array_fill(0, 4, $this->fuchsia),
+ ),
+ 'rotate_transparent_5' => array(
+ 'function' => 'rotate',
+ 'arguments' => array(5),
+ 'width' => 42,
+ 'height' => 24,
+ 'corners' => array_fill(0, 4, $this->rotate_transparent),
+ ),
+ );
+ }
}
// Systems using non-bundled GD2 don't have imagefilter. Test if available.
@@ -430,6 +462,11 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
}
// Now check each of the corners to ensure color correctness.
foreach ($values['corners'] as $key => $corner) {
+ // The test gif that does not have transparency has yellow where the
+ // others have transparent.
+ if ($file === 'image-test-no-transparency.gif' && $corner === $this->transparent) {
+ $corner = $this->yellow;
+ }
// Get the location of the corner.
switch ($key) {
case 0:
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index 942597b5..99446c57 100644
--- a/modules/simpletest/tests/image_test.info
+++ b/modules/simpletest/tests/image_test.info
@@ -5,8 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/simpletest/tests/mail.test b/modules/simpletest/tests/mail.test
index 70a43cb4..3e40e13a 100644
--- a/modules/simpletest/tests/mail.test
+++ b/modules/simpletest/tests/mail.test
@@ -441,7 +441,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
* ' . str_repeat('x', 2100) . '
Drupal';
+ $input = 'Drupal
' . str_repeat('x', 2100) . '
Drupal'; $output = drupal_html_to_text($input); // This awkward construct comes from includes/mail.inc lines 8-13. $eol = variable_get('mail_line_endings', MAIL_LINE_ENDINGS); @@ -455,7 +455,6 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { $maximum_line_length = max($maximum_line_length, strlen($line . $eol)); } $verbose = 'Maximum line length found was ' . $maximum_line_length . ' octets.'; - // @todo This should assert that $maximum_line_length <= 1000. - $this->pass($verbose); + $this->assertTrue($maximum_line_length <= 1000, $verbose); } } diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info index 162e912a..0599f903 100644 --- a/modules/simpletest/tests/menu_test.info +++ b/modules/simpletest/tests/menu_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test index 371339f3..eea3b51e 100644 --- a/modules/simpletest/tests/module.test +++ b/modules/simpletest/tests/module.test @@ -302,3 +302,45 @@ class ModuleUninstallTestCase extends DrupalWebTestCase { $this->assertEqual(0, $count, 'Permissions were all removed.'); } } + +class ModuleImplementsAlterTestCase extends DrupalWebTestCase { + public static function getInfo() { + return array( + 'name' => 'Module implements alter', + 'description' => 'Tests hook_module_implements_alter().', + 'group' => 'Module', + ); + } + + /** + * Tests hook_module_implements_alter() adding an implementation. + */ + function testModuleImplementsAlter() { + module_enable(array('module_test'), FALSE); + $this->assertTrue(module_exists('module_test'), 'Test module is enabled.'); + + // Assert that module_test.module is now included. + $this->assertTrue(function_exists('module_test_permission'), + 'The file module_test.module was successfully included.'); + + $modules = module_implements('permission'); + $this->assertTrue(in_array('module_test', $modules), 'module_test implements hook_permission.'); + + $modules = module_implements('module_implements_alter'); + $this->assertTrue(in_array('module_test', $modules), 'module_test implements hook_module_implements_alter().'); + + // Assert that module_test.implementations.inc is not included yet. + $this->assertFalse(function_exists('module_test_altered_test_hook'), + 'The file module_test.implementations.inc is not included yet.'); + + // Assert that module_test_module_implements_alter(*, 'altered_test_hook') + // has added an implementation + $this->assertTrue(in_array('module_test', module_implements('altered_test_hook')), + 'module_test implements hook_altered_test_hook().'); + + // Assert that module_test.implementations.inc was included as part of the process. + $this->assertTrue(function_exists('module_test_altered_test_hook'), + 'The file module_test.implementations.inc was included.'); + } + +} diff --git a/modules/simpletest/tests/module_test.implementations.inc b/modules/simpletest/tests/module_test.implementations.inc new file mode 100644 index 00000000..63c866ea --- /dev/null +++ b/modules/simpletest/tests/module_test.implementations.inc @@ -0,0 +1,10 @@ +2.0) -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/system_incompatible_module_version_test.info b/modules/simpletest/tests/system_incompatible_module_version_test.info index f469bd7f..837ea2e3 100644 --- a/modules/simpletest/tests/system_incompatible_module_version_test.info +++ b/modules/simpletest/tests/system_incompatible_module_version_test.info @@ -5,8 +5,7 @@ version = 1.0 core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/system_project_namespace_test.info b/modules/simpletest/tests/system_project_namespace_test.info new file mode 100644 index 00000000..1f30959e --- /dev/null +++ b/modules/simpletest/tests/system_project_namespace_test.info @@ -0,0 +1,12 @@ +name = "System project namespace test" +description = "Support module for testing project namespace dependencies." +package = Testing +version = VERSION +core = 7.x +hidden = TRUE +dependencies[] = drupal:filter + +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" +project = "drupal" +datestamp = "1539816636" diff --git a/modules/simpletest/tests/system_project_namespace_test.module b/modules/simpletest/tests/system_project_namespace_test.module new file mode 100644 index 00000000..b3d9bbc7 --- /dev/null +++ b/modules/simpletest/tests/system_project_namespace_test.module @@ -0,0 +1 @@ + MENU_CALLBACK, ); + $items['system-test/drupal-get-filename'] = array( + 'title' => 'Test drupal_get_filename()', + 'page callback' => 'system_test_drupal_get_filename', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); + + $items['system-test/drupal-get-filename-with-schema-rebuild'] = array( + 'title' => 'Test drupal_get_filename() with a schema rebuild', + 'page callback' => 'system_test_drupal_get_filename_with_schema_rebuild', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); + return $items; } @@ -296,6 +310,9 @@ function system_test_system_info_alter(&$info, $file, $type) { } } + if ($file->name == 'system_project_namespace_test') { + $info['hidden'] = FALSE; + } // Make the system_dependencies_test visible by default. if ($file->name == 'system_dependencies_test') { $info['hidden'] = FALSE; @@ -479,3 +496,76 @@ function system_test_request_destination() { // information. exit; } + +/** + * Page callback to run drupal_get_filename() on a particular module. + */ +function system_test_drupal_get_filename() { + // Prevent SimpleTest from failing as a result of the expected PHP warnings + // this function causes. Any warnings will be recorded in the database logs + // for examination by the tests. + define('SIMPLETEST_COLLECT_ERRORS', FALSE); + + $module_name = variable_get('system_test_drupal_get_filename_test_module_name'); + drupal_get_filename('module', $module_name); + + return ''; +} + +/** + * Page callback to run drupal_get_filename() and do a schema rebuild. + */ +function system_test_drupal_get_filename_with_schema_rebuild() { + // Prevent SimpleTest from failing as a result of the expected PHP warnings + // this function causes. + define('SIMPLETEST_COLLECT_ERRORS', FALSE); + + // Record the original database tables from drupal_get_schema(). + variable_set('system_test_drupal_get_filename_with_schema_rebuild_original_tables', array_keys(drupal_get_schema(NULL, TRUE))); + + // Trigger system_test_schema() and system_test_watchdog() to perform an + // attempted recursive rebuild when drupal_get_schema() is called. See + // BootstrapGetFilenameWebTestCase::testRecursiveRebuilds(). + variable_set('system_test_drupal_get_filename_attempt_recursive_rebuild', TRUE); + drupal_get_schema(NULL, TRUE); + + return ''; +} + +/** + * Implements hook_watchdog(). + */ +function system_test_watchdog($log_entry) { + // If an attempted recursive schema rebuild has been triggered by + // system_test_drupal_get_filename_with_schema_rebuild(), perform the rebuild + // in response to the missing file message triggered by system_test_schema(). + if (!variable_get('system_test_drupal_get_filename_attempt_recursive_rebuild')) { + return; + } + if ($log_entry['type'] != 'php' || $log_entry['severity'] != WATCHDOG_WARNING) { + return; + } + $module_name = variable_get('system_test_drupal_get_filename_test_module_name'); + if (!isset($log_entry['variables']['!message']) || strpos($log_entry['variables']['!message'], format_string('The following module is missing from the file system: %name', array('%name' => $module_name))) === FALSE) { + return; + } + variable_set('system_test_drupal_get_filename_with_schema_rebuild_final_tables', array_keys(drupal_get_schema())); +} + +/** + * Implements hook_module_implements_alter(). + */ +function system_test_module_implements_alter(&$implementations, $hook) { + // For BootstrapGetFilenameWebTestCase::testRecursiveRebuilds() to work + // correctly, this module's hook_schema() implementation cannot be either the + // first implementation (since that would trigger a potential recursive + // rebuild before anything is in the drupal_get_schema() cache) or the last + // implementation (since that would trigger a potential recursive rebuild + // after the cache is already complete). So put it somewhere in the middle. + if ($hook == 'schema') { + $group = $implementations['system_test']; + unset($implementations['system_test']); + $count = count($implementations); + $implementations = array_merge(array_slice($implementations, 0, $count / 2, TRUE), array('system_test' => $group), array_slice($implementations, $count / 2, NULL, TRUE)); + } +} diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info index ebb752e3..94aef660 100644 --- a/modules/simpletest/tests/taxonomy_test.info +++ b/modules/simpletest/tests/taxonomy_test.info @@ -6,8 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = taxonomy -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/taxonomy_test.module b/modules/simpletest/tests/taxonomy_test.module index f82950c3..f4144380 100644 --- a/modules/simpletest/tests/taxonomy_test.module +++ b/modules/simpletest/tests/taxonomy_test.module @@ -109,3 +109,33 @@ function taxonomy_test_get_antonym($tid) { ->execute() ->fetchField(); } + +/** + * Implements hook_query_alter(). + */ +function taxonomy_test_query_alter(QueryAlterableInterface $query) { + $value = variable_get(__FUNCTION__); + if (isset($value)) { + variable_set(__FUNCTION__, ++$value); + } +} + +/** + * Implements hook_query_TAG_alter(). + */ +function taxonomy_test_query_term_access_alter(QueryAlterableInterface $query) { + $value = variable_get(__FUNCTION__); + if (isset($value)) { + variable_set(__FUNCTION__, ++$value); + } +} + +/** + * Implements hook_query_TAG_alter(). + */ +function taxonomy_test_query_taxonomy_term_access_alter(QueryAlterableInterface $query) { + $value = variable_get(__FUNCTION__); + if (isset($value)) { + variable_set(__FUNCTION__, ++$value); + } +} diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test index f5ddfa9b..5f095bd5 100644 --- a/modules/simpletest/tests/theme.test +++ b/modules/simpletest/tests/theme.test @@ -646,3 +646,34 @@ class ThemeDebugMarkupTestCase extends DrupalWebTestCase { } } + +/** + * Tests module-provided theme engines. + */ +class ModuleProvidedThemeEngineTestCase extends DrupalWebTestCase { + + public static function getInfo() { + return array( + 'name' => 'Theme engine test', + 'description' => 'Tests module-provided theme engines.', + 'group' => 'Theme', + ); + } + + function setUp() { + parent::setUp('theme_test'); + theme_enable(array('test_theme', 'test_theme_nyan_cat')); + } + + /** + * Ensures that the module provided theme engine is found and used by core. + */ + function testEngineIsFoundAndWorking() { + variable_set('theme_default', 'test_theme_nyan_cat'); + variable_set('admin_theme', 'test_theme_nyan_cat'); + + $this->drupalGet('theme-test/engine-info-test'); + $this->assertText('Miaou'); + } + +} diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info index 9df1b617..c3635173 100644 --- a/modules/simpletest/tests/theme_test.info +++ b/modules/simpletest/tests/theme_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/theme_test.module b/modules/simpletest/tests/theme_test.module index 948d8175..1dbc3b95 100644 --- a/modules/simpletest/tests/theme_test.module +++ b/modules/simpletest/tests/theme_test.module @@ -27,9 +27,18 @@ function theme_test_system_theme_info() { $themes['test_theme'] = drupal_get_path('module', 'theme_test') . '/themes/test_theme/test_theme.info'; $themes['test_basetheme'] = drupal_get_path('module', 'theme_test') . '/themes/test_basetheme/test_basetheme.info'; $themes['test_subtheme'] = drupal_get_path('module', 'theme_test') . '/themes/test_subtheme/test_subtheme.info'; + $themes['test_theme_nyan_cat'] = drupal_get_path('module', 'theme_test') . '/themes/test_theme_nyan_cat/test_theme_nyan_cat.info'; return $themes; } +/** + * Implements hook_system_theme_engine_info(). + */ +function theme_test_system_theme_engine_info() { + $theme_engines['nyan_cat'] = drupal_get_path('module', 'theme_test') . '/themes/engines/nyan_cat/nyan_cat.engine'; + return $theme_engines; +} + /** * Implements hook_menu(). */ @@ -58,6 +67,12 @@ function theme_test_menu() { 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); + $items['theme-test/engine-info-test'] = array( + 'description' => "Serves a simple page rendered using a Nyan Cat theme engine template.", + 'page callback' => '_theme_test_engine_info_test', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); return $items; } @@ -139,6 +154,15 @@ function _theme_test_drupal_add_region_content() { return 'Hello'; } +/** + * Serves a simple page renderered using a Nyan Cat theme engine template. + */ +function _theme_test_engine_info_test() { + return array( + '#markup' => theme('theme_test_template_test'), + ); +} + /** * Theme function for testing theme('theme_test_foo'). */ diff --git a/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine b/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine new file mode 100644 index 00000000..1b8ffef8 --- /dev/null +++ b/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine @@ -0,0 +1,53 @@ +filename) . '/template.theme'; + if (file_exists($file)) { + include_once DRUPAL_ROOT . '/' . $file; + } +} + +/** + * Implements hook_theme(). + */ +function nyan_cat_theme($existing, $type, $theme, $path) { + $templates = drupal_find_theme_functions($existing, array($theme)); + $templates += drupal_find_theme_templates($existing, '.nyan-cat.html', $path); + return $templates; +} + +/** + * Implements hook_extension(). + */ +function nyan_cat_extension() { + return '.nyan-cat.html'; +} + +/** + * Implements hook_render_template(). + * + * @param string $template_file + * The filename of the template to render. + * @param mixed[] $variables + * A keyed array of variables that will appear in the output. + * + * @return string + * The output generated by the template. + */ +function nyan_cat_render_template($template_file, $variables) { + $output = str_replace('div', 'nyancat', file_get_contents(DRUPAL_ROOT . '/' . $template_file)); + foreach ($variables as $key => $variable) { + if (strpos($output, '9' . $key) !== FALSE) { + $output = str_replace('9' . $key, $variable, $output); + } + } + return $output; +} diff --git a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info index acba3d5f..8788b00b 100644 --- a/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info +++ b/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info @@ -6,8 +6,7 @@ hidden = TRUE settings[basetheme_only] = base theme value settings[subtheme_override] = base theme value -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info index 120fc3a6..04c5975a 100644 --- a/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info +++ b/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info @@ -6,8 +6,7 @@ hidden = TRUE settings[subtheme_override] = subtheme value -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/themes/test_theme/test_theme.info b/modules/simpletest/tests/themes/test_theme/test_theme.info index 4679f32e..e88a344d 100644 --- a/modules/simpletest/tests/themes/test_theme/test_theme.info +++ b/modules/simpletest/tests/themes/test_theme/test_theme.info @@ -17,8 +17,7 @@ stylesheets[all][] = system.base.css settings[theme_test_setting] = default value -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html b/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html new file mode 100644 index 00000000..7202dd48 --- /dev/null +++ b/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html @@ -0,0 +1 @@ +Miaou \ No newline at end of file diff --git a/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info b/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info new file mode 100644 index 00000000..12f46b5c --- /dev/null +++ b/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info @@ -0,0 +1,10 @@ +name = Nyan cat engine based test theme +description = Theme for testing the module-provided theme engines. +core = 7.x +hidden = TRUE +engine = nyan_cat + +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" +project = "drupal" +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_script_test.info b/modules/simpletest/tests/update_script_test.info index 5a174fc6..2c7c5125 100644 --- a/modules/simpletest/tests/update_script_test.info +++ b/modules/simpletest/tests/update_script_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_script_test.install b/modules/simpletest/tests/update_script_test.install index 6955ef11..4024fb4a 100644 --- a/modules/simpletest/tests/update_script_test.install +++ b/modules/simpletest/tests/update_script_test.install @@ -31,6 +31,19 @@ function update_script_test_requirements($phase) { 'severity' => REQUIREMENT_ERROR, ); break; + case REQUIREMENT_INFO: + $requirements['update_script_test_stop'] = array( + 'title' => 'Update script test stop', + 'value' => 'Error', + 'description' => 'This is a requirements error provided by the update_script_test module to stop the page redirect for the info.', + 'severity' => REQUIREMENT_ERROR, + ); + $requirements['update_script_test'] = array( + 'title' => 'Update script test', + 'description' => 'This is a requirements info provided by the update_script_test module.', + 'severity' => REQUIREMENT_INFO, + ); + break; } } diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info index 4484ad46..36d36422 100644 --- a/modules/simpletest/tests/update_test_1.info +++ b/modules/simpletest/tests/update_test_1.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info index 4484ad46..36d36422 100644 --- a/modules/simpletest/tests/update_test_2.info +++ b/modules/simpletest/tests/update_test_2.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info index 4484ad46..36d36422 100644 --- a/modules/simpletest/tests/update_test_3.info +++ b/modules/simpletest/tests/update_test_3.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php index a9162813..10b9040c 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php @@ -19919,7 +19919,7 @@ 'vid' => '1', 'name' => 'vocabulary 1 (i=0)', 'description' => 'description of vocabulary 1 (i=0)', - 'help' => '', + 'help' => 'help for vocabulary 1 (i=0)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -19932,7 +19932,7 @@ 'vid' => '2', 'name' => 'vocabulary 2 (i=1)', 'description' => 'description of vocabulary 2 (i=1)', - 'help' => '', + 'help' => 'help for vocabulary 2 (i=1)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -19945,7 +19945,7 @@ 'vid' => '3', 'name' => 'vocabulary 3 (i=2)', 'description' => 'description of vocabulary 3 (i=2)', - 'help' => '', + 'help' => 'help for vocabulary 3 (i=2)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -19958,7 +19958,7 @@ 'vid' => '4', 'name' => 'vocabulary 4 (i=3)', 'description' => 'description of vocabulary 4 (i=3)', - 'help' => '', + 'help' => 'help for vocabulary 4 (i=3)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -19971,7 +19971,7 @@ 'vid' => '5', 'name' => 'vocabulary 5 (i=4)', 'description' => 'description of vocabulary 5 (i=4)', - 'help' => '', + 'help' => 'help for vocabulary 5 (i=4)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -19984,7 +19984,7 @@ 'vid' => '6', 'name' => 'vocabulary 6 (i=5)', 'description' => 'description of vocabulary 6 (i=5)', - 'help' => '', + 'help' => 'help for vocabulary 6 (i=5)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', @@ -19997,7 +19997,7 @@ 'vid' => '7', 'name' => 'vocabulary 7 (i=6)', 'description' => 'description of vocabulary 7 (i=6)', - 'help' => '', + 'help' => 'help for vocabulary 7 (i=6)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -20010,7 +20010,7 @@ 'vid' => '8', 'name' => 'vocabulary 8 (i=7)', 'description' => 'description of vocabulary 8 (i=7)', - 'help' => '', + 'help' => 'help for vocabulary 8 (i=7)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -20023,7 +20023,7 @@ 'vid' => '9', 'name' => 'vocabulary 9 (i=8)', 'description' => 'description of vocabulary 9 (i=8)', - 'help' => '', + 'help' => 'help for vocabulary 9 (i=8)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -20036,7 +20036,7 @@ 'vid' => '10', 'name' => 'vocabulary 10 (i=9)', 'description' => 'description of vocabulary 10 (i=9)', - 'help' => '', + 'help' => 'help for vocabulary 10 (i=9)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -20049,7 +20049,7 @@ 'vid' => '11', 'name' => 'vocabulary 11 (i=10)', 'description' => 'description of vocabulary 11 (i=10)', - 'help' => '', + 'help' => 'help for vocabulary 11 (i=10)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -20062,7 +20062,7 @@ 'vid' => '12', 'name' => 'vocabulary 12 (i=11)', 'description' => 'description of vocabulary 12 (i=11)', - 'help' => '', + 'help' => 'help for vocabulary 12 (i=11)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', @@ -20075,7 +20075,7 @@ 'vid' => '13', 'name' => 'vocabulary 13 (i=12)', 'description' => 'description of vocabulary 13 (i=12)', - 'help' => '', + 'help' => 'help for vocabulary 13 (i=12)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -20088,7 +20088,7 @@ 'vid' => '14', 'name' => 'vocabulary 14 (i=13)', 'description' => 'description of vocabulary 14 (i=13)', - 'help' => '', + 'help' => 'help for vocabulary 14 (i=13)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -20101,7 +20101,7 @@ 'vid' => '15', 'name' => 'vocabulary 15 (i=14)', 'description' => 'description of vocabulary 15 (i=14)', - 'help' => '', + 'help' => 'help for vocabulary 15 (i=14)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -20114,7 +20114,7 @@ 'vid' => '16', 'name' => 'vocabulary 16 (i=15)', 'description' => 'description of vocabulary 16 (i=15)', - 'help' => '', + 'help' => 'help for vocabulary 16 (i=15)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -20127,7 +20127,7 @@ 'vid' => '17', 'name' => 'vocabulary 17 (i=16)', 'description' => 'description of vocabulary 17 (i=16)', - 'help' => '', + 'help' => 'help for vocabulary 17 (i=16)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -20140,7 +20140,7 @@ 'vid' => '18', 'name' => 'vocabulary 18 (i=17)', 'description' => 'description of vocabulary 18 (i=17)', - 'help' => '', + 'help' => 'help for vocabulary 18 (i=17)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', @@ -20153,7 +20153,7 @@ 'vid' => '19', 'name' => 'vocabulary 19 (i=18)', 'description' => 'description of vocabulary 19 (i=18)', - 'help' => '', + 'help' => 'help for vocabulary 19 (i=18)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '0', @@ -20166,7 +20166,7 @@ 'vid' => '20', 'name' => 'vocabulary 20 (i=19)', 'description' => 'description of vocabulary 20 (i=19)', - 'help' => '', + 'help' => 'help for vocabulary 20 (i=19)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '1', @@ -20179,7 +20179,7 @@ 'vid' => '21', 'name' => 'vocabulary 21 (i=20)', 'description' => 'description of vocabulary 21 (i=20)', - 'help' => '', + 'help' => 'help for vocabulary 21 (i=20)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '0', @@ -20192,7 +20192,7 @@ 'vid' => '22', 'name' => 'vocabulary 22 (i=21)', 'description' => 'description of vocabulary 22 (i=21)', - 'help' => '', + 'help' => 'help for vocabulary 22 (i=21)', 'relations' => '1', 'hierarchy' => '0', 'multiple' => '1', @@ -20205,7 +20205,7 @@ 'vid' => '23', 'name' => 'vocabulary 23 (i=22)', 'description' => 'description of vocabulary 23 (i=22)', - 'help' => '', + 'help' => 'help for vocabulary 23 (i=22)', 'relations' => '1', 'hierarchy' => '1', 'multiple' => '0', @@ -20218,7 +20218,7 @@ 'vid' => '24', 'name' => 'vocabulary 24 (i=23)', 'description' => 'description of vocabulary 24 (i=23)', - 'help' => '', + 'help' => 'help for vocabulary 24 (i=23)', 'relations' => '1', 'hierarchy' => '2', 'multiple' => '1', diff --git a/modules/simpletest/tests/upgrade/drupal-6.upload.database.php b/modules/simpletest/tests/upgrade/drupal-6.upload.database.php index 46ebe2cb..3fd602af 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.upload.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.upload.database.php @@ -127,6 +127,38 @@ 'status' => '1', 'timestamp' => '1285708958', )) +// On some Drupal 6 sites, more than one file can have the same filepath. See +// https://www.drupal.org/node/1260938. +->values(array( + 'fid' => '12', + 'uid' => '1', + 'filename' => 'duplicate-name.png', + 'filepath' => 'sites/default/files/duplicate-name.png', + 'filemime' => 'image/png', + 'filesize' => '314', + 'status' => '1', + 'timestamp' => '1285708958', +)) +->values(array( + 'fid' => '13', + 'uid' => '1', + 'filename' => 'duplicate-name.png', + 'filepath' => 'sites/default/files/duplicate-name.png', + 'filemime' => 'image/png', + 'filesize' => '315', + 'status' => '1', + 'timestamp' => '1285708958', +)) +->values(array( + 'fid' => '14', + 'uid' => '1', + 'filename' => 'duplicate-name.png', + 'filepath' => 'sites/default/files/duplicate-name.png', + 'filemime' => 'image/png', + 'filesize' => '316', + 'status' => '1', + 'timestamp' => '1285708958', +)) ->execute(); db_insert('node')->fields(array( @@ -196,6 +228,23 @@ 'sticky' => '0', 'tnid' => '0', 'translate' => '0', +)) +->values(array( + 'nid' => '41', + 'vid' => '55', + 'type' => 'page', + 'language' => '', + 'title' => 'node title 41 revision 55', + 'uid' => '1', + 'status' => '1', + 'created' => '1285709012', + 'changed' => '1285709012', + 'comment' => '0', + 'promote' => '0', + 'moderate' => '0', + 'sticky' => '0', + 'tnid' => '0', + 'translate' => '0', )) ->execute(); @@ -253,6 +302,28 @@ 'log' => '', 'timestamp' => '1285709012', 'format' => '1', +)) +->values(array( + 'nid' => '41', + 'vid' => '54', + 'uid' => '1', + 'title' => 'node title 41 revision 54', + 'body' => "Attachments:\r\nduplicate-name.png", + 'teaser' => "Attachments:\r\nduplicate-name.png", + 'log' => '', + 'timestamp' => '1285709012', + 'format' => '1', +)) +->values(array( + 'nid' => '41', + 'vid' => '55', + 'uid' => '1', + 'title' => 'node title 41 revision 55', + 'body' => "Attachments:\r\nduplicate-name.png\r\nduplicate-name.png", + 'teaser' => "Attachments:\r\nduplicate-name.png\r\nduplicate-name.png", + 'log' => '', + 'timestamp' => '1285709012', + 'format' => '1', )) ->execute(); @@ -415,6 +486,30 @@ 'list' => '1', 'weight' => '0', )) +->values(array( + 'fid' => '12', + 'nid' => '41', + 'vid' => '54', + 'description' => 'duplicate-name.png', + 'list' => '1', + 'weight' => '0', +)) +->values(array( + 'fid' => '13', + 'nid' => '41', + 'vid' => '55', + 'description' => 'first description', + 'list' => '0', + 'weight' => '0', +)) +->values(array( + 'fid' => '14', + 'nid' => '41', + 'vid' => '55', + 'description' => 'second description', + 'list' => '1', + 'weight' => '0', +)) ->execute(); // Add series of entries for invalid node vids to the {upload} table. @@ -431,7 +526,7 @@ ->values(array( 'fid' => $i, 'nid' => '40', - 'vid' => 24 + $i, + 'vid' => 26 + $i, 'description' => 'crazy-basename.png', 'list' => '1', 'weight' => '0', @@ -440,7 +535,7 @@ ->values(array( 'fid' => 2, 'nid' => '40', - 'vid' => 24 + $i + 1, + 'vid' => 26 + $i + 1, 'description' => 'crazy-basename.png', 'list' => '1', 'weight' => '0', diff --git a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test index 58a4d5c1..51402ed7 100644 --- a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test +++ b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test @@ -74,9 +74,10 @@ class UpgradePathTaxonomyTestCase extends UpgradePathTestCase { $this->assertEqual($voc_keys, $inst_keys, 'Node type page has instances for every vocabulary.'); // Ensure instance variables are getting through. - foreach ($instances as $instance) { - $this->assertTrue(isset($instance['required']), 'The required setting was preserved during the upgrade path.'); - $this->assertTrue($instance['description'], 'The description was preserved during the upgrade path'); + foreach (array_unique($instances) as $instance) { + $field_instance = field_info_instance('node', $instance, 'page'); + $this->assertTrue(isset($field_instance['required']), 'The required setting was preserved during the upgrade path.'); + $this->assertTrue($field_instance['description'], 'The description was preserved during the upgrade path'); } // Node type 'story' was not explicitly in $vocabulary->nodes but diff --git a/modules/simpletest/tests/upgrade/upgrade.upload.test b/modules/simpletest/tests/upgrade/upgrade.upload.test index be352bd4..dfa94a00 100644 --- a/modules/simpletest/tests/upgrade/upgrade.upload.test +++ b/modules/simpletest/tests/upgrade/upgrade.upload.test @@ -64,12 +64,35 @@ class UploadUpgradePathTestCase extends UpgradePathTestCase { } $this->assertIdentical($filenames, $recorded_filenames, 'The uploaded files are present in the same order after the upgrade.'); } + // Test for the file with repeating basename to only have the streaming // path replaced. $node = node_load(40, 53); $repeated_basename_file = $node->upload[LANGUAGE_NONE][4]; $this->assertEqual($repeated_basename_file['uri'], 'private://drupal-6/file/directory/path/crazy-basename.png', "The file with the repeated basename path only had the stream portion replaced"); + // Ensure that filepaths are deduplicated. + $node0 = node_load(41, 54); + $node1 = node_load(41, 55); + // Ensure that both revisions point to the same file ID. + $items0 = field_get_items('node', $node0, 'upload'); + $this->assertEqual(count($items0), 1); + $items1 = field_get_items('node', $node1, 'upload'); + $this->assertEqual(count($items1), 2); + $this->assertEqual($items0[0]['fid'], $items1[0]['fid']); + $this->assertEqual($items0[0]['fid'], $items1[1]['fid']); + // The revision with more than one reference to the same file should retain + // the original settings for each reference. + $this->assertEqual($items1[0]['description'], 'first description'); + $this->assertEqual($items1[0]['display'], 0); + $this->assertEqual($items1[1]['description'], 'second description'); + $this->assertEqual($items1[1]['display'], 1); + // Ensure that the latest version of the files are used. + $this->assertEqual($items1[0]['filesize'], 316); + $this->assertEqual($items1[1]['filesize'], 316); + // No duplicate files should remain on the Drupal 7 site. + $this->assertEqual(0, db_query("SELECT COUNT(*) FROM {file_managed} GROUP BY uri HAVING COUNT(fid) > 1")->fetchField()); + // Make sure the file settings were properly migrated. $d6_file_directory_temp = '/drupal-6/file/directory/temp'; $d6_file_directory_path = '/drupal-6/file/directory/path'; diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info index 8af9f248..e4d1812f 100644 --- a/modules/simpletest/tests/url_alter_test.info +++ b/modules/simpletest/tests/url_alter_test.info @@ -5,8 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/simpletest/tests/xmlrpc.test b/modules/simpletest/tests/xmlrpc.test index 1a9ef234..bb74f059 100644 --- a/modules/simpletest/tests/xmlrpc.test +++ b/modules/simpletest/tests/xmlrpc.test @@ -246,4 +246,38 @@ class XMLRPCMessagesTestCase extends DrupalWebTestCase { $this->assertEqual($removed, 'system.methodSignature', 'Hiding builting system.methodSignature with hook_xmlrpc_alter works'); } + /** + * Test limits on system.multicall that can prevent brute-force attacks. + */ + function testMulticallLimit() { + $url = url(NULL, array('absolute' => TRUE)) . 'xmlrpc.php'; + $multicall_args = array(); + $num_method_calls = 10; + for ($i = 0; $i < $num_method_calls; $i++) { + $struct = array('i' => $i); + $multicall_args[] = array('methodName' => 'validator1.echoStructTest', 'params' => array($struct)); + } + // Test limits of 1, 5, 9, 13. + for ($limit = 1; $limit < $num_method_calls + 4; $limit += 4) { + variable_set('xmlrpc_multicall_duplicate_method_limit', $limit); + $results = xmlrpc($url, array('system.multicall' => array($multicall_args))); + $this->assertEqual($num_method_calls, count($results)); + for ($i = 0; $i < min($limit, $num_method_calls); $i++) { + $x = array_shift($results); + $this->assertTrue(empty($x->is_error), "Result $i is not an error"); + $this->assertEqual($multicall_args[$i]['params'][0], $x); + } + for (; $i < $num_method_calls; $i++) { + $x = array_shift($results); + $this->assertFalse(empty($x->is_error), "Result $i is an error"); + $this->assertEqual(-156579, $x->code); + } + } + variable_set('xmlrpc_multicall_duplicate_method_limit', -1); + $results = xmlrpc($url, array('system.multicall' => array($multicall_args))); + $this->assertEqual($num_method_calls, count($results)); + foreach ($results as $i => $x) { + $this->assertTrue(empty($x->is_error), "Result $i is not an error"); + } + } } diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info index 0cf5bbac..70c09ca8 100644 --- a/modules/simpletest/tests/xmlrpc_test.info +++ b/modules/simpletest/tests/xmlrpc_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info index 92756356..8d711697 100644 --- a/modules/statistics/statistics.info +++ b/modules/statistics/statistics.info @@ -6,8 +6,7 @@ core = 7.x files[] = statistics.test configure = admin/config/system/statistics -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index f665a14f..356a0e25 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -118,10 +118,9 @@ function statistics_node_view($node, $view_mode) { // Attach Ajax node count statistics if configured. if (variable_get('statistics_count_content_views', 0) && variable_get('statistics_count_content_views_ajax', 0)) { if (!empty($node->nid) && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) { - $node->content['#attached']['js'] = array( - drupal_get_path('module', 'statistics') . '/statistics.js' => array( - 'scope' => 'footer' - ), + $statistics = drupal_get_path('module', 'statistics') . '/statistics.js'; + $node->content['#attached']['js'][$statistics] = array( + 'scope' => 'footer', ); $settings = array('data' => array('nid' => $node->nid), 'url' => url(drupal_get_path('module', 'statistics') . '/statistics.php')); $node->content['#attached']['js'][] = array( @@ -246,7 +245,7 @@ function statistics_user_delete($account) { * Implements hook_cron(). */ function statistics_cron() { - $statistics_timestamp = variable_get('statistics_day_timestamp', ''); + $statistics_timestamp = variable_get('statistics_day_timestamp', 0); if ((REQUEST_TIME - $statistics_timestamp) >= 86400) { // Reset day counts. diff --git a/modules/statistics/statistics.php b/modules/statistics/statistics.php index f00e0397..48340c89 100644 --- a/modules/statistics/statistics.php +++ b/modules/statistics/statistics.php @@ -15,17 +15,19 @@ include_once DRUPAL_ROOT . '/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES); if (variable_get('statistics_count_content_views', 0) && variable_get('statistics_count_content_views_ajax', 0)) { - $nid = $_POST['nid']; - if (is_numeric($nid)) { - db_merge('node_counter') - ->key(array('nid' => $nid)) - ->fields(array( - 'daycount' => 1, - 'totalcount' => 1, - 'timestamp' => REQUEST_TIME, - )) - ->expression('daycount', 'daycount + 1') - ->expression('totalcount', 'totalcount + 1') - ->execute(); + if (isset($_POST['nid'])) { + $nid = $_POST['nid']; + if (is_numeric($nid)) { + db_merge('node_counter') + ->key(array('nid' => $nid)) + ->fields(array( + 'daycount' => 1, + 'totalcount' => 1, + 'timestamp' => REQUEST_TIME, + )) + ->expression('daycount', 'daycount + 1') + ->expression('totalcount', 'totalcount + 1') + ->execute(); + } } } diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index 7e038d61..50accd74 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -35,7 +35,7 @@ class StatisticsTestCase extends DrupalWebTestCase { 'title' => 'test', 'path' => 'node/1', 'url' => 'http://example.com', - 'hostname' => '192.168.1.1', + 'hostname' => '1.2.3.3', 'uid' => 0, 'sid' => 10, 'timer' => 10, @@ -268,7 +268,7 @@ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase { */ function testIPAddressBlocking() { // IP address for testing. - $test_ip_address = '192.168.1.1'; + $test_ip_address = '1.2.3.3'; // Verify the IP address from accesslog appears on the top visitors page // and that a 'block IP address' link is displayed. diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info index e0b8a44a..5d3304ec 100644 --- a/modules/syslog/syslog.info +++ b/modules/syslog/syslog.info @@ -6,8 +6,7 @@ core = 7.x files[] = syslog.test configure = admin/config/development/logging -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/system/image.gd.inc b/modules/system/image.gd.inc index 913b0de5..3d0797e4 100644 --- a/modules/system/image.gd.inc +++ b/modules/system/image.gd.inc @@ -116,38 +116,62 @@ function image_gd_rotate(stdClass $image, $degrees, $background = NULL) { return FALSE; } - $width = $image->info['width']; - $height = $image->info['height']; + // PHP 5.5 GD bug: https://bugs.php.net/bug.php?id=65148: To prevent buggy + // behavior on negative multiples of 90 degrees we convert any negative + // angle to a positive one between 0 and 360 degrees. + $degrees -= floor($degrees / 360) * 360; - // Convert the hexadecimal background value to a color index value. + // Convert the hexadecimal background value to a RGBA array. if (isset($background)) { - $rgb = array(); - for ($i = 16; $i >= 0; $i -= 8) { - $rgb[] = (($background >> $i) & 0xFF); - } - $background = imagecolorallocatealpha($image->resource, $rgb[0], $rgb[1], $rgb[2], 0); + $background = array( + 'red' => $background >> 16 & 0xFF, + 'green' => $background >> 8 & 0xFF, + 'blue' => $background & 0xFF, + 'alpha' => 0, + ); } - // Set the background color as transparent if $background is NULL. else { - // Get the current transparent color. - $background = imagecolortransparent($image->resource); - - // If no transparent colors, use white. - if ($background == 0) { - $background = imagecolorallocatealpha($image->resource, 255, 255, 255, 0); - } + // Background color is not specified: use transparent white as background. + $background = array( + 'red' => 255, + 'green' => 255, + 'blue' => 255, + 'alpha' => 127 + ); } + // Store the color index for the background as that is what GD uses. + $background_idx = imagecolorallocatealpha($image->resource, $background['red'], $background['green'], $background['blue'], $background['alpha']); + // Images are assigned a new color palette when rotating, removing any // transparency flags. For GIF images, keep a record of the transparent color. if ($image->info['extension'] == 'gif') { - $transparent_index = imagecolortransparent($image->resource); - if ($transparent_index != 0) { - $transparent_gif_color = imagecolorsforindex($image->resource, $transparent_index); + // GIF does not work with a transparency channel, but can define 1 color + // in its palette to act as transparent. + + // Get the current transparent color, if any. + $gif_transparent_id = imagecolortransparent($image->resource); + if ($gif_transparent_id !== -1) { + // The gif already has a transparent color set: remember it to set it on + // the rotated image as well. + $transparent_gif_color = imagecolorsforindex($image->resource, $gif_transparent_id); + + if ($background['alpha'] >= 127) { + // We want a transparent background: use the color already set to act + // as transparent, as background. + $background_idx = $gif_transparent_id; + } + } + else { + // The gif does not currently have a transparent color set. + if ($background['alpha'] >= 127) { + // But as the background is transparent, it should get one. + $transparent_gif_color = $background; + } } } - $image->resource = imagerotate($image->resource, 360 - $degrees, $background); + $image->resource = imagerotate($image->resource, 360 - $degrees, $background_idx); // GIFs need to reassign the transparent color after performing the rotate. if (isset($transparent_gif_color)) { diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 0f525c6c..cdcc78fb 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1856,7 +1856,7 @@ function system_image_toolkit_settings() { if (count($toolkits_available) == 0) { variable_del('image_toolkit'); $form['image_toolkit_help'] = array( - '#markup' => t("No image toolkits were detected. Drupal includes support for PHP's built-in image processing functions but they were not detected on this system. You should consult your system administrator to have them enabled, or try using a third party toolkit.", array('gd-link' => url('http://php.net/gd'))), + '#markup' => t("No image toolkits were detected. Drupal includes support for PHP's built-in image processing functions but they were not detected on this system. You should consult your system administrator to have them enabled, or try using a third party toolkit.", array('!gd-link' => url('http://php.net/gd'))), ); return $form; } @@ -2202,6 +2202,11 @@ function system_add_date_format_type_form_submit($form, &$form_state) { * Return the date for a given format string via Ajax. */ function system_date_time_lookup() { + // This callback is protected with a CSRF token because user input from the + // query string is reflected in the output. + if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], 'admin/config/regional/date-time/formats/lookup')) { + return MENU_ACCESS_DENIED; + } $result = format_date(REQUEST_TIME, 'custom', $_GET['format']); drupal_json_output($result); } @@ -2592,6 +2597,8 @@ function theme_status_report($variables) { if (empty($requirement['#type'])) { $severity = $severities[isset($requirement['severity']) ? (int) $requirement['severity'] : REQUIREMENT_OK]; $severity['icon'] = '
' . $severity['title'] . '
';
+ // The requirement's 'value' key is optional, provide a default value.
+ $requirement['value'] = isset($requirement['value']) ? $requirement['value'] : '';
// Output table row(s)
if (!empty($requirement['description'])) {
@@ -2875,13 +2882,14 @@ function system_date_time_formats() {
* Allow users to add additional date formats.
*/
function system_configure_date_formats_form($form, &$form_state, $dfid = 0) {
+ $ajax_path = 'admin/config/regional/date-time/formats/lookup';
$js_settings = array(
'type' => 'setting',
'data' => array(
'dateTime' => array(
'date-format' => array(
'text' => t('Displayed as'),
- 'lookup' => url('admin/config/regional/date-time/formats/lookup'),
+ 'lookup' => url($ajax_path, array('query' => array('token' => drupal_get_token($ajax_path)))),
),
),
),
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index d6cbc769..f1855b96 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -113,21 +113,21 @@ function hook_hook_info_alter(&$hooks) {
* translation handlers. Array keys are the module names, array values
* can be any data structure the module uses to provide field translation.
* Any empty value disallows the module to appear as a translation handler.
- * - entity keys: An array describing how the Field API can extract the
- * information it needs from the objects of the type. Elements:
+ * - entity keys: (optional) An array describing how the Field API can extract
+ * the information it needs from the objects of the type. Elements:
* - id: The name of the property that contains the primary id of the
* entity. Every entity object passed to the Field API must have this
* property and its value must be numeric.
* - revision: The name of the property that contains the revision id of
* the entity. The Field API assumes that all revision ids are unique
* across all entities of a type. This entry can be omitted if the
- * entities of this type are not versionable.
+ * entities of this type are not versionable. Defaults to an empty string.
* - bundle: The name of the property that contains the bundle name for the
* entity. The bundle name defines which set of fields are attached to
* the entity (e.g. what nodes call "content type"). This entry can be
* omitted if this entity type exposes a single bundle (all entities have
* the same collection of fields). The name of this single bundle will be
- * the same as the entity type.
+ * the same as the entity type. Defaults to an empty string.
* - label: The name of the property that contains the entity label. For
* example, if the entity's label is located in $entity->subject, then
* 'subject' should be specified here. If complex logic is required to
@@ -1797,6 +1797,8 @@ function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
* the $form_id input matched your module's format for dynamically-generated
* form IDs, and if so, act appropriately.
*
+ * Third, forms defined in classes can be defined this way.
+ *
* @param $form_id
* The unique string identifying the desired form.
* @param $args
@@ -1807,19 +1809,22 @@ function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
* @return
* An associative array whose keys define form_ids and whose values are an
* associative array defining the following keys:
- * - callback: The name of the form builder function to invoke. This will be
- * used for the base form ID, for example, to target a base form using
- * hook_form_BASE_FORM_ID_alter().
+ * - callback: The callable returning the form array. If it is the name of
+ * the form builder function then this will be used for the base
+ * form ID, for example, to target a base form using
+ * hook_form_BASE_FORM_ID_alter(). Otherwise use the base_form_id key to
+ * define the base form ID.
* - callback arguments: (optional) Additional arguments to pass to the
* function defined in 'callback', which are prepended to $args.
- * - wrapper_callback: (optional) The name of a form builder function to
- * invoke before the form builder defined in 'callback' is invoked. This
- * wrapper callback may prepopulate the $form array with form elements,
- * which will then be already contained in the $form that is passed on to
- * the form builder defined in 'callback'. For example, a wrapper callback
- * could setup wizard-alike form buttons that are the same for a variety of
- * forms that belong to the wizard, which all share the same wrapper
- * callback.
+ * - base_form_id: The base form ID can be specified explicitly. This is
+ * required when callback is not the name of a function.
+ * - wrapper_callback: (optional) Any callable to invoke before the form
+ * builder defined in 'callback' is invoked. This wrapper callback may
+ * prepopulate the $form array with form elements, which will then be
+ * already contained in the $form that is passed on to the form builder
+ * defined in 'callback'. For example, a wrapper callback could setup
+ * wizard-like form buttons that are the same for a variety of forms that
+ * belong to the wizard, which all share the same wrapper callback.
*/
function hook_forms($form_id, $args) {
// Simply reroute the (non-existing) $form_id 'mymodule_first_form' to
@@ -1843,6 +1848,15 @@ function hook_forms($form_id, $args) {
'wrapper_callback' => 'mymodule_main_form_wrapper',
);
+ // Build a form with a static class callback.
+ $forms['mymodule_class_generated_form'] = array(
+ // This will call: MyClass::generateMainForm().
+ 'callback' => array('MyClass', 'generateMainForm'),
+ // The base_form_id is required when the callback is a static function in
+ // a class. This can also be used to keep newer code backwards compatible.
+ 'base_form_id' => 'mymodule_main_form',
+ );
+
return $forms;
}
@@ -2036,6 +2050,22 @@ function hook_system_theme_info() {
return $themes;
}
+/**
+ * Return additional theme engines provided by modules.
+ *
+ * This hook is invoked from _system_rebuild_theme_data() and allows modules to
+ * register additional theme engines outside of the regular 'themes/engines'
+ * directories of a Drupal installation.
+ *
+ * @return
+ * An associative array. Each key is the system name of a theme engine and
+ * each value is the corresponding path to the theme engine's .engine file.
+ */
+function hook_system_theme_engine_info() {
+ $theme_engines['izumi'] = drupal_get_path('module', 'mymodule') . '/izumi/izumi.engine';
+ return $theme_engines;
+}
+
/**
* Alter the information parsed from module and theme .info files
*
@@ -2632,6 +2662,8 @@ function hook_flush_caches() {
* module_enable() for a detailed description of the order in which install and
* enable hooks are invoked.
*
+ * This hook should be implemented in a .module file, not in an .install file.
+ *
* @param $modules
* An array of the modules that were installed.
*
@@ -3173,7 +3205,9 @@ function hook_requirements($phase) {
* creation and alteration of the supported database engines.
*
* See the Schema API Handbook at http://drupal.org/node/146843 for details on
- * schema definition structures.
+ * schema definition structures. Note that foreign key definitions are for
+ * documentation purposes only; foreign keys are not created in the database,
+ * nor are they enforced by Drupal.
*
* @return array
* A schema definition structure array. For each element of the
@@ -3225,6 +3259,8 @@ function hook_schema() {
'nid_vid' => array('nid', 'vid'),
'vid' => array('vid'),
),
+ // For documentation purposes only; foreign keys are not created in the
+ // database.
'foreign keys' => array(
'node_revision' => array(
'table' => 'node_revision',
diff --git a/modules/system/system.info b/modules/system/system.info
index 97f3bdf3..730dff6f 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -12,8 +12,7 @@ files[] = system.test
required = TRUE
configure = admin/config/system
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.39"
+; Information added by Drupal.org packaging script on 2018-10-17
+version = "7.60"
project = "drupal"
-datestamp = "1440020197"
-
+datestamp = "1539816636"
diff --git a/modules/system/system.install b/modules/system/system.install
index 89e7d5b8..2aab53e7 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -170,7 +170,7 @@ function system_requirements($phase) {
if (empty($drivers)) {
$database_ok = FALSE;
$pdo_message = $t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that Drupal supports.', array(
- '@drupal-databases' => 'http://drupal.org/node/270#database',
+ '@drupal-databases' => 'https://www.drupal.org/requirements/database',
));
}
// Make sure the native PDO extension is available, not the older PEAR
@@ -206,6 +206,12 @@ function system_requirements($phase) {
);
}
+ // Test database-specific multi-byte UTF-8 related requirements.
+ $charset_requirements = _system_check_db_utf8mb4_requirements($phase);
+ if (!empty($charset_requirements)) {
+ $requirements['database_charset'] = $charset_requirements;
+ }
+
// Test PHP memory_limit
$memory_limit = ini_get('memory_limit');
$requirements['php_memory_limit'] = array(
@@ -527,6 +533,75 @@ function system_requirements($phase) {
return $requirements;
}
+/**
+ * Checks whether the requirements for multi-byte UTF-8 support are met.
+ *
+ * @param string $phase
+ * The hook_requirements() stage.
+ *
+ * @return array
+ * A requirements array with the result of the charset check.
+ */
+function _system_check_db_utf8mb4_requirements($phase) {
+ global $install_state;
+ // In the requirements check of the installer, skip the utf8mb4 check unless
+ // the database connection info has been preconfigured by hand with valid
+ // information before running the installer, as otherwise we cannot get a
+ // valid database connection object.
+ if (isset($install_state['settings_verified']) && !$install_state['settings_verified']) {
+ return array();
+ }
+
+ $connection = Database::getConnection();
+ $t = get_t();
+ $requirements['title'] = $t('Database 4 byte UTF-8 support');
+
+ $utf8mb4_configurable = $connection->utf8mb4IsConfigurable();
+ $utf8mb4_active = $connection->utf8mb4IsActive();
+ $utf8mb4_supported = $connection->utf8mb4IsSupported();
+ $driver = $connection->driver();
+ $documentation_url = 'https://www.drupal.org/node/2754539';
+
+ if ($utf8mb4_active) {
+ if ($utf8mb4_supported) {
+ if ($phase != 'install' && $utf8mb4_configurable && !variable_get('drupal_all_databases_are_utf8mb4', FALSE)) {
+ // Supported, active, and configurable, but not all database tables
+ // have been converted yet.
+ $requirements['value'] = $t('Enabled, but database tables need conversion');
+ $requirements['description'] = $t('Please convert all database tables to utf8mb4 prior to enabling it in settings.php. See the documentation on adding 4 byte UTF-8 support for more information.', array('@url' => $documentation_url));
+ $requirements['severity'] = REQUIREMENT_ERROR;
+ }
+ else {
+ // Supported, active.
+ $requirements['value'] = $t('Enabled');
+ $requirements['description'] = $t('4 byte UTF-8 for @driver is enabled.', array('@driver' => $driver));
+ $requirements['severity'] = REQUIREMENT_OK;
+ }
+ }
+ else {
+ // Not supported, active.
+ $requirements['value'] = $t('Not supported');
+ $requirements['description'] = $t('4 byte UTF-8 for @driver is activated, but not supported on your system. Please turn this off in settings.php, or ensure that all database-related requirements are met. See the documentation on adding 4 byte UTF-8 support for more information.', array('@driver' => $driver, '@url' => $documentation_url));
+ $requirements['severity'] = REQUIREMENT_ERROR;
+ }
+ }
+ else {
+ if ($utf8mb4_supported) {
+ // Supported, not active.
+ $requirements['value'] = $t('Not enabled');
+ $requirements['description'] = $t('4 byte UTF-8 for @driver is not activated, but it is supported on your system. It is recommended that you enable this to allow 4-byte UTF-8 input such as emojis, Asian symbols and mathematical symbols to be stored correctly. See the documentation on adding 4 byte UTF-8 support for more information.', array('@driver' => $driver, '@url' => $documentation_url));
+ $requirements['severity'] = REQUIREMENT_INFO;
+ }
+ else {
+ // Not supported, not active.
+ $requirements['value'] = $t('Disabled');
+ $requirements['description'] = $t('4 byte UTF-8 for @driver is disabled. See the documentation on adding 4 byte UTF-8 support for more information.', array('@driver' => $driver, '@url' => $documentation_url));
+ $requirements['severity'] = REQUIREMENT_INFO;
+ }
+ }
+ return $requirements;
+}
+
/**
* Implements hook_install().
*/
@@ -542,6 +617,9 @@ function system_install() {
module_list(TRUE);
module_implements('', FALSE, TRUE);
+ // Ensure the schema versions are not based on a previous module list.
+ drupal_static_reset('drupal_get_schema_versions');
+
// Load system theme data appropriately.
system_rebuild_theme_data();
@@ -810,6 +888,7 @@ function system_schema() {
'type' => 'varchar',
'length' => 100,
'not null' => TRUE,
+ 'binary' => TRUE,
),
'type' => array(
'description' => 'The date format type, e.g. medium.',
@@ -2813,6 +2892,16 @@ function system_update_7061(&$sandbox) {
->from($query)
->execute();
+ // Retrieve a list of duplicate files with the same filepath. Only the
+ // most-recently uploaded of these will be moved to the new {file_managed}
+ // table (and all references will be updated to point to it), since
+ // duplicate file URIs are not allowed in Drupal 7.
+ // Since the Drupal 6 to 7 upgrade path leaves the {files} table behind
+ // after it's done, custom or contributed modules which need to migrate
+ // file references of their own can use a similar query to determine the
+ // file IDs that duplicate filepaths were mapped to.
+ $sandbox['duplicate_filepath_fids_to_use'] = db_query("SELECT filepath, MAX(fid) FROM {files} GROUP BY filepath HAVING COUNT(*) > 1")->fetchAllKeyed();
+
// Initialize batch update information.
$sandbox['progress'] = 0;
$sandbox['last_vid_processed'] = -1;
@@ -2842,6 +2931,16 @@ function system_update_7061(&$sandbox) {
continue;
}
+ // If this file has a duplicate filepath, replace it with the
+ // most-recently uploaded file that has the same filepath.
+ if (isset($sandbox['duplicate_filepath_fids_to_use'][$file['filepath']]) && $record->fid != $sandbox['duplicate_filepath_fids_to_use'][$file['filepath']]) {
+ $file = db_select('files', 'f')
+ ->fields('f', array('fid', 'uid', 'filename', 'filepath', 'filemime', 'filesize', 'status', 'timestamp'))
+ ->condition('f.fid', $sandbox['duplicate_filepath_fids_to_use'][$file['filepath']])
+ ->execute()
+ ->fetchAssoc();
+ }
+
// Add in the file information from the upload table.
$file['description'] = $record->description;
$file['display'] = $record->list;
@@ -3167,6 +3266,35 @@ function system_update_7079() {
db_change_field('file_managed', 'filesize', 'filesize', $spec);
}
+/**
+ * Convert the 'format' column in {date_format_locale} to case sensitive varchar.
+ */
+function system_update_7080() {
+ $spec = array(
+ 'description' => 'The date format string.',
+ 'type' => 'varchar',
+ 'length' => 100,
+ 'not null' => TRUE,
+ 'binary' => TRUE,
+ );
+ db_change_field('date_format_locale', 'format', 'format', $spec);
+}
+
+/**
+ * Remove the Drupal 6 default install profile if it is still in the database.
+ */
+function system_update_7081() {
+ // Sites which used the default install profile in Drupal 6 and then updated
+ // to Drupal 7.44 or earlier will still have a record of this install profile
+ // in the database that needs to be deleted.
+ db_delete('system')
+ ->condition('filename', 'profiles/default/default.profile')
+ ->condition('type', 'module')
+ ->condition('status', 0)
+ ->condition('schema_version', 0)
+ ->execute();
+}
+
/**
* @} End of "defgroup updates-7.x-extra".
* The next series of updates should start at 8000.
diff --git a/modules/system/system.js b/modules/system/system.js
index 910fb5d3..c0e76d38 100644
--- a/modules/system/system.js
+++ b/modules/system/system.js
@@ -105,7 +105,7 @@ Drupal.behaviors.dateTime = {
// Attach keyup handler to custom format inputs.
$('input' + source, context).once('date-time').keyup(function () {
var input = $(this);
- var url = fieldSettings.lookup + (/\?q=/.test(fieldSettings.lookup) ? '&format=' : '?format=') + encodeURIComponent(input.val());
+ var url = fieldSettings.lookup + (/\?/.test(fieldSettings.lookup) ? '&format=' : '?format=') + encodeURIComponent(input.val());
$.getJSON(url, function (data) {
$(suffix).empty().append(' ' + fieldSettings.text + ': ' + data + '');
});
diff --git a/modules/system/system.mail.inc b/modules/system/system.mail.inc
index 443e5740..9a17f55f 100644
--- a/modules/system/system.mail.inc
+++ b/modules/system/system.mail.inc
@@ -70,7 +70,9 @@ class DefaultMailSystem implements MailSystemInterface {
// hosts. The return value of this method will still indicate whether mail
// was sent successfully.
if (!isset($_SERVER['WINDIR']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Win32') === FALSE) {
- if (isset($message['Return-Path']) && !ini_get('safe_mode')) {
+ // We validate the return path, unless it is equal to the site mail, which
+ // we assume to be safe.
+ if (isset($message['Return-Path']) && !ini_get('safe_mode') && (variable_get('site_mail', ini_get('sendmail_from')) === $message['Return-Path'] || self::_isShellSafe($message['Return-Path']))) {
// On most non-Windows systems, the "-f" option to the sendmail command
// is used to set the Return-Path. There is no space between -f and
// the value of the return path.
@@ -109,6 +111,36 @@ class DefaultMailSystem implements MailSystemInterface {
}
return $mail_result;
}
+
+ /**
+ * Disallows potentially unsafe shell characters.
+ *
+ * Functionally similar to PHPMailer::isShellSafe() which resulted from
+ * CVE-2016-10045. Note that escapeshellarg and escapeshellcmd are inadequate
+ * for this purpose.
+ *
+ * @param string $string
+ * The string to be validated.
+ *
+ * @return bool
+ * True if the string is shell-safe.
+ *
+ * @see https://github.com/PHPMailer/PHPMailer/issues/924
+ * @see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.phpmailer.php#L1430
+ *
+ * @todo Rename to ::isShellSafe() and/or discuss whether this is the correct
+ * location for this helper.
+ */
+ protected static function _isShellSafe($string) {
+ if (escapeshellcmd($string) !== $string || !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))) {
+ return FALSE;
+ }
+ if (preg_match('/[^a-zA-Z0-9@_\-.]/', $string) !== 0) {
+ return FALSE;
+ }
+ return TRUE;
+ }
+
}
/**
diff --git a/modules/system/system.module b/modules/system/system.module
index 284597f8..f891998e 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2417,6 +2417,10 @@ function _system_rebuild_module_data() {
// Merge in defaults and save.
$modules[$key]->info = $module->info + $defaults;
+ // The "name" key is required, but to avoid a fatal error in the menu system
+ // we set a reasonable default if it is not provided.
+ $modules[$key]->info += array('name' => $key);
+
// Prefix stylesheets and scripts with module path.
$path = dirname($module->uri);
if (isset($module->info['stylesheets'])) {
@@ -2523,6 +2527,16 @@ function _system_rebuild_theme_data() {
// Find theme engines
$engines = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.engine$/', 'themes/engines');
+ // Allow modules to add further theme engines.
+ if ($module_engines = module_invoke_all('system_theme_engine_info')) {
+ foreach ($module_engines as $name => $theme_engine_path) {
+ $engines[$name] = (object) array(
+ 'uri' => $theme_engine_path,
+ 'filename' => basename($theme_engine_path),
+ 'name' => $name,
+ );
+ }
+ }
// Set defaults for theme info.
$defaults = array(
@@ -2552,6 +2566,10 @@ function _system_rebuild_theme_data() {
$themes[$key]->filename = $theme->uri;
$themes[$key]->info = drupal_parse_info_file($theme->uri) + $defaults;
+ // The "name" key is required, but to avoid a fatal error in the menu system
+ // we set a reasonable default if it is not provided.
+ $themes[$key]->info += array('name' => $key);
+
// Add the info file modification time, so it becomes available for
// contributed modules to use for ordering theme lists.
$themes[$key]->info['mtime'] = filemtime($theme->uri);
@@ -2703,10 +2721,17 @@ function system_find_base_themes($themes, $key, $used_keys = array()) {
* @param $show
* Possible values: REGIONS_ALL or REGIONS_VISIBLE. Visible excludes hidden
* regions.
- * @return
- * An array of regions in the form $region['name'] = 'description'.
+ * @param bool $labels
+ * (optional) Boolean to specify whether the human readable machine names
+ * should be returned or not. Defaults to TRUE, but calling code can set
+ * this to FALSE for better performance, if it only needs machine names.
+ *
+ * @return array
+ * An associative array of regions in the form $region['name'] = 'description'
+ * if $labels is set to TRUE, or $region['name'] = 'name', if $labels is set
+ * to FALSE.
*/
-function system_region_list($theme_key, $show = REGIONS_ALL) {
+function system_region_list($theme_key, $show = REGIONS_ALL, $labels = TRUE) {
$themes = list_themes();
if (!isset($themes[$theme_key])) {
return array();
@@ -2717,10 +2742,14 @@ function system_region_list($theme_key, $show = REGIONS_ALL) {
// If requested, suppress hidden regions. See block_admin_display_form().
foreach ($info['regions'] as $name => $label) {
if ($show == REGIONS_ALL || !isset($info['regions_hidden']) || !in_array($name, $info['regions_hidden'])) {
- $list[$name] = t($label);
+ if ($labels) {
+ $list[$name] = t($label);
+ }
+ else {
+ $list[$name] = $name;
+ }
}
}
-
return $list;
}
@@ -2741,12 +2770,13 @@ function system_system_info_alter(&$info, $file, $type) {
*
* @param $theme
* The name of a theme.
+ *
* @return
* A string that is the region name.
*/
function system_default_region($theme) {
- $regions = array_keys(system_region_list($theme, REGIONS_VISIBLE));
- return isset($regions[0]) ? $regions[0] : '';
+ $regions = system_region_list($theme, REGIONS_VISIBLE, FALSE);
+ return $regions ? reset($regions) : '';
}
/**
@@ -2813,7 +2843,7 @@ function system_settings_form_submit($form, &$form_state) {
function _system_sort_requirements($a, $b) {
if (!isset($a['weight'])) {
if (!isset($b['weight'])) {
- return strcmp($a['title'], $b['title']);
+ return strcasecmp($a['title'], $b['title']);
}
return -$b['weight'];
}
@@ -2869,7 +2899,7 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
// Prepare cancel link.
if (isset($_GET['destination'])) {
- $options = drupal_parse_url(urldecode($_GET['destination']));
+ $options = drupal_parse_url($_GET['destination']);
}
elseif (is_array($path)) {
$options = $path;
@@ -3054,8 +3084,20 @@ function system_cron() {
}
}
- $core = array('cache', 'cache_path', 'cache_filter', 'cache_page', 'cache_form', 'cache_menu');
- $cache_tables = array_merge(module_invoke_all('flush_caches'), $core);
+ // Delete expired cache entries.
+ // Avoid invoking hook_flush_cashes() on every cron run because some modules
+ // use this hook to perform expensive rebuilding operations (which are only
+ // designed to happen on full cache clears), rather than just returning a
+ // list of cache tables to be cleared.
+ $cache_object = cache_get('system_cache_tables');
+ if (empty($cache_object)) {
+ $core = array('cache', 'cache_path', 'cache_filter', 'cache_page', 'cache_form', 'cache_menu');
+ $cache_tables = array_merge(module_invoke_all('flush_caches'), $core);
+ cache_set('system_cache_tables', $cache_tables);
+ }
+ else {
+ $cache_tables = $cache_object->data;
+ }
foreach ($cache_tables as $table) {
cache_clear_all(NULL, $table);
}
@@ -3303,7 +3345,7 @@ function system_goto_action_form($context) {
$form['url'] = array(
'#type' => 'textfield',
'#title' => t('URL'),
- '#description' => t('The URL to which the user should be redirected. This can be an internal URL like node/1234 or an external URL like http://drupal.org.'),
+ '#description' => t('The URL to which the user should be redirected. This can be an internal path like node/1234 or an external URL like http://example.com.'),
'#default_value' => isset($context['url']) ? $context['url'] : '',
'#required' => TRUE,
);
@@ -3340,7 +3382,8 @@ function system_goto_action($entity, $context) {
*/
function system_block_ip_action() {
$ip = ip_address();
- db_insert('blocked_ips')
+ db_merge('blocked_ips')
+ ->key(array('ip' => $ip))
->fields(array('ip' => $ip))
->execute();
watchdog('action', 'Banned IP address %ip', array('%ip' => $ip));
@@ -3502,8 +3545,7 @@ function system_retrieve_file($url, $destination = NULL, $managed = FALSE, $repl
function system_page_alter(&$page) {
// Find all non-empty page regions, and add a theme wrapper function that
// allows them to be consistently themed.
- $regions = system_region_list($GLOBALS['theme']);
- foreach (array_keys($regions) as $region) {
+ foreach (system_region_list($GLOBALS['theme'], REGIONS_ALL, FALSE) as $region) {
if (!empty($page[$region])) {
$page[$region]['#theme_wrappers'][] = 'region';
$page[$region]['#region'] = $region;
diff --git a/modules/system/system.queue.inc b/modules/system/system.queue.inc
index 6eeaae19..c17084de 100644
--- a/modules/system/system.queue.inc
+++ b/modules/system/system.queue.inc
@@ -326,6 +326,7 @@ class MemoryQueue implements DrupalQueueInterface {
$item->created = time();
$item->expire = 0;
$this->queue[$item->item_id] = $item;
+ return TRUE;
}
public function numberOfItems() {
diff --git a/modules/system/system.tar.inc b/modules/system/system.tar.inc
index 32bf7f06..86e4e3de 100644
--- a/modules/system/system.tar.inc
+++ b/modules/system/system.tar.inc
@@ -30,81 +30,148 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- *
- * @category File_Formats
- * @package Archive_Tar
- * @author Vincent Blavet ' . t('Uses') . '
'; $output .= '- ';
$output .= '
- ' . t('Creating vocabularies') . ' '; - $output .= '
- ' . t('Users with sufficient permissions can create vocabularies and terms through the Taxonomy page. The page listing the terms provides a drag-and-drop interface for controlling the order of the terms and sub-terms within a vocabulary, in a hierarchical fashion. A controlled vocabulary classifying music by genre with terms and sub-terms could look as follows:', array('@taxo' => url('admin/structure/taxonomy'), '@perm' => url('admin/people/permissions', array('fragment'=>'module-taxonomy'))));
+ $output .= '
- ' . t('Users with sufficient permissions can create vocabularies and terms through the Taxonomy page. The page listing the terms provides a drag-and-drop interface for controlling the order of the terms and sub-terms within a vocabulary, in a hierarchical fashion. A controlled vocabulary classifying music by genre with terms and sub-terms could look as follows:', array('@taxo' => url('admin/structure/taxonomy'), '@perm' => url('admin/people/permissions', array('fragment' => 'module-taxonomy')))); $output .= '
- ' . t('vocabulary: Music') . ' '; $output .= '
- ' . t('term: Jazz') . ' '; $output .= '
- ' . t('sub-term: Swing') . ' '; @@ -1023,7 +1023,7 @@ function taxonomy_get_parents($tid) { $query->join('taxonomy_term_hierarchy', 'h', 'h.parent = t.tid'); $query->addField('t', 'tid'); $query->condition('h.tid', $tid); - $query->addTag('term_access'); + $query->addTag('taxonomy_term_access'); $query->orderBy('t.weight'); $query->orderBy('t.name'); $tids = $query->execute()->fetchCol(); @@ -1081,7 +1081,7 @@ function taxonomy_get_children($tid, $vid = 0) { if ($vid) { $query->condition('t.vid', $vid); } - $query->addTag('term_access'); + $query->addTag('taxonomy_term_access'); $query->orderBy('t.weight'); $query->orderBy('t.name'); $tids = $query->execute()->fetchCol(); @@ -1129,7 +1129,7 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities $query->join('taxonomy_term_hierarchy', 'h', 'h.tid = t.tid'); $result = $query ->addTag('translatable') - ->addTag('term_access') + ->addTag('taxonomy_term_access') ->fields('t') ->fields('h', array('parent')) ->condition('t.vid', $vid) @@ -1249,7 +1249,7 @@ class TaxonomyTermController extends DrupalDefaultEntityController { protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) { $query = parent::buildQuery($ids, $conditions, $revision_id); $query->addTag('translatable'); - $query->addTag('term_access'); + $query->addTag('taxonomy_term_access'); // When name is passed as a condition use LIKE. if (isset($conditions['name'])) { $query_conditions = &$query->conditions(); diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index 975ff120..38b24b3b 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -150,7 +150,7 @@ function taxonomy_autocomplete($field_name = '', $tags_typed = '') { $query = db_select('taxonomy_term_data', 't'); $query->addTag('translatable'); - $query->addTag('term_access'); + $query->addTag('taxonomy_term_access'); // Do not select already entered terms. if (!empty($tags_typed)) { diff --git a/modules/taxonomy/taxonomy.test b/modules/taxonomy/taxonomy.test index fdf354b7..a4b7ee83 100644 --- a/modules/taxonomy/taxonomy.test +++ b/modules/taxonomy/taxonomy.test @@ -1025,7 +1025,7 @@ class TaxonomyRSSTestCase extends TaxonomyWebTestCase { function setUp() { parent::setUp('taxonomy'); - $this->admin_user = $this->drupalCreateUser(array('administer taxonomy', 'bypass node access', 'administer content types')); + $this->admin_user = $this->drupalCreateUser(array('administer taxonomy', 'bypass node access', 'administer content types', 'administer fields')); $this->drupalLogin($this->admin_user); $this->vocabulary = $this->createVocabulary(); @@ -1983,3 +1983,113 @@ class TaxonomyEFQTestCase extends TaxonomyWebTestCase { } } + +/** + * Tests that appropriate query tags are added. + */ +class TaxonomyQueryAlterTestCase extends TaxonomyWebTestCase { + public static function getInfo() { + return array( + 'name' => 'Taxonomy query tags', + 'description' => 'Verifies that taxonomy_term_access tags are added to queries.', + 'group' => 'Taxonomy', + ); + } + + public function setUp() { + parent::setUp('taxonomy_test'); + } + + /** + * Tests that appropriate tags are added when querying the database. + */ + public function testTaxonomyQueryAlter() { + // Create a new vocabulary and add a few terms to it. + $vocabulary = $this->createVocabulary(); + $terms = array(); + for ($i = 0; $i < 5; $i++) { + $terms[$i] = $this->createTerm($vocabulary); + } + + // Set up hierarchy. Term 2 is a child of 1. + $terms[2]->parent = array($terms[1]->tid); + taxonomy_term_save($terms[2]); + + $this->setupQueryTagTestHooks(); + $loaded_term = taxonomy_term_load($terms[0]->tid); + $this->assertEqual($loaded_term->tid, $terms[0]->tid, 'First term was loaded'); + $this->assertQueryTagTestResult(1, 'taxonomy_term_load()'); + + $this->setupQueryTagTestHooks(); + $loaded_terms = taxonomy_get_tree($vocabulary->vid); + $this->assertEqual(count($loaded_terms), count($terms), 'All terms were loaded'); + $this->assertQueryTagTestResult(1, 'taxonomy_get_tree()'); + + $this->setupQueryTagTestHooks(); + $loaded_terms = taxonomy_get_parents($terms[2]->tid); + $this->assertEqual(count($loaded_terms), 1, 'All parent terms were loaded'); + $this->assertQueryTagTestResult(2, 'taxonomy_get_parents()'); + + $this->setupQueryTagTestHooks(); + $loaded_terms = taxonomy_get_children($terms[1]->tid); + $this->assertEqual(count($loaded_terms), 1, 'All child terms were loaded'); + $this->assertQueryTagTestResult(2, 'taxonomy_get_children()'); + + $this->setupQueryTagTestHooks(); + $query = db_select('taxonomy_term_data', 't'); + $query->addField('t', 'tid'); + $query->addTag('taxonomy_term_access'); + $tids = $query->execute()->fetchCol(); + $this->assertEqual(count($tids), count($terms), 'All term IDs were retrieved'); + $this->assertQueryTagTestResult(1, 'custom db_select() with taxonomy_term_access tag (preferred)'); + + $this->setupQueryTagTestHooks(); + $query = db_select('taxonomy_term_data', 't'); + $query->addField('t', 'tid'); + $query->addTag('term_access'); + $tids = $query->execute()->fetchCol(); + $this->assertEqual(count($tids), count($terms), 'All term IDs were retrieved'); + $this->assertQueryTagTestResult(1, 'custom db_select() with term_access tag (deprecated)'); + + $this->setupQueryTagTestHooks(); + $query = new EntityFieldQuery(); + $query->entityCondition('entity_type', 'taxonomy_term'); + $query->addTag('taxonomy_term_access'); + $result = $query->execute(); + $this->assertEqual(count($result['taxonomy_term']), count($terms), 'All term IDs were retrieved'); + $this->assertQueryTagTestResult(1, 'custom EntityFieldQuery with taxonomy_term_access tag (preferred)'); + + $this->setupQueryTagTestHooks(); + $query = new EntityFieldQuery(); + $query->entityCondition('entity_type', 'taxonomy_term'); + $query->addTag('term_access'); + $result = $query->execute(); + $this->assertEqual(count($result['taxonomy_term']), count($terms), 'All term IDs were retrieved'); + $this->assertQueryTagTestResult(1, 'custom EntityFieldQuery with term_access tag (deprecated)'); + } + + /** + * Sets up the hooks in the test module. + */ + protected function setupQueryTagTestHooks() { + taxonomy_terms_static_reset(); + variable_set('taxonomy_test_query_alter', 0); + variable_set('taxonomy_test_query_term_access_alter', 0); + variable_set('taxonomy_test_query_taxonomy_term_access_alter', 0); + } + + /** + * Verifies invocation of the hooks in the test module. + * + * @param int $expected_invocations + * The number of times the hooks are expected to have been invoked. + * @param string $method + * A string describing the invoked function which generated the query. + */ + protected function assertQueryTagTestResult($expected_invocations, $method) { + $this->assertIdentical($expected_invocations, variable_get('taxonomy_test_query_alter'), 'hook_query_alter() invoked when executing ' . $method); + $this->assertIdentical($expected_invocations, variable_get('taxonomy_test_query_term_access_alter'), 'Deprecated hook_query_term_access_alter() invoked when executing ' . $method); + $this->assertIdentical($expected_invocations, variable_get('taxonomy_test_query_taxonomy_term_access_alter'), 'Preferred hook_query_taxonomy_term_access_alter() invoked when executing ' . $method); + } + +} diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info index 75a670ea..ffa40ee7 100644 --- a/modules/toolbar/toolbar.info +++ b/modules/toolbar/toolbar.info @@ -4,8 +4,7 @@ core = 7.x package = Core version = VERSION -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info index 43ddc511..dbd7384c 100644 --- a/modules/tracker/tracker.info +++ b/modules/tracker/tracker.info @@ -6,8 +6,7 @@ version = VERSION core = 7.x files[] = tracker.test -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/tracker/tracker.test b/modules/tracker/tracker.test index 8a48ea81..e4729788 100644 --- a/modules/tracker/tracker.test +++ b/modules/tracker/tracker.test @@ -151,7 +151,6 @@ class TrackerTest extends DrupalWebTestCase { $node = $this->drupalCreateNode(array( 'comment' => 2, - 'title' => array(LANGUAGE_NONE => array(array('value' => $this->randomName(8)))), )); // Add a comment to the page. diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info index 14da1a48..9d5b4a5b 100644 --- a/modules/translation/tests/translation_test.info +++ b/modules/translation/tests/translation_test.info @@ -5,8 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/translation/translation.info b/modules/translation/translation.info index 533412ce..6ed39ca6 100644 --- a/modules/translation/translation.info +++ b/modules/translation/translation.info @@ -6,8 +6,7 @@ version = VERSION core = 7.x files[] = translation.test -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info index b4f052fc..196cfcf1 100644 --- a/modules/trigger/tests/trigger_test.info +++ b/modules/trigger/tests/trigger_test.info @@ -4,8 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info index 2b088436..b78c34d7 100644 --- a/modules/trigger/trigger.info +++ b/modules/trigger/trigger.info @@ -6,8 +6,7 @@ core = 7.x files[] = trigger.test configure = admin/structure/trigger -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/trigger/trigger.test b/modules/trigger/trigger.test index 9e5f1142..09169b72 100644 --- a/modules/trigger/trigger.test +++ b/modules/trigger/trigger.test @@ -85,7 +85,7 @@ class TriggerContentTestCase extends TriggerWebTestCase { $this->assertRaw(t('!post %title has been created.', array('!post' => 'Basic page', '%title' => $edit["title"])), 'Make sure the Basic page has actually been created'); // Action should have been fired. $loaded_node = $this->drupalGetNodeByTitle($edit["title"]); - $this->assertTrue($loaded_node->$info['property'] == $info['expected'], format_string('Make sure the @action action fired.', array('@action' => $info['name']))); + $this->assertTrue($loaded_node->{$info['property']} == $info['expected'], format_string('Make sure the @action action fired.', array('@action' => $info['name']))); // Leave action assigned for next test // There should be an error when the action is assigned to the trigger diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info index e0bbebd5..620e82ee 100644 --- a/modules/update/tests/aaa_update_test.info +++ b/modules/update/tests/aaa_update_test.info @@ -4,8 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info index 94c8adea..b9953c16 100644 --- a/modules/update/tests/bbb_update_test.info +++ b/modules/update/tests/bbb_update_test.info @@ -4,8 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info index 09598697..e855562a 100644 --- a/modules/update/tests/ccc_update_test.info +++ b/modules/update/tests/ccc_update_test.info @@ -4,8 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info b/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info new file mode 100644 index 00000000..cf1d3c36 --- /dev/null +++ b/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info @@ -0,0 +1,9 @@ +name = Update test admin theme +description = Test theme which is used as admin theme. +core = 7.x +hidden = TRUE + +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" +project = "drupal" +datestamp = "1539816636" diff --git a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info index 6954b3d4..11c81321 100644 --- a/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info +++ b/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info @@ -3,8 +3,7 @@ description = Test theme which acts as a base theme for other test subthemes. core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info index 81c222ef..aa5bc12c 100644 --- a/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info +++ b/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info @@ -4,8 +4,7 @@ core = 7.x base theme = update_test_basetheme hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info index f899512e..6b4802f6 100644 --- a/modules/update/tests/update_test.info +++ b/modules/update/tests/update_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/tests/update_test.module b/modules/update/tests/update_test.module index 6fe4bdde..594f80f0 100644 --- a/modules/update/tests/update_test.module +++ b/modules/update/tests/update_test.module @@ -11,6 +11,7 @@ function update_test_system_theme_info() { $themes['update_test_basetheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_basetheme/update_test_basetheme.info'; $themes['update_test_subtheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_subtheme/update_test_subtheme.info'; + $themes['update_test_admintheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_admintheme/update_test_admintheme.info'; return $themes; } diff --git a/modules/update/update.authorize.inc b/modules/update/update.authorize.inc index 6ddd2c53..03d37049 100644 --- a/modules/update/update.authorize.inc +++ b/modules/update/update.authorize.inc @@ -97,7 +97,9 @@ function update_authorize_run_install($filetransfer, $project, $updater_name, $l } /** - * Batch callback: Copies project to its proper place when authorized to do so. + * Implements callback_batch_operation(). + * + * Copies project to its proper place when authorized to do so. * * @param string $project * The canonical short name of the project being installed. @@ -168,7 +170,9 @@ function update_authorize_batch_copy_project($project, $updater_name, $local_url } /** - * Batch callback: Performs actions when the authorized update batch is done. + * Implements callback_batch_finished(). + * + * Performs actions when the authorized update batch is done. * * This processes the results and stashes them into SESSION such that * authorize.php will render a report. Also responsible for putting the site @@ -235,7 +239,9 @@ function update_authorize_update_batch_finished($success, $results) { } /** - * Batch callback: Performs actions when the authorized install batch is done. + * Implements callback_batch_finished(). + * + * Performs actions when the authorized install batch is done. * * This processes the results and stashes them into SESSION such that * authorize.php will render a report. Also responsible for putting the site diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index 072a0daa..e3e0de3b 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -104,7 +104,13 @@ function update_get_projects() { * @see update_get_projects() */ function _update_process_info_list(&$projects, $list, $project_type, $status) { + $admin_theme = variable_get('admin_theme', 'seven'); foreach ($list as $file) { + // The admin theme is a special case. It should always be considered enabled + // for the purposes of update checking. + if ($file->name === $admin_theme) { + $file->status = TRUE; + } // A disabled base theme of an enabled sub-theme still has all of its code // run by the sub-theme, so we include it in our "enabled" projects list. if ($status && !$file->status && !empty($file->sub_themes)) { diff --git a/modules/update/update.fetch.inc b/modules/update/update.fetch.inc index 9dd2f0ba..428cace6 100644 --- a/modules/update/update.fetch.inc +++ b/modules/update/update.fetch.inc @@ -29,7 +29,9 @@ function update_manual_status() { } /** - * Batch callback: Processes a step in batch for fetching available update data. + * Implements callback_batch_operation(). + * + * Processes a step in batch for fetching available update data. * * @param $context * Reference to an array used for Batch API storage. @@ -77,7 +79,9 @@ function update_fetch_data_batch(&$context) { } /** - * Batch callback: Performs actions when all fetch tasks have been completed. + * Implements callback_batch_finished(). + * + * Performs actions when all fetch tasks have been completed. * * @param $success * TRUE if the batch operation was successful; FALSE if there were errors. diff --git a/modules/update/update.info b/modules/update/update.info index ddd1bde6..4b4dde91 100644 --- a/modules/update/update.info +++ b/modules/update/update.info @@ -6,8 +6,7 @@ core = 7.x files[] = update.test configure = admin/reports/updates/settings -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc index 85b587de..c7c4e4a6 100644 --- a/modules/update/update.manager.inc +++ b/modules/update/update.manager.inc @@ -59,7 +59,7 @@ * @see update_menu() * @ingroup forms */ -function update_manager_update_form($form, $form_state = array(), $context) { +function update_manager_update_form($form, $form_state, $context) { if (!_update_manager_check_backends($form, 'update')) { return $form; } @@ -335,6 +335,8 @@ function update_manager_update_form_submit($form, &$form_state) { } /** + * Implements callback_batch_finished(). + * * Batch callback: Performs actions when the download batch is completed. * * @param $success @@ -847,7 +849,9 @@ function update_manager_file_get($url) { } /** - * Batch callback: Downloads, unpacks, and verifies a project. + * Implements callback_batch_operation(). + * + * Downloads, unpacks, and verifies a project. * * This function assumes that the provided URL points to a file archive of some * sort. The URL can have any scheme that we have a file stream wrapper to diff --git a/modules/update/update.settings.inc b/modules/update/update.settings.inc index 5cd24149..75de6cdd 100644 --- a/modules/update/update.settings.inc +++ b/modules/update/update.settings.inc @@ -26,7 +26,7 @@ function update_settings($form) { $form['update_check_disabled'] = array( '#type' => 'checkbox', - '#title' => t('Check for updates of disabled modules and themes'), + '#title' => t('Check for updates of disabled and uninstalled modules and themes'), '#default_value' => variable_get('update_check_disabled', FALSE), ); @@ -98,10 +98,11 @@ function update_settings_validate($form, &$form_state) { * Form submission handler for update_settings(). * * Also invalidates the cache of available updates if the "Check for updates of - * disabled modules and themes" setting is being changed. The available updates - * report needs to refetch available update data after this setting changes or - * it would show misleading things (e.g., listing the disabled projects on the - * site with the "No available releases found" warning). + * disabled and uninstalled modules and themes" setting is being changed. The + * available updates report needs to refetch available update data after this + * setting changes or it would show misleading things (e.g., listing the + * disabled projects on the site with the "No available releases found" + * warning). * * @see update_settings_validate() */ diff --git a/modules/update/update.test b/modules/update/update.test index 9e04cdae..5ce5bb88 100644 --- a/modules/update/update.test +++ b/modules/update/update.test @@ -462,6 +462,55 @@ class UpdateTestContribCase extends UpdateTestHelper { $this->assertRaw(l(t('Update test base theme'), 'http://example.com/project/update_test_basetheme'), 'Link to the Update test base theme project appears.'); } + /** + * Tests that the admin theme is always notified about security updates. + */ + function testUpdateAdminThemeSecurityUpdate() { + // Disable the admin theme. + db_update('system') + ->fields(array('status' => 0)) + ->condition('type', 'theme') + ->condition('name', 'update_test_%', 'LIKE') + ->execute(); + + variable_set('admin_theme', 'update_test_admintheme'); + + // Define the initial state for core and the themes. + $system_info = array( + '#all' => array( + 'version' => '7.0', + ), + 'update_test_admintheme' => array( + 'project' => 'update_test_admintheme', + 'version' => '7.x-1.0', + 'hidden' => FALSE, + ), + 'update_test_basetheme' => array( + 'project' => 'update_test_basetheme', + 'version' => '7.x-1.1', + 'hidden' => FALSE, + ), + 'update_test_subtheme' => array( + 'project' => 'update_test_subtheme', + 'version' => '7.x-1.0', + 'hidden' => FALSE, + ), + ); + variable_set('update_test_system_info', $system_info); + variable_set('update_check_disabled', FALSE); + $xml_mapping = array( + // This is enough because we don't check the update status of the admin + // theme. We want to check that the admin theme is included in the list. + 'drupal' => '0', + ); + $this->refreshUpdateStatus($xml_mapping); + // The admin theme is displayed even if it's disabled. + $this->assertText('update_test_admintheme', "The admin theme is checked for update even if it's disabled"); + // The other disabled themes are not displayed. + $this->assertNoText('update_test_basetheme', 'Disabled theme is not checked for update in the list.'); + $this->assertNoText('update_test_subtheme', 'Disabled theme is not checked for update in the list.'); + } + /** * Tests that disabled themes are only shown when desired. */ @@ -800,4 +849,4 @@ class UpdateCoreUnitTestCase extends DrupalUnitTestCase { $this->assertEqual($url, $expected, "When ? is present, '$url' should be '$expected'."); } -} \ No newline at end of file +} diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info index c8eeeabe..d5a554be 100644 --- a/modules/user/tests/user_form_test.info +++ b/modules/user/tests/user_form_test.info @@ -5,8 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/user/tests/user_form_test.module b/modules/user/tests/user_form_test.module index 4e907f36..382bc57b 100644 --- a/modules/user/tests/user_form_test.module +++ b/modules/user/tests/user_form_test.module @@ -62,3 +62,21 @@ function user_form_test_current_password($form, &$form_state, $account) { function user_form_test_current_password_submit($form, &$form_state) { drupal_set_message(t('The password has been validated and the form submitted successfully.')); } + +/** + * Implements hook_form_FORM_ID_alter(). + */ +function user_form_test_form_user_profile_form_alter(&$form, &$form_state) { + if (variable_get('user_form_test_user_profile_form_rebuild', FALSE)) { + $form['#submit'][] = 'user_form_test_user_account_submit'; + } +} + +/** + * Submit function for user_profile_form(). + */ +function user_form_test_user_account_submit($form, &$form_state) { + // Rebuild the form instead of letting the process end. This allows us to + // test for bugs that can be triggered in contributed modules. + $form_state['rebuild'] = TRUE; +} diff --git a/modules/user/user-picture.tpl.php b/modules/user/user-picture.tpl.php index ee821878..11d92cc5 100644 --- a/modules/user/user-picture.tpl.php +++ b/modules/user/user-picture.tpl.php @@ -17,7 +17,7 @@ */ ?> -
+'; + + _commerce_amazon_lpa_render_helper($render, array( + 'callbacks' => array( + array( + 'callback' => 'Drupal.AmazonLPA.PaymentButton', + 'param' => $variables['html_id'], + ), + ), + )); + return render($render); +} + +/** + * Payment button summary link theme function. + * + * @param array $variables + * Variables array. + * + * @return string + * Summary link HTML string. + */ +function theme_commerce_amazon_payment_button__summary_link($variables) { + $attributes = array( + 'id' => $variables['html_id'], + 'title' => t('Amazon Payments makes shopping on our website even easier by using the payment information in your Amazon account.'), + 'data-pay-type' => isset($variables['button_options']['payType']) ? $variables['button_options']['payType'] : NULL, + 'data-pay-size' => 'small', + 'data-checkout-url' => url('checkout/amazon', array('absolute' => TRUE)), + ); + + $render['#markup'] = 'diff --git a/modules/user/user.api.php b/modules/user/user.api.php index edc61bd3..f205a85b 100644 --- a/modules/user/user.api.php +++ b/modules/user/user.api.php @@ -123,8 +123,8 @@ function hook_user_cancel($edit, $account, $method) { * description is NOT used for the radio button, but instead should provide * additional explanation to the user seeking to cancel their account. * - access: (optional) A boolean value indicating whether the user can access - * a method. If #access is defined, the method cannot be configured as default - * method. + * a method. If access is defined, the method cannot be configured as the + * default method. * * @param $methods * An array containing user account cancellation methods, keyed by method id. @@ -183,7 +183,23 @@ function hook_user_operations() { } /** - * Retrieve a list of user setting or profile information categories. + * Define a list of user settings or profile information categories. + * + * There are two steps to using hook_user_categories(): + * - Create the category with hook_user_categories(). + * - Display that category on the form ID of "user_profile_form" with + * hook_form_FORM_ID_alter(). + * + * Step one builds out the category but it won't be visible on your form until + * you explicitly tell it to do so. + * + * The function in step two should contain the following code in order to + * display your new category: + * @code + * if ($form['#user_category'] == 'mycategory') { + * // Return your form here. + * } + * @endcode * * @return * An array of associative arrays. Each inner array has elements: diff --git a/modules/user/user.info b/modules/user/user.info index aaebd74b..3e10c7ee 100644 --- a/modules/user/user.info +++ b/modules/user/user.info @@ -9,8 +9,7 @@ required = TRUE configure = admin/config/people stylesheets[all][] = user.css -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.39" +; Information added by Drupal.org packaging script on 2018-10-17 +version = "7.60" project = "drupal" -datestamp = "1440020197" - +datestamp = "1539816636" diff --git a/modules/user/user.install b/modules/user/user.install index b573e72d..7a74766a 100644 --- a/modules/user/user.install +++ b/modules/user/user.install @@ -49,6 +49,9 @@ function user_schema() { 'columns' => array('uid' => 'uid'), ), ), + 'indexes' => array( + 'uid_module' => array('uid', 'module'), + ), ); $schema['role_permission'] = array( @@ -910,6 +913,15 @@ function user_update_7018() { } } +/** + * Ensure there is a combined index on {authmap}.uid and {authmap}.module. + */ +function user_update_7019() { + // Check first in case it was already added manually. + if (!db_index_exists('authmap', 'uid_module')) { + db_add_index('authmap', 'uid_module', array('uid', 'module')); + } +} /** * @} End of "addtogroup updates-7.x-extra". */ diff --git a/modules/user/user.js b/modules/user/user.js index d182066a..4cf98161 100644 --- a/modules/user/user.js +++ b/modules/user/user.js @@ -93,6 +93,8 @@ Drupal.behaviors.password = { * Returns the estimated strength and the relevant output message. */ Drupal.evaluatePasswordStrength = function (password, translate) { + password = $.trim(password); + var weaknesses = 0, strength = 100, msg = []; var hasLowercase = /[a-z]+/.test(password); diff --git a/modules/user/user.module b/modules/user/user.module index 9637a716..12ca2800 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -418,13 +418,11 @@ function user_load_by_name($name) { * * @return * A fully-loaded $user object upon successful save or FALSE if the save failed. - * - * @todo D8: Drop $edit and fix user_save() to be consistent with others. */ function user_save($account, $edit = array(), $category = 'account') { $transaction = db_transaction(); try { - if (!empty($edit['pass'])) { + if (isset($edit['pass']) && strlen(trim($edit['pass'])) > 0) { // Allow alternate password hashing schemes. require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); $edit['pass'] = user_hash_password(trim($edit['pass'])); @@ -791,7 +789,7 @@ function user_role_permissions($roles = array()) { * (optional) The account to check, if not given use currently logged in user. * * @return - * Boolean TRUE if the current user has the requested permission. + * Boolean TRUE if the user has the requested permission. * * All permission checks in Drupal should go through this function. This * way, we guarantee consistent behavior, and ensure that the superuser @@ -958,6 +956,8 @@ function user_search_access() { */ function user_search_execute($keys = NULL, $conditions = NULL) { $find = array(); + // Escape for LIKE matching. + $keys = db_like($keys); // Replace wildcards with MySQL/PostgreSQL wildcards. $keys = preg_replace('!\*+!', '%', $keys); $query = db_select('users')->extend('PagerDefault'); @@ -967,13 +967,13 @@ function user_search_execute($keys = NULL, $conditions = NULL) { // and they don't need to be restricted to only active users. $query->fields('users', array('mail')); $query->condition(db_or()-> - condition('name', '%' . db_like($keys) . '%', 'LIKE')-> - condition('mail', '%' . db_like($keys) . '%', 'LIKE')); + condition('name', '%' . $keys . '%', 'LIKE')-> + condition('mail', '%' . $keys . '%', 'LIKE')); } else { // Regular users can only search via usernames, and we do not show them // blocked accounts. - $query->condition('name', '%' . db_like($keys) . '%', 'LIKE') + $query->condition('name', '%' . $keys . '%', 'LIKE') ->condition('status', 1); } $uids = $query @@ -1088,13 +1088,16 @@ function user_account_form(&$form, &$form_state) { '#description' => t('To change the current user password, enter the new password in both fields.'), ); // To skip the current password field, the user must have logged in via a - // one-time link and have the token in the URL. - $pass_reset = isset($_SESSION['pass_reset_' . $account->uid]) && isset($_GET['pass-reset-token']) && ($_GET['pass-reset-token'] == $_SESSION['pass_reset_' . $account->uid]); + // one-time link and have the token in the URL. Store this in $form_state + // so it persists even on subsequent Ajax requests. + if (!isset($form_state['user_pass_reset'])) { + $form_state['user_pass_reset'] = isset($_SESSION['pass_reset_' . $account->uid]) && isset($_GET['pass-reset-token']) && ($_GET['pass-reset-token'] == $_SESSION['pass_reset_' . $account->uid]); + } $protected_values = array(); $current_pass_description = ''; // The user may only change their own password without their current // password if they logged in via a one-time login link. - if (!$pass_reset) { + if (!$form_state['user_pass_reset']) { $protected_values['mail'] = $form['account']['mail']['#title']; $protected_values['pass'] = t('Password'); $request_new = l(t('Request new password'), 'user/password', array('attributes' => array('title' => t('Request new password via e-mail.')))); @@ -1160,7 +1163,7 @@ function user_account_form(&$form, &$form_state) { $form['account']['roles'] = array( '#type' => 'checkboxes', '#title' => t('Roles'), - '#default_value' => (!$register && isset($account->roles) ? array_keys($account->roles) : array()), + '#default_value' => (!$register && !empty($account->roles) ? array_keys(array_filter($account->roles)) : array()), '#options' => $roles, '#access' => $roles && user_access('administer permissions'), DRUPAL_AUTHENTICATED_RID => $checkbox_authenticated, @@ -1230,7 +1233,7 @@ function user_validate_current_pass(&$form, &$form_state) { // that prevent them from being empty if they are changed. if ((strlen(trim($form_state['values'][$key])) > 0) && ($form_state['values'][$key] != $account->$key)) { require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); - $current_pass_failed = empty($form_state['values']['current_pass']) || !user_check_password($form_state['values']['current_pass'], $account); + $current_pass_failed = strlen(trim($form_state['values']['current_pass'])) == 0 || !user_check_password($form_state['values']['current_pass'], $account); if ($current_pass_failed) { form_set_error('current_pass', t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => $name))); form_set_error($key); @@ -1306,10 +1309,12 @@ function user_user_presave(&$edit, $account, $category) { elseif (!empty($edit['picture_delete'])) { $edit['picture'] = NULL; } - // Prepare user roles. - if (isset($edit['roles'])) { - $edit['roles'] = array_filter($edit['roles']); - } + } + + // Filter out roles with empty values to avoid granting extra roles when + // processing custom form submissions. + if (isset($edit['roles'])) { + $edit['roles'] = array_filter($edit['roles']); } // Move account cancellation information into $user->data. @@ -1751,9 +1756,11 @@ function user_menu() { $items['admin/people/create'] = array( 'title' => 'Add user', + 'page callback' => 'user_admin', 'page arguments' => array('create'), 'access arguments' => array('administer users'), 'type' => MENU_LOCAL_ACTION, + 'file' => 'user.admin.inc', ); // Administration pages. @@ -1911,13 +1918,13 @@ function user_menu_link_alter(&$link) { // for authenticated users. Authenticated users should see "My account", but // anonymous users should not see it at all. Therefore, invoke // user_translated_menu_link_alter() to conditionally hide the link. - if ($link['link_path'] == 'user' && $link['module'] == 'system') { + if ($link['link_path'] == 'user' && isset($link['module']) && $link['module'] == 'system') { $link['options']['alter'] = TRUE; } // Force the Logout link to appear on the top-level of 'user-menu' menu by // default (i.e., unless it has been customized). - if ($link['link_path'] == 'user/logout' && $link['module'] == 'system' && empty($link['customized'])) { + if ($link['link_path'] == 'user/logout' && isset($link['module']) && $link['module'] == 'system' && empty($link['customized'])) { $link['plid'] = 0; } } @@ -2161,7 +2168,7 @@ function user_login_name_validate($form, &$form_state) { */ function user_login_authenticate_validate($form, &$form_state) { $password = trim($form_state['values']['pass']); - if (!empty($form_state['values']['name']) && !empty($password)) { + if (!empty($form_state['values']['name']) && strlen(trim($password)) > 0) { // Do not allow any login from the current user's IP if the limit has been // reached. Default is 50 failed attempts allowed in one hour. This is // independent of the per-user limit to catch attempts from one IP to log @@ -2225,7 +2232,11 @@ function user_login_final_validate($form, &$form_state) { } } else { - form_set_error('name', t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => url('user/password', array('query' => array('name' => $form_state['values']['name'])))))); + // Use $form_state['input']['name'] here to guarantee that we send + // exactly what the user typed in. $form_state['values']['name'] may have + // been modified by validation handlers that ran earlier than this one. + $query = isset($form_state['input']['name']) ? array('name' => $form_state['input']['name']) : array(); + form_set_error('name', t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => url('user/password', array('query' => $query))))); watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name'])); } } @@ -2248,7 +2259,7 @@ function user_login_final_validate($form, &$form_state) { */ function user_authenticate($name, $password) { $uid = FALSE; - if (!empty($name) && !empty($password)) { + if (!empty($name) && strlen(trim($password)) > 0) { $account = user_load_by_name($name); if ($account) { // Allow alternate password hashing schemes. @@ -2488,7 +2499,9 @@ function user_cancel($edit, $uid, $method) { } /** - * Last batch processing step for cancelling a user account. + * Implements callback_batch_operation(). + * + * Last step for cancelling a user account. * * Since batch and session API require a valid user account, the actual * cancellation of a user account needs to happen last. @@ -2536,6 +2549,8 @@ function _user_cancel($edit, $account, $method) { } /** + * Implements callback_batch_finished(). + * * Finished batch processing callback for cancelling a user account. * * @see user_cancel() @@ -3039,6 +3054,11 @@ function user_role_delete($role) { $role = user_role_load_by_name($role); } + // If this is the administrator role, delete the user_admin_role variable. + if ($role->rid == variable_get('user_admin_role')) { + variable_del('user_admin_role'); + } + db_delete('role') ->condition('rid', $role->rid) ->execute(); @@ -3654,12 +3674,7 @@ function user_form_process_password_confirm($element) { ); $element['#attached']['js'][] = drupal_get_path('module', 'user') . '/user.js'; - // Ensure settings are only added once per page. - static $already_added = FALSE; - if (!$already_added) { - $already_added = TRUE; - $element['#attached']['js'][] = array('data' => $js_settings, 'type' => 'setting'); - } + $element['#attached']['js'][] = array('data' => $js_settings, 'type' => 'setting'); return $element; } diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc index f21bd134..2a1b291b 100644 --- a/modules/user/user.pages.inc +++ b/modules/user/user.pages.inc @@ -44,6 +44,12 @@ function user_pass() { $form['name']['#value'] = $user->mail; $form['mail'] = array( '#prefix' => '', + // As of https://www.drupal.org/node/889772 the user no longer must log + // out (if they are still logged in when using the password reset link, + // they will be logged out automatically then), but this text is kept as + // is to avoid breaking translations as well as to encourage the user to + // log out manually at a time of their own choosing (when it will not + // interrupt anything else they may have been in the middle of doing). '#markup' => t('Password reset instructions will be mailed to %email. You must log out to use the password reset link in the e-mail.', array('%email' => $user->mail)), '#suffix' => '
', ); @@ -54,6 +60,11 @@ function user_pass() { return $form; } +/** + * Form validation handler for user_pass(). + * + * @see user_pass_submit() + */ function user_pass_validate($form, &$form_state) { $name = trim($form_state['values']['name']); // Try to load by email. @@ -72,6 +83,11 @@ function user_pass_validate($form, &$form_state) { } } +/** + * Form submission handler for user_pass(). + * + * @see user_pass_validate() + */ function user_pass_submit($form, &$form_state) { global $language; @@ -96,22 +112,33 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a // When processing the one-time login link, we have to make sure that a user // isn't already logged in. if ($user->uid) { - // The existing user is already logged in. + // The existing user is already logged in. Log them out and reload the + // current page so the password reset process can continue. if ($user->uid == $uid) { - drupal_set_message(t('You are logged in as %user. Change your password.', array('%user' => $user->name, '!user_edit' => url("user/$user->uid/edit")))); + // Preserve the current destination (if any) and ensure the redirect goes + // back to the current page; any custom destination set in + // hook_user_logout() and intended for regular logouts would not be + // appropriate here. + $destination = array(); + if (isset($_GET['destination'])) { + $destination = drupal_get_destination(); + } + user_logout_current_user(); + unset($_GET['destination']); + drupal_goto(current_path(), array('query' => drupal_get_query_parameters() + $destination)); } // A different user is already logged in on the computer. else { $reset_link_account = user_load($uid); if (!empty($reset_link_account)) { drupal_set_message(t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please logout and try using the link again.', - array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout')))); + array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout'))), 'warning'); } else { // Invalid one-time link specifies an unknown user. - drupal_set_message(t('The one-time login link you clicked is invalid.')); + drupal_set_message(t('The one-time login link you clicked is invalid.'), 'error'); } + drupal_goto(); } - drupal_goto(); } else { // Time out, in seconds, until login URL expires. Defaults to 24 hours = @@ -123,7 +150,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a if ($timestamp <= $current && $account = reset($users)) { // No time out for first time login. if ($account->login && $current - $timestamp > $timeout) { - drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.')); + drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'error'); drupal_goto('user/password'); } elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid)) { @@ -151,7 +178,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a } } else { - drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.')); + drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'), 'error'); drupal_goto('user/password'); } } @@ -168,6 +195,14 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a * Menu callback; logs the current user out, and redirects to the home page. */ function user_logout() { + user_logout_current_user(); + drupal_goto(); +} + +/** + * Logs the current user out. + */ +function user_logout_current_user() { global $user; watchdog('user', 'Session closed for %name.', array('%name' => $user->name)); @@ -176,8 +211,6 @@ function user_logout() { // Destroy the current session, and reset $user to the anonymous user. session_destroy(); - - drupal_goto(); } /** @@ -294,14 +327,18 @@ function user_profile_form($form, &$form_state, $account, $category = 'account') } /** - * Validation function for the user account and profile editing form. + * Form validation handler for user_profile_form(). + * + * @see user_profile_form_submit() */ function user_profile_form_validate($form, &$form_state) { entity_form_field_validate('user', $form, $form_state); } /** - * Submit function for the user account and profile editing form. + * Form submission handler for user_profile_form(). + * + * @see user_profile_form_validate() */ function user_profile_form_submit($form, &$form_state) { $account = $form_state['user']; @@ -533,7 +570,7 @@ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') { batch_process(''); } else { - drupal_set_message(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.')); + drupal_set_message(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'error'); drupal_goto("user/$account->uid/cancel"); } } diff --git a/modules/user/user.test b/modules/user/user.test index 07be4c2c..0875e0ac 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -465,6 +465,19 @@ class UserPasswordResetTestCase extends DrupalWebTestCase { ); } + /** + * Retrieves password reset email and extracts the login link. + */ + public function getResetURL() { + // Assume the most recent email. + $_emails = $this->drupalGetMails(); + $email = end($_emails); + $urls = array(); + preg_match('#.+user/reset/.+#', $email['body'], $urls); + + return $urls[0]; + } + /** * Tests password reset functionality. */ @@ -478,6 +491,77 @@ class UserPasswordResetTestCase extends DrupalWebTestCase { $this->drupalPost('user/password', $edit, t('E-mail new password')); // Confirm the password reset. $this->assertText(t('Further instructions have been sent to your e-mail address.'), 'Password reset instructions mailed message displayed.'); + + // Create an image field to enable an Ajax request on the user profile page. + $field = array( + 'field_name' => 'field_avatar', + 'type' => 'image', + 'settings' => array(), + 'cardinality' => 1, + ); + field_create_field($field); + + $instance = array( + 'field_name' => $field['field_name'], + 'entity_type' => 'user', + 'label' => 'Avatar', + 'bundle' => 'user', + 'required' => FALSE, + 'settings' => array(), + 'widget' => array( + 'type' => 'image_image', + 'settings' => array(), + ), + ); + field_create_instance($instance); + + $resetURL = $this->getResetURL(); + $this->drupalGet($resetURL); + + // Check successful login. + $this->drupalPost(NULL, NULL, t('Log in')); + + // Make sure the Ajax request from uploading a file does not invalidate the + // reset token. + $image = current($this->drupalGetTestFiles('image')); + $edit = array( + 'files[field_avatar_und_0]' => drupal_realpath($image->uri), + ); + $this->drupalPostAJAX(NULL, $edit, 'field_avatar_und_0_upload_button'); + + // Change the forgotten password. + $password = user_password(); + $edit = array('pass[pass1]' => $password, 'pass[pass2]' => $password); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText(t('The changes have been saved.'), 'Forgotten password changed.'); + } + + /** + * Test user password reset while logged in. + */ + function testUserPasswordResetLoggedIn() { + $account = $this->drupalCreateUser(); + $this->drupalLogin($account); + // Make sure the test account has a valid password. + user_save($account, array('pass' => user_password())); + + // Generate one time login link. + $reset_url = user_pass_reset_url($account); + $this->drupalGet($reset_url); + + $this->assertText('Reset password'); + $this->drupalPost(NULL, NULL, t('Log in')); + + $this->assertText('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'); + + $pass = user_password(); + $edit = array( + 'pass[pass1]' => $pass, + 'pass[pass2]' => $pass, + ); + $this->drupalPost(NULL, $edit, t('Save')); + + $this->assertText('The changes have been saved.'); } /** @@ -1501,7 +1585,13 @@ class UserTimeZoneFunctionalTest extends DrupalWebTestCase { // Setup date/time settings for Los Angeles time. variable_set('date_default_timezone', 'America/Los_Angeles'); variable_set('configurable_timezones', 1); - variable_set('date_format_medium', 'Y-m-d H:i T'); + + // Override the 'medium' date format, which is the default for node + // creation time. Since we are testing time zones with Daylight Saving + // Time, and need to future proof against changes to the zoneinfo database, + // we choose the 'I' format placeholder instead of a human-readable zone + // name. With 'I', a 1 means the date is in DST, and 0 if not. + variable_set('date_format_medium', 'Y-m-d H:i I'); // Create a user account and login. $web_user = $this->drupalCreateUser(); @@ -1519,11 +1609,11 @@ class UserTimeZoneFunctionalTest extends DrupalWebTestCase { // Confirm date format and time zone. $this->drupalGet("node/$node1->nid"); - $this->assertText('2007-03-09 21:00 PST', 'Date should be PST.'); + $this->assertText('2007-03-09 21:00 0', 'Date should be PST.'); $this->drupalGet("node/$node2->nid"); - $this->assertText('2007-03-11 01:00 PST', 'Date should be PST.'); + $this->assertText('2007-03-11 01:00 0', 'Date should be PST.'); $this->drupalGet("node/$node3->nid"); - $this->assertText('2007-03-20 21:00 PDT', 'Date should be PDT.'); + $this->assertText('2007-03-20 21:00 1', 'Date should be PDT.'); // Change user time zone to Santiago time. $edit = array(); @@ -1534,11 +1624,11 @@ class UserTimeZoneFunctionalTest extends DrupalWebTestCase { // Confirm date format and time zone. $this->drupalGet("node/$node1->nid"); - $this->assertText('2007-03-10 02:00 CLST', 'Date should be Chile summer time; five hours ahead of PST.'); + $this->assertText('2007-03-10 02:00 1', 'Date should be Chile summer time; five hours ahead of PST.'); $this->drupalGet("node/$node2->nid"); - $this->assertText('2007-03-11 05:00 CLT', 'Date should be Chile time; four hours ahead of PST'); + $this->assertText('2007-03-11 05:00 0', 'Date should be Chile time; four hours ahead of PST'); $this->drupalGet("node/$node3->nid"); - $this->assertText('2007-03-21 00:00 CLT', 'Date should be Chile time; three hours ahead of PDT.'); + $this->assertText('2007-03-21 00:00 0', 'Date should be Chile time; three hours ahead of PDT.'); } } @@ -1849,6 +1939,19 @@ class UserCreateTestCase extends DrupalWebTestCase { $this->drupalGet('admin/people'); $this->assertText($edit['name'], 'User found in list of users'); } + + // Test that the password '0' is considered a password. + $name = $this->randomName(); + $edit = array( + 'name' => $name, + 'mail' => $name . '@example.com', + 'pass[pass1]' => 0, + 'pass[pass2]' => 0, + 'notify' => FALSE, + ); + $this->drupalPost('admin/people/create', $edit, t('Create new account')); + $this->assertText(t('Created a new user account for @name. No e-mail has been sent.', array('@name' => $edit['name'])), 'User created with password 0'); + $this->assertNoText('Password field is required'); } } @@ -1926,6 +2029,74 @@ class UserEditTestCase extends DrupalWebTestCase { $this->drupalLogin($user1); $this->drupalLogout(); } + + /** + * Tests setting the password to "0". + */ + public function testUserWith0Password() { + $admin = $this->drupalCreateUser(array('administer users')); + $this->drupalLogin($admin); + // Create a regular user. + $user1 = $this->drupalCreateUser(array()); + + $edit = array('pass[pass1]' => '0', 'pass[pass2]' => '0'); + $this->drupalPost("user/" . $user1->uid . "/edit", $edit, t('Save')); + $this->assertRaw(t("The changes have been saved.")); + + $this->drupalLogout(); + $user1->pass_raw = '0'; + $this->drupalLogin($user1); + $this->drupalLogout(); + } +} + +/** + * Tests editing a user account with and without a form rebuild. + */ +class UserEditRebuildTestCase extends DrupalWebTestCase { + + public static function getInfo() { + return array( + 'name' => 'User edit with form rebuild', + 'description' => 'Test user edit page when a form rebuild is triggered.', + 'group' => 'User', + ); + } + + function setUp() { + parent::setUp('user_form_test'); + } + + /** + * Test user edit page when the form is set to rebuild. + */ + function testUserEditFormRebuild() { + $user1 = $this->drupalCreateUser(array('change own username')); + $this->drupalLogin($user1); + + $roles = array_keys($user1->roles); + // Save the user form twice. + $edit = array(); + $edit['current_pass'] = $user1->pass_raw; + $this->drupalPost("user/$user1->uid/edit", $edit, t('Save')); + $this->assertRaw(t("The changes have been saved.")); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertRaw(t("The changes have been saved.")); + $saved_user1 = entity_load_unchanged('user', $user1->uid); + $this->assertEqual(count($roles), count($saved_user1->roles), 'Count of user roles in database matches original count.'); + $diff = array_diff(array_keys($saved_user1->roles), $roles); + $this->assertTrue(empty($diff), format_string('User roles in database match original: @roles', array('@roles' => implode(', ', $saved_user1->roles)))); + // Set variable that causes the form to be rebuilt in user_form_test.module. + variable_set('user_form_test_user_profile_form_rebuild', TRUE); + $this->drupalPost("user/$user1->uid/edit", $edit, t('Save')); + $this->assertRaw(t("The changes have been saved.")); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertRaw(t("The changes have been saved.")); + $saved_user1 = entity_load_unchanged('user', $user1->uid); + $this->assertEqual(count($roles), count($saved_user1->roles), 'Count of user roles in database matches original count.'); + $diff = array_diff(array_keys($saved_user1->roles), $roles); + $this->assertTrue(empty($diff), format_string('User roles in database match original: @roles', array('@roles' => implode(', ', $saved_user1->roles)))); + } } /** @@ -2095,12 +2266,16 @@ class UserRoleAdminTestCase extends DrupalWebTestCase { $this->assertFalse(user_role_load_by_name($old_name), 'The role can no longer be retrieved from the database using its old name.'); $this->assertTrue(is_object(user_role_load_by_name($role_name)), 'The role can be retrieved from the database using its new name.'); - // Test deleting a role. + // Test deleting the default administrator role. + $role_name = 'administrator'; + $role = user_role_load_by_name($role_name); $this->drupalPost("admin/people/permissions/roles/edit/{$role->rid}", NULL, t('Delete role')); $this->drupalPost(NULL, NULL, t('Delete')); $this->assertText(t('The role has been deleted.'), 'The role has been deleted'); $this->assertNoLinkByHref("admin/people/permissions/roles/edit/{$role->rid}", 'Role edit link removed.'); $this->assertFalse(user_role_load_by_name($role_name), 'A deleted role can no longer be loaded.'); + // Make sure this role is no longer configured as the administrator role. + $this->assertNull(variable_get('user_admin_role'), 'The administrator role is no longer configured as the administrator role.'); // Make sure that the system-defined roles cannot be edited via the user // interface. @@ -2226,6 +2401,20 @@ class UserUserSearchTestCase extends DrupalWebTestCase { $this->drupalPost('search/user/', $edit, t('Search')); $this->assertText($keys); + // Verify that wildcard search works. + $keys = $user1->name; + $keys = substr($keys, 0, 2) . '*' . substr($keys, 4, 2); + $edit = array('keys' => $keys); + $this->drupalPost('search/user/', $edit, t('Search')); + $this->assertText($user1->name, 'Search for username wildcard resulted in user name on page for administrative user.'); + + // Verify that wildcard search works for email. + $keys = $user1->mail; + $keys = substr($keys, 0, 2) . '*' . substr($keys, 4, 2); + $edit = array('keys' => $keys); + $this->drupalPost('search/user/', $edit, t('Search')); + $this->assertText($user1->name, 'Search for email wildcard resulted in user name on page for administrative user.'); + // Create a blocked user. $blocked_user = $this->drupalCreateUser(); $edit = array('status' => 0); diff --git a/profiles/README.txt b/profiles/README.txt new file mode 100644 index 00000000..91d012ba --- /dev/null +++ b/profiles/README.txt @@ -0,0 +1,28 @@ +Installation profiles define additional steps that run after the base +installation provided by Drupal core when Drupal is first installed. + +WHAT TO PLACE IN THIS DIRECTORY? +-------------------------------- + +Place downloaded and custom installation profiles in this directory. +Installation profiles are generally provided as part of a Drupal distribution. +They only impact the installation of your site. They do not have any effect on +an already running site. + +DOWNLOAD ADDITIONAL DISTRIBUTIONS +--------------------------------- + +Contributed distributions from the Drupal community may be downloaded at +https://www.drupal.org/project/project_distribution. + +MULTISITE CONFIGURATION +----------------------- + +In multisite configurations, installation profiles found in this directory are +available to all sites during their initial site installation. + +MORE INFORMATION +---------------- + +Refer to the "Installation profiles" section of the README.txt in the Drupal +root directory for further information on extending Drupal with custom profiles. diff --git a/profiles/commerce_kickstart/.gitignore b/profiles/commerce_kickstart/.gitignore index 3c445852..d2332d28 100644 --- a/profiles/commerce_kickstart/.gitignore +++ b/profiles/commerce_kickstart/.gitignore @@ -5,3 +5,4 @@ !.htaccess nbproject/ *.kpf +tests/behat/failures diff --git a/profiles/commerce_kickstart/.travis.yml b/profiles/commerce_kickstart/.travis.yml index 761490b3..0628a290 100644 --- a/profiles/commerce_kickstart/.travis.yml +++ b/profiles/commerce_kickstart/.travis.yml @@ -1,8 +1,10 @@ language: php sudo: false - +dist: trusty +addons: + chrome: stable php: - - 5.4 + - 5.6 branches: except: @@ -15,39 +17,45 @@ mysql: env: - UPGRADE=none - - UPGRADE=7.x-2.26 - - UPGRADE=7.x-2.25 - - UPGRADE=7.x-2.24 - - UPGRADE=7.x-2.23 - - UPGRADE=7.x-2.22 - - UPGRADE=7.x-2.21 - - UPGRADE=7.x-2.20 - - UPGRADE=7.x-2.19 - - UPGRADE=7.x-2.18 - - UPGRADE=7.x-2.17 - - UPGRADE=7.x-2.16 - - UPGRADE=7.x-2.15 - - UPGRADE=7.x-2.14 - - UPGRADE=7.x-2.13 - - UPGRADE=7.x-2.12 + - UPGRADE=7.x-2.49 + - UPGRADE=7.x-2.48 + - UPGRADE=7.x-2.47 + - UPGRADE=7.x-2.46 + - UPGRADE=7.x-2.45 + - UPGRADE=7.x-2.44 + - UPGRADE=7.x-2.43 + - UPGRADE=7.x-2.42 + - UPGRADE=7.x-2.41 + - UPGRADE=7.x-2.40 matrix: fast_finish: true include: - - php: 5.5 - env: UPGRADE=none - - php: 5.5 - env: UPGRADE=7.x-2.23 TEST_FEATURES_OVERRIDES=1 - php: 5.6 + env: UPGRADE=7.x-2.23 TEST_FEATURES_OVERRIDES=1 + - php: 7.0 + env: UPGRADE=none + - php: 7.1 env: UPGRADE=none + allow_failures: + - php: 7.0 + - php: 7.1 # Cache Composer & Drush directories. cache: directories: - $HOME/.composer/cache - $HOME/.drush/cache + - tests/behat/vendor +before_install: + - # start your web application and listen on `localhost` + - google-chrome-stable --headless --disable-gpu --remote-debugging-address=0.0.0.0 --remote-debugging-port=9222 & install: + # Remove xdebug for the moment. We aren't generating code coverage, and it slows us down. + - rm /home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini + + # Create database. - "mysql -e 'create database drupal;'" # Install latest Drush 6. @@ -95,16 +103,6 @@ install: # Setup files - chmod -R 777 drupal/sites/all - # Setup display for Selenium - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - sleep 5 - - # Get Selenium - - wget http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.1.jar - - java -jar selenium-server-standalone-2.42.1.jar > /dev/null 2>&1 & - - nc -zvv localhost 4444; out=$?; while [[ $out -ne 0 ]]; do echo "Retry hit port 4444..."; nc -zvv localhost 4444; out=$?; sleep 5; done - # Disable sendmail - echo sendmail_path=`which true` >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini @@ -112,6 +110,10 @@ install: - echo "mysql.connect_timeout=3000" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "default_socket_timeout=3000" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + # Multibyte string input conversion in PHP is active and must be disabled for Drupal on PHP 5.6. + - echo "mbstring.http_input = pass" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - echo "mbstring.http_output = pass" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + # Increase the MySQL server timetout and packet size. - mysql -e "SET GLOBAL wait_timeout = 36000;" - mysql -e "SET GLOBAL max_allowed_packet = 33554432;" @@ -136,7 +138,9 @@ before_script: - drush pm-disable dblog --yes # If testing the override, enable it and revert feature it's overriding (because we didn't on the same install.) - - if [[ "$TEST_FEATURES_OVERRIDES" == 1 ]]; then drush en -y commerce_kickstart_overrides_test && drush fr -y commerce_kickstart_blog; fi + # We need to download rc2, because rc3 requires a function in Features 2.7, + # breaking test. + - if [[ "$TEST_FEATURES_OVERRIDES" == 1 ]]; then drush dl features_override-7.x-2.0-rc2 && drush en -y commerce_kickstart_overrides_test && drush fr -y commerce_kickstart_blog; fi - cd ../drupal @@ -153,6 +157,9 @@ script: # If this isn't an upgrade, we test if any features are overridden. - if [[ "$UPGRADE" == none ]]; then ../../scripts/check-overridden.sh; fi + # Fix bad Commerce Migrate release for testing the demo. + - if [[ "$UPGRADE" == "7.x-2.34" || "$UPGRADE" == "7.x-2.33" || "$UPGRADE" == "7.x-2.32" || "$UPGRADE" == "7.x-2.31" || "$UPGRADE" == "7.x-2.30" || "$UPGRADE" == "7.x-2.29" || "$UPGRADE" == "7.x-2.28" || "$UPGRADE" == "7.x-2.27" ]]; then drush mi --all --update; fi + # Run Behat tests. - if [[ "$TEST_FEATURES_OVERRIDES" != 1 ]]; then ./bin/behat --config behat.travis.yml --tags ~@overrides; fi - if [[ "$TEST_FEATURES_OVERRIDES" == 1 ]]; then ./bin/behat --config behat.travis.yml --tags @overrides; fi diff --git a/profiles/commerce_kickstart/commerce_kickstart.info b/profiles/commerce_kickstart/commerce_kickstart.info index 3044e717..dfb1b9fc 100644 --- a/profiles/commerce_kickstart/commerce_kickstart.info +++ b/profiles/commerce_kickstart/commerce_kickstart.info @@ -78,7 +78,6 @@ dependencies[] = entityreference dependencies[] = views_megarow dependencies[] = commerce_addressbook dependencies[] = commerce_discount -dependencies[] = commerce_discount_date dependencies[] = commerce_add_to_cart_confirmation dependencies[] = commerce_message dependencies[] = commerce_backoffice @@ -118,9 +117,8 @@ dependencies[] = commerce_kickstart_migrate ; System Requirements. php_memory_limit = 128M -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/commerce_kickstart.install b/profiles/commerce_kickstart/commerce_kickstart.install index 00b34f3e..89b539a3 100644 --- a/profiles/commerce_kickstart/commerce_kickstart.install +++ b/profiles/commerce_kickstart/commerce_kickstart.install @@ -58,16 +58,18 @@ function commerce_kickstart_install_tasks_alter(&$tasks, $install_state) { $tasks['install_select_locale']['run'] = INSTALL_TASK_SKIP; $tasks['install_profile_modules']['display_name'] = st('Install Commerce Kickstart 2'); - // The "Welcome" screen needs to come after the first two steps - // (profile and language selection), despite the fact that they are disabled. - $new_task['install_welcome'] = array( - 'display' => TRUE, - 'display_name' => st('Welcome'), - 'type' => 'form', - 'run' => isset($install_state['parameters']['welcome']) ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_REACHED, - ); - $old_tasks = $tasks; - $tasks = array_slice($old_tasks, 0, 2) + $new_task + array_slice($old_tasks, 2); + if (PHP_SAPI !== 'cli') { + // The "Welcome" screen needs to come after the first two steps + // (profile and language selection), despite the fact that they are disabled. + $new_task['install_welcome'] = array( + 'display' => TRUE, + 'display_name' => st('Welcome'), + 'type' => 'form', + 'run' => isset($install_state['parameters']['welcome']) ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_REACHED, + ); + $old_tasks = $tasks; + $tasks = array_slice($old_tasks, 0, 2) + $new_task + array_slice($old_tasks, 2); + } // Set the installation theme. _commerce_kickstart_set_theme('commerce_kickstart_admin'); @@ -1274,3 +1276,18 @@ function commerce_kickstart_update_7224() { function commerce_kickstart_update_7225() { module_enable(array('distro_update')); } + +/** + * Disable the Distribution Update Status Manager module. + */ +function commerce_kickstart_update_7226() { + // Causing too much grief with security warnings about modules. + module_disable(array('distro_update')); +} + +/** + * Re-enable the Distribution Update Status Manager module. + */ +function commerce_kickstart_update_7227() { + module_enable(array('distro_update')); +} diff --git a/profiles/commerce_kickstart/drupal-org-core.make b/profiles/commerce_kickstart/drupal-org-core.make index 9bf25e49..db954bc0 100644 --- a/profiles/commerce_kickstart/drupal-org-core.make +++ b/profiles/commerce_kickstart/drupal-org-core.make @@ -1,6 +1,6 @@ api = 2 core = 7.x -projects[drupal][version] = 7.39 +projects[drupal][version] = 7.60 ; Patches for Core projects[drupal][patch][] = "http://drupal.org/files/issues/install-redirect-on-empty-database-728702-36.patch" diff --git a/profiles/commerce_kickstart/drupal-org.make b/profiles/commerce_kickstart/drupal-org.make index 10a683c0..d144a226 100644 --- a/profiles/commerce_kickstart/drupal-org.make +++ b/profiles/commerce_kickstart/drupal-org.make @@ -5,91 +5,75 @@ api = 2 defaults[projects][subdir] = contrib ; Basic contributed modules. -projects[ctools][version] = 1.9 -projects[entity][version] = 1.6 -projects[entityreference][version] = 1.1 -projects[entityreference][patch][] = "http://drupal.org/files/1580348-universal-formatters-17.patch" -projects[rules][version] = 2.9 -projects[views][version] = 3.11 -projects[views][patch][] = "http://drupal.org/files/2059555-reduce-formatter-form-state.patch" -projects[views_bulk_operations][version] = 3.3 -projects[addressfield][version] = 1.1 -projects[features][version] = "2.6" +projects[ctools][version] = 1.13 +projects[entity][version] = 1.9 +projects[entityreference][version] = 1.5 +projects[rules][version] = 2.10 +projects[views][version] = 3.18 +projects[views_bulk_operations][version] = 3.4 +projects[addressfield][version] = 1.2 +projects[features][version] = 2.10 projects[features][patch][2143765] = "http://drupal.org/files/issues/features-fix-modules-enabled-2143765-1.patch" projects[features][patch][2479803] = "https://www.drupal.org/files/issues/ignore_hidden_modules-2479803-1.patch" -projects[features][patch][2534138] = "https://www.drupal.org/files/issues/2534138-field-base-exception-catch-1.patch" -projects[features_override][version] = 2.0-rc2 +projects[features_override][version] = 2.0-rc3 projects[strongarm][version] = 2.0 projects[taxonomy_menu][version] = 1.5 -projects[libraries][version] = 2.2 -projects[views_megarow][version] = 1.4 +projects[libraries][version] = 2.3 +projects[views_megarow][version] = 1.7 ; Drupal Commerce and Commerce contribs. -projects[commerce][version] = 1.11 -projects[commerce_features][version] = 1.1 -projects[commerce_addressbook][version] = 2.0-rc8 -projects[commerce_shipping][version] = 2.2 +projects[commerce][version] = 1.14 +projects[commerce_features][version] = 1.3 +projects[commerce_addressbook][version] = 2.0-rc9 +projects[commerce_shipping][version] = 2.3 projects[commerce_flat_rate][version] = 1.0-beta2 projects[commerce_fancy_attributes][version] = 1.0 -projects[commerce_autosku][version] = 1.x-dev -projects[commerce_autosku][download][type] = git -projects[commerce_autosku][download][revision] = 32e86f4 -projects[commerce_autosku][download][branch] = 7.x-1.x -projects[commerce_migrate][version] = 1.1 -projects[commerce_migrate][patch][1931302] = https://www.drupal.org/files/commerce_products_source_migration-1931302-2.patch -projects[commerce_discount][version] = 1.x-dev -projects[commerce_discount][download][type] = git -projects[commerce_discount][download][revision] = 7a78225 -projects[commerce_discount][download][branch] = 7.x-1.x -projects[commerce_checkout_progress][version] = 1.3 +projects[commerce_autosku][version] = 1.2 +projects[commerce_migrate][version] = 1.2 +projects[commerce_migrate][patch][2701333] = https://www.drupal.org/files/issues/reference_fields_should-2701333-3.patch +projects[commerce_discount][version] = 1.0-beta5 +projects[commerce_checkout_progress][version] = 1.5 projects[commerce_extra_price_formatters][version] = 1.x-dev projects[commerce_extra_price_formatters][download][type] = git projects[commerce_extra_price_formatters][download][revision] = 1371336 projects[commerce_extra_price_formatters][download][branch] = 7.x-1.x -projects[commerce_checkout_redirect][version] = 2.0-rc1 +projects[commerce_checkout_redirect][version] = 2.0 projects[commerce_hosted_pci][version] = 1.0-rc2 projects[commerce_payleap][version] = 1.1 projects[commerce_moneybookers][version] = 1.2 projects[commerce_moneybookers][patch][] = "http://drupal.org/files/commerce_moneybookers-disable_payment_method_by_default-1962226-3.patch" -projects[commerce_paypal][version] = 2.3 -projects[commerce_backoffice][version] = 1.4 -projects[commerce_message][version] = 1.0-rc3 -projects[commerce_search_api][version] = 1.3 -projects[commerce_add_to_cart_confirmation][version] = 1.0-rc2 +projects[commerce_paypal][version] = 2.4 +projects[commerce_backoffice][version] = 1.5 +projects[commerce_message][version] = 1.0 +projects[commerce_search_api][version] = 1.6 +projects[commerce_add_to_cart_confirmation][version] = 1.0-rc3 projects[commerce_kiala][version] = 1.0-rc1 projects[commerce_physical][version] = 1.x-dev projects[commerce_physical][download][type] = git -projects[commerce_physical][download][revision] = e2a8866 +projects[commerce_physical][download][revision] = 477aaee projects[commerce_physical][download][branch] = 7.x-1.x projects[commerce_amex][version] = 1.1 projects[commerce_cba][version] = 1.0-beta1 -projects[commerce_authnet][version] = 1.1 +projects[commerce_authnet][version] = 1.4 projects[commerce_exactor][version] = 1.3 projects[commerce_paymill][version] = 2.4 -projects[commerce_nosto_tagging][version] = 1.0 -projects[commerce_nosto_tagging][patch][] = https://drupal.org/files/issues/issue-2225883.patch -projects[commerce_yotpo][download][type] = "git" -projects[commerce_yotpo][download][revision] = "ecc41f9" -projects[commerce_yotpo][download][branch] = 7.x-1.x -projects[commerce_firstdata_gge4][version] = 1.0 +projects[commerce_nosto_tagging][version] = 1.1 +projects[commerce_yotpo][version] = 1.2 +projects[commerce_firstdata_gge4][version] = 1.1 +projects[commerce_amazon_lpa][version] = 1.3 ; Other contribs. projects[countries][version] = 2.3 projects[remote_stream_wrapper][version] = 1.0-rc1 -projects[colorbox][version] = 2.7 -projects[colorbox][patch][] = https://www.drupal.org/files/issues/plugin_version_detection-2360375-9.patch -projects[physical][version] = 1.x-dev -projects[physical][download][type] = git -projects[physical][download][revision] = 32e1a38 -projects[physical][download][branch] = 7.x-1.x +projects[colorbox][version] = 2.13 +projects[physical][version] = 1.0 projects[crumbs][version] = 1.10 projects[http_client][version] = 2.4 -projects[oauth][version] = 3.2 -projects[oauth][patch][] = "http://drupal.org/files/980340-d7.patch" +projects[oauth][version] = 3.4 projects[connector][version] = 1.0-beta2 projects[oauthconnector][version] = 1.0-beta2 -projects[inline_entity_form][version] = 1.6 -projects[inline_conditions][version] = 1.0-alpha5 +projects[inline_entity_form][version] = 1.8 +projects[inline_conditions][version] = 1.0-rc1 projects[field_extractor][version] = 1.3 projects[service_links][version] = 2.x-dev projects[service_links][download][type] = "git" @@ -97,64 +81,63 @@ projects[service_links][download][revision] = "6f63b84" projects[service_links]download][branch] = 7.x-2.x projects[advanced_help][version] = 1.3 projects[mailsystem][version] = 2.34 -projects[mimemail][version] = 1.0-beta3 -projects[token][version] = 1.6 +projects[mailsystem][patch][1534706] = "https://www.drupal.org/files/mailsystem.1534706.6.patch" +projects[mimemail][version] = 1.1 +projects[token][version] = 1.7 projects[token][patch][] = "http://drupal.org/files/token-token_asort_tokens-1712336_0.patch" -projects[eva][version] = 1.2 -projects[message][version] = 1.10 +projects[eva][version] = 1.3 +projects[message][version] = 1.12 projects[message_notify][version] = 2.5 projects[migrate][version] = 2.8 projects[migrate_extras][version] = 2.5 projects[migrate_extras][patch][] = "http://drupal.org/files/migrate_extras-fix-destid2-array-1951904-4.patch" -projects[date][version] = 2.8 +projects[date][version] = 2.10 projects[yottaa][version] = 1.2 -projects[menu_attributes][version] = 1.0-rc3 -projects[fences][version] = "1.0" -projects[fences][patch][] = "http://drupal.org/files/undefined-index-1561244-7.patch" -projects[fences][patch][] = "http://drupal.org/files/fences-default_markup_option-1857230-2.patch" -projects[title][version] = "1.0-alpha7" -projects[title][patch][] = "http://drupal.org/files/title-translation_overwrite-1269076-35.patch" -projects[kameleoon][version] = "1.1" -projects[mailup][version] = "1.1" -projects[mailjet][version] = "2.3" +projects[menu_attributes][version] = 1.0 +projects[fences][version] = 1.2 +projects[title][version] = 1.0-alpha9 +projects[title][patch][] = "https://www.drupal.org/files/issues/title-fix_description_empty_on_submit-2075041-7.patch" +projects[kameleoon][version] = 1.1 +projects[mailup][version] = 1.4 +projects[mailjet][version] = 2.14 ; Search related modules. -projects[search_api][version] = 1.15 -projects[search_api_db][version] = 1.4 +projects[search_api][version] = 1.22 +projects[search_api_db][version] = 1.6 projects[search_api_ranges][version] = 1.5 projects[search_api_ranges][patch][] = "https://drupal.org/files/issues/search_api_ranges-rewrite-data-alteration-callback-2001846-4.patch" projects[facetapi][version] = 1.5 projects[facetapi][patch][] = "https://drupal.org/files/1616518-term_remove_link-24.patch" projects[facetapi][patch][2378693] = "https://www.drupal.org/files/issues/notice_undefined-2378693-3.patch" -projects[search_api_sorts][version] = 1.5 +projects[search_api_sorts][version] = 1.7 ; UI improvement modules. -projects[module_filter][version] = 2.0 +projects[module_filter][version] = 2.1 projects[image_delta_formatter][version] = 1.0-rc1 -projects[link][version] = 1.3 -projects[pathauto][version] = 1.2 -projects[cloud_zoom][version] = 1.x-dev +projects[link][version] = 1.4 +projects[pathauto][version] = 1.3 +; projects[cloud_zoom][version] = 1.x-dev projects[cloud_zoom][download][type] = git projects[cloud_zoom][download][revision] = 3cff30f projects[cloud_zoom][download][branch] = 7.x-1.x projects[special_menu_items][version] = 2.0 -projects[chosen][version] = 2.x-dev -projects[chosen][download][type] = git -projects[chosen][download][revision] = e7a0d22 -projects[chosen][download][branch] = 7.x-2.x -projects[admin_views][version] = 1.5 +projects[chosen][version] = 2.1 +projects[admin_views][version] = 1.6 projects[distro_update][version] = 1.0-beta4 ; Internationalization projects[variable][version] = 2.5 -projects[i18n][version] = "1.12" -projects[lingotek][version] = 6.02 +projects[i18n][version] = 1.17 +projects[lingotek][version] = 7.21 ; Base theme. projects[omega][version] = 3.1 projects[omega][patch][] = "http://drupal.org/files/relative-src-15.patch" +projects[omega][type] = theme projects[omega_kickstart][version] = 3.4 -projects[shiny][version] = 1.6 +projects[omega_kickstart][type] = theme +projects[shiny][version] = 1.7 +projects[shiny][type] = theme ; Libraries. libraries[colorbox][type] = "libraries" @@ -185,7 +168,7 @@ libraries[selectnav.js][download][revision] = 538237c7c5e95736fc376f4efc3e40f5b9 libraries[selectnav.js][download][branch] = master libraries[ie7-js][type] = "libraries" libraries[ie7-js][download][type] = "file" -libraries[ie7-js][download][url] = "https://ie7-js.googlecode.com/files/ie7-2.1%28beta4%29.zip" +libraries[ie7-js][download][url] = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ie7-js/ie7-2.1(beta4).zip" libraries[chosen][type] = "libraries" libraries[chosen][download][type] = "get" libraries[chosen][download][url] = "https://github.com/harvesthq/chosen/releases/download/v1.1.0/chosen_v1.1.0.zip" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_custom.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_custom.inc index dcaaf085..ade56d03 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_custom.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_custom.inc @@ -34,6 +34,5 @@ function commerce_kickstart_block_menu_default_menu_custom() { t('Payment methods'); t('Secondary navigation'); - return $menus; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_links.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_links.inc index 55c765e0..34c94e47 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_links.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.features.menu_links.inc @@ -10,7 +10,7 @@ function commerce_kickstart_block_menu_default_menu_links() { $menu_links = array(); - // Exported menu link: menu-footer-navigation_about-us:node/2 + // Exported menu link: menu-footer-navigation_about-us:node/2. $menu_links['menu-footer-navigation_about-us:node/2'] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => 'node/2', @@ -29,7 +29,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'customized' => 1, 'parent_identifier' => 'menu-footer-navigation_company-info:', ); - // Exported menu link: menu-footer-navigation_company-info: + // Exported menu link: menu-footer-navigation_company-info: . $menu_links['menu-footer-navigation_company-info: '] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => ' ', @@ -49,7 +49,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -50, 'customized' => 1, ); - // Exported menu link: menu-footer-navigation_our-security-policy:node/8 + // Exported menu link: menu-footer-navigation_our-security-policy:node/8. $menu_links['menu-footer-navigation_our-security-policy:node/8'] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => 'node/8', @@ -70,7 +70,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'customized' => 1, 'parent_identifier' => 'menu-footer-navigation_security--privacy: ', ); - // Exported menu link: menu-footer-navigation_press-links:node/6 + // Exported menu link: menu-footer-navigation_press-links:node/6. $menu_links['menu-footer-navigation_press-links:node/6'] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => 'node/6', @@ -89,7 +89,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'customized' => 1, 'parent_identifier' => 'menu-footer-navigation_company-info: ', ); - // Exported menu link: menu-footer-navigation_security--privacy: + // Exported menu link: menu-footer-navigation_security--privacy: . $menu_links['menu-footer-navigation_security--privacy: '] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => ' ', @@ -109,7 +109,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -48, 'customized' => 1, ); - // Exported menu link: menu-footer-navigation_service--support: + // Exported menu link: menu-footer-navigation_service--support: . $menu_links['menu-footer-navigation_service--support: '] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => ' ', @@ -129,7 +129,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -49, 'customized' => 1, ); - // Exported menu link: menu-footer-navigation_service-agreements:node/7 + // Exported menu link: menu-footer-navigation_service-agreements:node/7. $menu_links['menu-footer-navigation_service-agreements:node/7'] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => 'node/7', @@ -150,7 +150,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'customized' => 1, 'parent_identifier' => 'menu-footer-navigation_service--support: ', ); - // Exported menu link: menu-footer-navigation_shipping--returns: + // Exported menu link: menu-footer-navigation_shipping--returns: . $menu_links['menu-footer-navigation_shipping--returns: '] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => ' ', @@ -170,7 +170,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -47, 'customized' => 1, ); - // Exported menu link: menu-footer-navigation_shipping-fees:node/5 + // Exported menu link: menu-footer-navigation_shipping-fees:node/5. $menu_links['menu-footer-navigation_shipping-fees:node/5'] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => 'node/5', @@ -191,7 +191,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'customized' => 1, 'parent_identifier' => 'menu-footer-navigation_shipping--returns: ', ); - // Exported menu link: menu-footer-navigation_terms-of-use:node/3 + // Exported menu link: menu-footer-navigation_terms-of-use:node/3. $menu_links['menu-footer-navigation_terms-of-use:node/3'] = array( 'menu_name' => 'menu-footer-navigation', 'link_path' => 'node/3', @@ -210,7 +210,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'customized' => 1, 'parent_identifier' => 'menu-footer-navigation_security--privacy: ', ); - // Exported menu link: menu-payment-methods_american-express: + // Exported menu link: menu-payment-methods_american-express: . $menu_links['menu-payment-methods_american-express: '] = array( 'menu_name' => 'menu-payment-methods', 'link_path' => ' ', @@ -234,7 +234,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -47, 'customized' => 1, ); - // Exported menu link: menu-payment-methods_mastercard: + // Exported menu link: menu-payment-methods_mastercard: . $menu_links['menu-payment-methods_mastercard: '] = array( 'menu_name' => 'menu-payment-methods', 'link_path' => ' ', @@ -258,7 +258,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -50, 'customized' => 1, ); - // Exported menu link: menu-payment-methods_paypal: + // Exported menu link: menu-payment-methods_paypal: . $menu_links['menu-payment-methods_paypal: '] = array( 'menu_name' => 'menu-payment-methods', 'link_path' => ' ', @@ -282,7 +282,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -49, 'customized' => 1, ); - // Exported menu link: menu-payment-methods_visa: + // Exported menu link: menu-payment-methods_visa: . $menu_links['menu-payment-methods_visa: '] = array( 'menu_name' => 'menu-payment-methods', 'link_path' => ' ', @@ -306,7 +306,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => -48, 'customized' => 1, ); - // Exported menu link: secondary-navigation_about:node/2 + // Exported menu link: secondary-navigation_about:node/2. $menu_links['secondary-navigation_about:node/2'] = array( 'menu_name' => 'secondary-navigation', 'link_path' => 'node/2', @@ -323,7 +323,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => 2, 'customized' => 1, ); - // Exported menu link: secondary-navigation_contact:node/1 + // Exported menu link: secondary-navigation_contact:node/1. $menu_links['secondary-navigation_contact:node/1'] = array( 'menu_name' => 'secondary-navigation', 'link_path' => 'node/1', @@ -340,6 +340,7 @@ function commerce_kickstart_block_menu_default_menu_links() { 'weight' => 1, 'customized' => 1, ); + // Translatables // Included for use with string extractors like potx. t('About'); @@ -359,6 +360,5 @@ function commerce_kickstart_block_menu_default_menu_links() { t('Terms of use'); t('Visa'); - return $menu_links; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.info index 4549bef7..91071f64 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_block/commerce_kickstart_block.info @@ -32,9 +32,8 @@ features[menu_links][] = secondary-navigation_contact:node/1 features[variable][] = menu_secondary_links_source files[] = commerce_kickstart_block.module -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_base.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_base.inc index 9cd1743b..a299c4f3 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_base.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_base.inc @@ -10,7 +10,7 @@ function commerce_kickstart_blog_field_default_field_bases() { $field_bases = array(); - // Exported field_base: 'field_blog_category' + // Exported field_base: 'field_blog_category'. $field_bases['field_blog_category'] = array( 'active' => 1, 'cardinality' => -1, @@ -31,12 +31,13 @@ function commerce_kickstart_blog_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_tags' + // Exported field_base: 'field_tags'. $field_bases['field_tags'] = array( 'active' => 1, 'cardinality' => -1, @@ -57,6 +58,7 @@ function commerce_kickstart_blog_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_instance.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_instance.inc index 653ec831..6c0f47df 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_instance.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.features.field_instance.inc @@ -10,7 +10,7 @@ function commerce_kickstart_blog_field_default_field_instances() { $field_instances = array(); - // Exported field_instance: 'node-blog_post-body' + // Exported field_instance: 'node-blog_post-body'. $field_instances['node-blog_post-body'] = array( 'bundle' => 'blog_post', 'default_value' => NULL, @@ -68,7 +68,7 @@ function commerce_kickstart_blog_field_default_field_instances() { ), ); - // Exported field_instance: 'node-blog_post-field_blog_category' + // Exported field_instance: 'node-blog_post-field_blog_category'. $field_instances['node-blog_post-field_blog_category'] = array( 'bundle' => 'blog_post', 'default_value' => NULL, @@ -115,7 +115,7 @@ function commerce_kickstart_blog_field_default_field_instances() { ), ); - // Exported field_instance: 'node-blog_post-field_image' + // Exported field_instance: 'node-blog_post-field_image'. $field_instances['node-blog_post-field_image'] = array( 'bundle' => 'blog_post', 'deleted' => 0, @@ -181,7 +181,7 @@ function commerce_kickstart_blog_field_default_field_instances() { ), ); - // Exported field_instance: 'node-blog_post-field_tags' + // Exported field_instance: 'node-blog_post-field_tags'. $field_instances['node-blog_post-field_tags'] = array( 'bundle' => 'blog_post', 'default_value' => NULL, @@ -233,7 +233,7 @@ function commerce_kickstart_blog_field_default_field_instances() { ), ); - // Exported field_instance: 'node-blog_post-title_field' + // Exported field_instance: 'node-blog_post-title_field'. $field_instances['node-blog_post-title_field'] = array( 'bundle' => 'blog_post', 'default_value' => NULL, diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.info index e53d56f3..e22c8d45 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.info @@ -51,9 +51,8 @@ features_exclude[field_base][field_image] = field_image features_exclude[field_base][title_field] = title_field files[] = commerce_kickstart_blog.migrate.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.module b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.module index 209301c8..4ef76046 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.module +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_blog/commerce_kickstart_blog.module @@ -19,6 +19,10 @@ function commerce_kickstart_blog_migrate_api() { ), ); } + + // Return a near empty array to avoid API warning. + // @link https://www.drupal.org/node/2544320 + return array('api' => 2); } /** diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_comment/commerce_kickstart_comment.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_comment/commerce_kickstart_comment.info index cecd3267..e168e687 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_comment/commerce_kickstart_comment.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_comment/commerce_kickstart_comment.info @@ -4,9 +4,8 @@ package = Commerce Kickstart core = 7.x dependencies[] = comment -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.info index 7467af23..1d1d77ca 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.info @@ -3,9 +3,8 @@ description = Provides in-distribution content for Commerce Kickstart. core = 7.x package = Commerce Kickstart -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_help.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_help.info index 1cf54841..17f322d9 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_help.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_help.info @@ -4,9 +4,8 @@ core = 7.x package = Commerce Kickstart dependencies[] = advanced_help -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_inline_help/commerce_kickstart_inline_help.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_inline_help/commerce_kickstart_inline_help.info index a2e35703..a505006f 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_inline_help/commerce_kickstart_inline_help.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_help/commerce_kickstart_inline_help/commerce_kickstart_inline_help.info @@ -5,9 +5,8 @@ package = Commerce Kickstart dependencies[] = advanced_help dependencies[] = commerce_kickstart_help -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info index 8b7e9316..141dea60 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info @@ -55,9 +55,8 @@ features[variable][] = pathauto_taxonomy_term_pattern features_exclude[taxonomy][product_category] = product_category files[] = commerce_kickstart_lite_product.migrate.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.info index 588dfa9e..96f70b5d 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.info @@ -6,9 +6,8 @@ dependencies[] = toolbar_megamenu stylesheets[all][] = commerce_kickstart_menus.css -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module index db9eab75..6b92cae7 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module @@ -370,8 +370,8 @@ function commerce_kickstart_menus_menu_alter(&$items) { } // Show the Discounts link under "Store settings". - if (module_exists('commerce_discount') && isset($items['admin/commerce/store/discounts'])) { - $items['admin/commerce/store/discounts']['parent'] = 'admin/commerce/config/promotions'; + if (module_exists('commerce_discount') && isset($items['admin/commerce/discounts'])) { + $items['admin/commerce/discounts']['parent'] = 'admin/commerce/config/promotions'; } $advanced_store_items = array( 'admin/commerce/customer-profiles', @@ -492,26 +492,28 @@ function commerce_kickstart_menus_views_api() { * Implements hook_menu_breadcrumb_alter(). */ function commerce_kickstart_menus_menu_breadcrumb_alter(&$active_trail, $item) { - // Home > Administration > Content > Settings > Content types - if (drupal_match_path($item['path'], "admin/structure/types") || drupal_match_path($item['path'], "admin/structure/types/*")) { - if (drupal_match_path($item['path'], "admin/structure/types/add")) { - return; + if (isset($item['path'])) { + // Home > Administration > Content > Settings > Content types + if (drupal_match_path($item['path'], "admin/structure/types") || drupal_match_path($item['path'], "admin/structure/types/*")) { + if (drupal_match_path($item['path'], "admin/structure/types/add")) { + return; + } + $active_trail_end = array_slice($active_trail, 6); + $active_trail = array_slice($active_trail, 0, 1); + $active_trail[] = _commerce_kickstart_menus_get_item('admin'); + $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content'); + $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content/settings'); + $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content/settings/content-types'); + $active_trail = array_merge($active_trail, $active_trail_end); + } + // Set the breadcrumb for the "Add content" tab of node/add. + else if (drupal_match_path($item['path'], 'node/add')) { + $active_trail = array_slice($active_trail, 0, 1); + $active_trail[] = _commerce_kickstart_menus_get_item('admin'); + $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content'); + $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content/actions'); + $active_trail[] = _commerce_kickstart_menus_get_item('node/add/add-content'); } - $active_trail_end = array_slice($active_trail, 6); - $active_trail = array_slice($active_trail, 0, 1); - $active_trail[] = _commerce_kickstart_menus_get_item('admin'); - $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content'); - $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content/settings'); - $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content/settings/content-types'); - $active_trail = array_merge($active_trail, $active_trail_end); - } - // Set the breadcrumb for the "Add content" tab of node/add. - else if (drupal_match_path($item['path'], 'node/add')) { - $active_trail = array_slice($active_trail, 0, 1); - $active_trail[] = _commerce_kickstart_menus_get_item('admin'); - $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content'); - $active_trail[] = _commerce_kickstart_menus_get_item('admin/commerce/manage-content/actions'); - $active_trail[] = _commerce_kickstart_menus_get_item('node/add/add-content'); } } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_base.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_base.inc index 81359e38..16c1b297 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_base.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_base.inc @@ -10,7 +10,7 @@ function commerce_kickstart_merchandising_field_default_field_bases() { $field_bases = array(); - // Exported field_base: 'field_link' + // Exported field_base: 'field_link'. $field_bases['field_link'] = array( 'active' => 1, 'cardinality' => 1, @@ -37,7 +37,7 @@ function commerce_kickstart_merchandising_field_default_field_bases() { 'type' => 'link_field', ); - // Exported field_base: 'field_tagline' + // Exported field_base: 'field_tagline'. $field_bases['field_tagline'] = array( 'active' => 1, 'cardinality' => 1, diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_instance.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_instance.inc index 7900c2be..737413be 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_instance.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.features.field_instance.inc @@ -10,7 +10,7 @@ function commerce_kickstart_merchandising_field_default_field_instances() { $field_instances = array(); - // Exported field_instance: 'comment-comment_node_ad_push-comment_body' + // Exported field_instance: 'comment-comment_node_ad_push-comment_body'. $field_instances['comment-comment_node_ad_push-comment_body'] = array( 'bundle' => 'comment_node_ad_push', 'default_value' => NULL, @@ -43,7 +43,7 @@ function commerce_kickstart_merchandising_field_default_field_instances() { ), ); - // Exported field_instance: 'node-ad_push-field_image' + // Exported field_instance: 'node-ad_push-field_image'. $field_instances['node-ad_push-field_image'] = array( 'bundle' => 'ad_push', 'deleted' => 0, @@ -109,7 +109,7 @@ function commerce_kickstart_merchandising_field_default_field_instances() { ), ); - // Exported field_instance: 'node-ad_push-field_link' + // Exported field_instance: 'node-ad_push-field_link'. $field_instances['node-ad_push-field_link'] = array( 'bundle' => 'ad_push', 'default_value' => NULL, @@ -176,7 +176,7 @@ function commerce_kickstart_merchandising_field_default_field_instances() { ), ); - // Exported field_instance: 'node-ad_push-field_tagline' + // Exported field_instance: 'node-ad_push-field_tagline'. $field_instances['node-ad_push-field_tagline'] = array( 'bundle' => 'ad_push', 'default_value' => NULL, @@ -228,7 +228,7 @@ function commerce_kickstart_merchandising_field_default_field_instances() { ), ); - // Exported field_instance: 'node-ad_push-title_field' + // Exported field_instance: 'node-ad_push-title_field'. $field_instances['node-ad_push-title_field'] = array( 'bundle' => 'ad_push', 'default_value' => NULL, diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.info index b684195d..ae8c337a 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.info @@ -41,9 +41,8 @@ features_exclude[field_base][field_image] = field_image features_exclude[field_base][title_field] = title_field files[] = commerce_kickstart_merchandising.migrate.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.module b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.module index 6f884ef6..f5b507cf 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.module +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_merchandising/commerce_kickstart_merchandising.module @@ -19,6 +19,10 @@ function commerce_kickstart_merchandising_migrate_api() { ), ); } + + // Return a near empty array to avoid API warning. + // @link https://www.drupal.org/node/2544320 + return array('api' => 2); } /** diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info index 22e67f1d..e60fe365 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info @@ -8,9 +8,8 @@ dependencies[] = commerce_migrate files[] = commerce_kickstart_migrate.migrate.inc files[] = plugins/destinations/fields.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info index 2ec1fab1..2a72cd96 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info @@ -8,9 +8,8 @@ dependencies[] = commerce_message dependencies[] = commerce_cart dependencies[] = ctools -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_base.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_base.inc index 29953c75..735b5e02 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_base.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_base.inc @@ -10,7 +10,7 @@ function commerce_kickstart_product_field_default_field_bases() { $field_bases = array(); - // Exported field_base: 'commerce_price' + // Exported field_base: 'commerce_price'. $field_bases['commerce_price'] = array( 'active' => 1, 'cardinality' => 1, @@ -32,7 +32,7 @@ function commerce_kickstart_product_field_default_field_bases() { 'type' => 'commerce_price', ); - // Exported field_base: 'field_bag_size' + // Exported field_base: 'field_bag_size'. $field_bases['field_bag_size'] = array( 'active' => 1, 'cardinality' => 1, @@ -53,12 +53,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_brand' + // Exported field_base: 'field_brand'. $field_bases['field_brand'] = array( 'active' => 1, 'cardinality' => 1, @@ -79,12 +80,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_category' + // Exported field_base: 'field_category'. $field_bases['field_category'] = array( 'active' => 1, 'cardinality' => 1, @@ -105,12 +107,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_category_color' + // Exported field_base: 'field_category_color'. $field_bases['field_category_color'] = array( 'active' => 1, 'cardinality' => 1, @@ -131,7 +134,7 @@ function commerce_kickstart_product_field_default_field_bases() { 'type' => 'text', ); - // Exported field_base: 'field_collection' + // Exported field_base: 'field_collection'. $field_bases['field_collection'] = array( 'active' => 1, 'cardinality' => 1, @@ -152,12 +155,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_color' + // Exported field_base: 'field_color'. $field_bases['field_color'] = array( 'active' => 1, 'cardinality' => 1, @@ -178,12 +182,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_gender' + // Exported field_base: 'field_gender'. $field_bases['field_gender'] = array( 'active' => 1, 'cardinality' => 1, @@ -204,12 +209,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_hat_size' + // Exported field_base: 'field_hat_size'. $field_bases['field_hat_size'] = array( 'active' => 1, 'cardinality' => 1, @@ -230,12 +236,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_images' + // Exported field_base: 'field_images'. $field_bases['field_images'] = array( 'active' => 1, 'cardinality' => -1, @@ -257,7 +264,7 @@ function commerce_kickstart_product_field_default_field_bases() { 'type' => 'image', ); - // Exported field_base: 'field_product' + // Exported field_base: 'field_product'. $field_bases['field_product'] = array( 'active' => 1, 'cardinality' => -1, @@ -278,7 +285,7 @@ function commerce_kickstart_product_field_default_field_bases() { 'type' => 'commerce_product_reference', ); - // Exported field_base: 'field_shoe_size' + // Exported field_base: 'field_shoe_size'. $field_bases['field_shoe_size'] = array( 'active' => 1, 'cardinality' => 1, @@ -299,12 +306,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_storage_capacity' + // Exported field_base: 'field_storage_capacity'. $field_bases['field_storage_capacity'] = array( 'active' => 1, 'cardinality' => 1, @@ -325,12 +333,13 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); - // Exported field_base: 'field_top_size' + // Exported field_base: 'field_top_size'. $field_bases['field_top_size'] = array( 'active' => 1, 'cardinality' => 1, @@ -351,6 +360,7 @@ function commerce_kickstart_product_field_default_field_bases() { 'parent' => 0, ), ), + 'options_list_callback' => 'title_taxonomy_allowed_values', ), 'translatable' => 0, 'type' => 'taxonomy_term_reference', diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_instance.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_instance.inc index a21391d8..7532f383 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_instance.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field_instance.inc @@ -10,7 +10,7 @@ function commerce_kickstart_product_field_default_field_instances() { $field_instances = array(); - // Exported field_instance: 'commerce_product-bags_cases-commerce_price' + // Exported field_instance: 'commerce_product-bags_cases-commerce_price'. $field_instances['commerce_product-bags_cases-commerce_price'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -142,7 +142,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-bags_cases-field_bag_size' + // Exported field_instance: 'commerce_product-bags_cases-field_bag_size'. $field_instances['commerce_product-bags_cases-field_bag_size'] = array( 'bundle' => 'bags_cases', 'commerce_cart_settings' => array( @@ -218,7 +218,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-bags_cases-field_color' + // Exported field_instance: 'commerce_product-bags_cases-field_color'. $field_instances['commerce_product-bags_cases-field_color'] = array( 'bundle' => 'bags_cases', 'commerce_cart_settings' => array( @@ -294,7 +294,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-bags_cases-field_images' + // Exported field_instance: 'commerce_product-bags_cases-field_images'. $field_instances['commerce_product-bags_cases-field_images'] = array( 'bundle' => 'bags_cases', 'deleted' => 0, @@ -417,7 +417,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-bags_cases-title_field' + // Exported field_instance: 'commerce_product-bags_cases-title_field'. $field_instances['commerce_product-bags_cases-title_field'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -486,7 +486,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-drinks-commerce_price' + // Exported field_instance: 'commerce_product-drinks-commerce_price'. $field_instances['commerce_product-drinks-commerce_price'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -618,7 +618,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-drinks-field_color' + // Exported field_instance: 'commerce_product-drinks-field_color'. $field_instances['commerce_product-drinks-field_color'] = array( 'bundle' => 'drinks', 'commerce_cart_settings' => array( @@ -695,7 +695,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-drinks-field_images' + // Exported field_instance: 'commerce_product-drinks-field_images'. $field_instances['commerce_product-drinks-field_images'] = array( 'bundle' => 'drinks', 'deleted' => 0, @@ -818,7 +818,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-drinks-title_field' + // Exported field_instance: 'commerce_product-drinks-title_field'. $field_instances['commerce_product-drinks-title_field'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -887,7 +887,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-hats-commerce_price' + // Exported field_instance: 'commerce_product-hats-commerce_price'. $field_instances['commerce_product-hats-commerce_price'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -1019,7 +1019,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-hats-field_color' + // Exported field_instance: 'commerce_product-hats-field_color'. $field_instances['commerce_product-hats-field_color'] = array( 'bundle' => 'hats', 'commerce_cart_settings' => array( @@ -1100,7 +1100,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-hats-field_hat_size' + // Exported field_instance: 'commerce_product-hats-field_hat_size'. $field_instances['commerce_product-hats-field_hat_size'] = array( 'bundle' => 'hats', 'commerce_cart_settings' => array( @@ -1180,7 +1180,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-hats-field_images' + // Exported field_instance: 'commerce_product-hats-field_images'. $field_instances['commerce_product-hats-field_images'] = array( 'bundle' => 'hats', 'deleted' => 0, @@ -1303,7 +1303,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-hats-title_field' + // Exported field_instance: 'commerce_product-hats-title_field'. $field_instances['commerce_product-hats-title_field'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -1372,7 +1372,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-shoes-commerce_price' + // Exported field_instance: 'commerce_product-shoes-commerce_price'. $field_instances['commerce_product-shoes-commerce_price'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -1504,7 +1504,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-shoes-field_color' + // Exported field_instance: 'commerce_product-shoes-field_color'. $field_instances['commerce_product-shoes-field_color'] = array( 'bundle' => 'shoes', 'commerce_cart_settings' => array( @@ -1581,7 +1581,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-shoes-field_images' + // Exported field_instance: 'commerce_product-shoes-field_images'. $field_instances['commerce_product-shoes-field_images'] = array( 'bundle' => 'shoes', 'deleted' => 0, @@ -1704,7 +1704,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-shoes-field_shoe_size' + // Exported field_instance: 'commerce_product-shoes-field_shoe_size'. $field_instances['commerce_product-shoes-field_shoe_size'] = array( 'bundle' => 'shoes', 'commerce_cart_settings' => array( @@ -1780,7 +1780,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-shoes-title_field' + // Exported field_instance: 'commerce_product-shoes-title_field'. $field_instances['commerce_product-shoes-title_field'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -1849,7 +1849,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-storage_devices-commerce_price' + // Exported field_instance: 'commerce_product-storage_devices-commerce_price'. $field_instances['commerce_product-storage_devices-commerce_price'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -1981,7 +1981,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-storage_devices-field_images' + // Exported field_instance: 'commerce_product-storage_devices-field_images'. $field_instances['commerce_product-storage_devices-field_images'] = array( 'bundle' => 'storage_devices', 'deleted' => 0, @@ -2105,7 +2105,7 @@ function commerce_kickstart_product_field_default_field_instances() { ); // Exported field_instance: - // 'commerce_product-storage_devices-field_storage_capacity' + // 'commerce_product-storage_devices-field_storage_capacity'. $field_instances['commerce_product-storage_devices-field_storage_capacity'] = array( 'bundle' => 'storage_devices', 'commerce_cart_settings' => array( @@ -2180,7 +2180,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-storage_devices-title_field' + // Exported field_instance: 'commerce_product-storage_devices-title_field'. $field_instances['commerce_product-storage_devices-title_field'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -2249,7 +2249,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-tops-commerce_price' + // Exported field_instance: 'commerce_product-tops-commerce_price'. $field_instances['commerce_product-tops-commerce_price'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -2381,7 +2381,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-tops-field_color' + // Exported field_instance: 'commerce_product-tops-field_color'. $field_instances['commerce_product-tops-field_color'] = array( 'bundle' => 'tops', 'commerce_cart_settings' => array( @@ -2457,7 +2457,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-tops-field_images' + // Exported field_instance: 'commerce_product-tops-field_images'. $field_instances['commerce_product-tops-field_images'] = array( 'bundle' => 'tops', 'deleted' => 0, @@ -2580,7 +2580,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-tops-field_top_size' + // Exported field_instance: 'commerce_product-tops-field_top_size'. $field_instances['commerce_product-tops-field_top_size'] = array( 'bundle' => 'tops', 'commerce_cart_settings' => array( @@ -2656,7 +2656,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'commerce_product-tops-title_field' + // Exported field_instance: 'commerce_product-tops-title_field'. $field_instances['commerce_product-tops-title_field'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -2725,7 +2725,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-body' + // Exported field_instance: 'node-bags_cases-body'. $field_instances['node-bags_cases-body'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -2790,7 +2790,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-field_brand' + // Exported field_instance: 'node-bags_cases-field_brand'. $field_instances['node-bags_cases-field_brand'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -2848,7 +2848,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-field_category' + // Exported field_instance: 'node-bags_cases-field_category'. $field_instances['node-bags_cases-field_category'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -2905,7 +2905,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-field_collection' + // Exported field_instance: 'node-bags_cases-field_collection'. $field_instances['node-bags_cases-field_collection'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -2962,7 +2962,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-field_gender' + // Exported field_instance: 'node-bags_cases-field_gender'. $field_instances['node-bags_cases-field_gender'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -3019,7 +3019,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-field_product' + // Exported field_instance: 'node-bags_cases-field_product'. $field_instances['node-bags_cases-field_product'] = array( 'bundle' => 'bags_cases', 'deleted' => 0, @@ -3114,7 +3114,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-bags_cases-title_field' + // Exported field_instance: 'node-bags_cases-title_field'. $field_instances['node-bags_cases-title_field'] = array( 'bundle' => 'bags_cases', 'default_value' => NULL, @@ -3176,7 +3176,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-body' + // Exported field_instance: 'node-drinks-body'. $field_instances['node-drinks-body'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -3241,7 +3241,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-field_brand' + // Exported field_instance: 'node-drinks-field_brand'. $field_instances['node-drinks-field_brand'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -3299,7 +3299,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-field_category' + // Exported field_instance: 'node-drinks-field_category'. $field_instances['node-drinks-field_category'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -3356,7 +3356,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-field_collection' + // Exported field_instance: 'node-drinks-field_collection'. $field_instances['node-drinks-field_collection'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -3413,7 +3413,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-field_gender' + // Exported field_instance: 'node-drinks-field_gender'. $field_instances['node-drinks-field_gender'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -3469,7 +3469,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-field_product' + // Exported field_instance: 'node-drinks-field_product'. $field_instances['node-drinks-field_product'] = array( 'bundle' => 'drinks', 'deleted' => 0, @@ -3563,7 +3563,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-drinks-title_field' + // Exported field_instance: 'node-drinks-title_field'. $field_instances['node-drinks-title_field'] = array( 'bundle' => 'drinks', 'default_value' => NULL, @@ -3626,7 +3626,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-body' + // Exported field_instance: 'node-hats-body'. $field_instances['node-hats-body'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -3691,7 +3691,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-field_brand' + // Exported field_instance: 'node-hats-field_brand'. $field_instances['node-hats-field_brand'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -3749,7 +3749,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-field_category' + // Exported field_instance: 'node-hats-field_category'. $field_instances['node-hats-field_category'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -3806,7 +3806,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-field_collection' + // Exported field_instance: 'node-hats-field_collection'. $field_instances['node-hats-field_collection'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -3863,7 +3863,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-field_gender' + // Exported field_instance: 'node-hats-field_gender'. $field_instances['node-hats-field_gender'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -3920,7 +3920,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-field_product' + // Exported field_instance: 'node-hats-field_product'. $field_instances['node-hats-field_product'] = array( 'bundle' => 'hats', 'deleted' => 0, @@ -4015,7 +4015,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-hats-title_field' + // Exported field_instance: 'node-hats-title_field'. $field_instances['node-hats-title_field'] = array( 'bundle' => 'hats', 'default_value' => NULL, @@ -4077,7 +4077,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-body' + // Exported field_instance: 'node-shoes-body'. $field_instances['node-shoes-body'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -4142,7 +4142,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-field_brand' + // Exported field_instance: 'node-shoes-field_brand'. $field_instances['node-shoes-field_brand'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -4200,7 +4200,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-field_category' + // Exported field_instance: 'node-shoes-field_category'. $field_instances['node-shoes-field_category'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -4257,7 +4257,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-field_collection' + // Exported field_instance: 'node-shoes-field_collection'. $field_instances['node-shoes-field_collection'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -4314,7 +4314,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-field_gender' + // Exported field_instance: 'node-shoes-field_gender'. $field_instances['node-shoes-field_gender'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -4371,7 +4371,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-field_product' + // Exported field_instance: 'node-shoes-field_product'. $field_instances['node-shoes-field_product'] = array( 'bundle' => 'shoes', 'deleted' => 0, @@ -4466,7 +4466,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-shoes-title_field' + // Exported field_instance: 'node-shoes-title_field'. $field_instances['node-shoes-title_field'] = array( 'bundle' => 'shoes', 'default_value' => NULL, @@ -4528,7 +4528,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-body' + // Exported field_instance: 'node-storage_devices-body'. $field_instances['node-storage_devices-body'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -4593,7 +4593,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-field_brand' + // Exported field_instance: 'node-storage_devices-field_brand'. $field_instances['node-storage_devices-field_brand'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -4651,7 +4651,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-field_category' + // Exported field_instance: 'node-storage_devices-field_category'. $field_instances['node-storage_devices-field_category'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -4708,7 +4708,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-field_collection' + // Exported field_instance: 'node-storage_devices-field_collection'. $field_instances['node-storage_devices-field_collection'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -4765,7 +4765,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-field_gender' + // Exported field_instance: 'node-storage_devices-field_gender'. $field_instances['node-storage_devices-field_gender'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -4822,7 +4822,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-field_product' + // Exported field_instance: 'node-storage_devices-field_product'. $field_instances['node-storage_devices-field_product'] = array( 'bundle' => 'storage_devices', 'deleted' => 0, @@ -4909,7 +4909,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-storage_devices-title_field' + // Exported field_instance: 'node-storage_devices-title_field'. $field_instances['node-storage_devices-title_field'] = array( 'bundle' => 'storage_devices', 'default_value' => NULL, @@ -4971,7 +4971,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-body' + // Exported field_instance: 'node-tops-body'. $field_instances['node-tops-body'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -5034,7 +5034,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-field_brand' + // Exported field_instance: 'node-tops-field_brand'. $field_instances['node-tops-field_brand'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -5092,7 +5092,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-field_category' + // Exported field_instance: 'node-tops-field_category'. $field_instances['node-tops-field_category'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -5149,7 +5149,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-field_collection' + // Exported field_instance: 'node-tops-field_collection'. $field_instances['node-tops-field_collection'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -5206,7 +5206,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-field_gender' + // Exported field_instance: 'node-tops-field_gender'. $field_instances['node-tops-field_gender'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -5263,7 +5263,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-field_product' + // Exported field_instance: 'node-tops-field_product'. $field_instances['node-tops-field_product'] = array( 'bundle' => 'tops', 'deleted' => 0, @@ -5358,7 +5358,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'node-tops-title_field' + // Exported field_instance: 'node-tops-title_field'. $field_instances['node-tops-title_field'] = array( 'bundle' => 'tops', 'default_value' => NULL, @@ -5420,7 +5420,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'taxonomy_term-category-field_category_color' + // Exported field_instance: 'taxonomy_term-category-field_category_color'. $field_instances['taxonomy_term-category-field_category_color'] = array( 'bundle' => 'category', 'default_value' => array( @@ -5464,7 +5464,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'taxonomy_term-collection-field_image' + // Exported field_instance: 'taxonomy_term-collection-field_image'. $field_instances['taxonomy_term-collection-field_image'] = array( 'bundle' => 'collection', 'deleted' => 0, @@ -5523,7 +5523,7 @@ function commerce_kickstart_product_field_default_field_instances() { ), ); - // Exported field_instance: 'taxonomy_term-color-field_category_color' + // Exported field_instance: 'taxonomy_term-color-field_category_color'. $field_instances['taxonomy_term-color-field_category_color'] = array( 'bundle' => 'color', 'default_value' => NULL, diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.info index f7f2b7a8..659f5215 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.info @@ -230,9 +230,8 @@ features_exclude[field_base][field_image] = field_image features_exclude[field_base][title_field] = title_field files[] = commerce_kickstart_product.migrate.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.info index 023d2226..b6a2625b 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.info @@ -7,9 +7,8 @@ dependencies[] = commerce_product dependencies[] = views dependencies[] = libraries -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_reset/commerce_kickstart_reset.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_reset/commerce_kickstart_reset.info index 92673c72..f3ad9bd1 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_reset/commerce_kickstart_reset.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_reset/commerce_kickstart_reset.info @@ -2,9 +2,8 @@ name = Commerce Kickstart Reset core = 7.x package = Commerce Kickstart -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_search/commerce_kickstart_search.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_search/commerce_kickstart_search.info index 5ca57242..21f04581 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_search/commerce_kickstart_search.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_search/commerce_kickstart_search.info @@ -15,9 +15,8 @@ dependencies[] = search_api_views dependencies[] = views scripts[] = commerce_kickstart_search.js -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_base.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_base.inc index 07be029c..427e7fdb 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_base.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_base.inc @@ -10,7 +10,7 @@ function commerce_kickstart_slideshow_field_default_field_bases() { $field_bases = array(); - // Exported field_base: 'comment_body' + // Exported field_base: 'comment_body'. $field_bases['comment_body'] = array( 'active' => 1, 'cardinality' => 1, @@ -31,7 +31,7 @@ function commerce_kickstart_slideshow_field_default_field_bases() { 'type' => 'text_long', ); - // Exported field_base: 'field_headline' + // Exported field_base: 'field_headline'. $field_bases['field_headline'] = array( 'active' => 1, 'cardinality' => 1, @@ -52,7 +52,7 @@ function commerce_kickstart_slideshow_field_default_field_bases() { 'type' => 'text', ); - // Exported field_base: 'field_link' + // Exported field_base: 'field_link'. $field_bases['field_link'] = array( 'active' => 1, 'cardinality' => 1, @@ -79,7 +79,7 @@ function commerce_kickstart_slideshow_field_default_field_bases() { 'type' => 'link_field', ); - // Exported field_base: 'field_tagline' + // Exported field_base: 'field_tagline'. $field_bases['field_tagline'] = array( 'active' => 1, 'cardinality' => 1, diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_instance.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_instance.inc index 0263556c..19ebe96c 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_instance.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.features.field_instance.inc @@ -10,7 +10,7 @@ function commerce_kickstart_slideshow_field_default_field_instances() { $field_instances = array(); - // Exported field_instance: 'comment-comment_node_slideshow-comment_body' + // Exported field_instance: 'comment-comment_node_slideshow-comment_body'. $field_instances['comment-comment_node_slideshow-comment_body'] = array( 'bundle' => 'comment_node_slideshow', 'default_value' => NULL, @@ -43,7 +43,7 @@ function commerce_kickstart_slideshow_field_default_field_instances() { ), ); - // Exported field_instance: 'node-slideshow-field_headline' + // Exported field_instance: 'node-slideshow-field_headline'. $field_instances['node-slideshow-field_headline'] = array( 'bundle' => 'slideshow', 'default_value' => NULL, @@ -95,7 +95,7 @@ function commerce_kickstart_slideshow_field_default_field_instances() { ), ); - // Exported field_instance: 'node-slideshow-field_image' + // Exported field_instance: 'node-slideshow-field_image'. $field_instances['node-slideshow-field_image'] = array( 'bundle' => 'slideshow', 'deleted' => 0, @@ -161,7 +161,7 @@ function commerce_kickstart_slideshow_field_default_field_instances() { ), ); - // Exported field_instance: 'node-slideshow-field_link' + // Exported field_instance: 'node-slideshow-field_link'. $field_instances['node-slideshow-field_link'] = array( 'bundle' => 'slideshow', 'default_value' => NULL, @@ -228,7 +228,7 @@ function commerce_kickstart_slideshow_field_default_field_instances() { ), ); - // Exported field_instance: 'node-slideshow-field_tagline' + // Exported field_instance: 'node-slideshow-field_tagline'. $field_instances['node-slideshow-field_tagline'] = array( 'bundle' => 'slideshow', 'default_value' => NULL, @@ -280,7 +280,7 @@ function commerce_kickstart_slideshow_field_default_field_instances() { ), ); - // Exported field_instance: 'node-slideshow-title_field' + // Exported field_instance: 'node-slideshow-title_field'. $field_instances['node-slideshow-title_field'] = array( 'bundle' => 'slideshow', 'default_value' => NULL, diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.info index 4914ac21..9ae7ab7f 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_slideshow/commerce_kickstart_slideshow.info @@ -50,9 +50,8 @@ features_exclude[field_base][field_image] = field_image features_exclude[field_base][title_field] = title_field files[] = commerce_kickstart_slideshow.migrate.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_custom.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_custom.inc index 1e02ae6c..dc233c5f 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_custom.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_custom.inc @@ -21,6 +21,5 @@ function commerce_kickstart_social_menu_default_menu_custom() { t('Connect with us'); t('The "Connect with us" menu.'); - return $menus; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_links.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_links.inc index 873af166..9f101930 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_links.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.features.menu_links.inc @@ -10,7 +10,7 @@ function commerce_kickstart_social_menu_default_menu_links() { $menu_links = array(); - // Exported menu link: menu-social-connection_follow-us-on-twitter:https://twitter.com/commerceguys + // Exported menu link: menu-social-connection_follow-us-on-twitter:https://twitter.com/commerceguys. $menu_links['menu-social-connection_follow-us-on-twitter:https://twitter.com/commerceguys'] = array( 'menu_name' => 'menu-social-connection', 'link_path' => 'https://twitter.com/commerceguys', @@ -34,7 +34,7 @@ function commerce_kickstart_social_menu_default_menu_links() { 'weight' => -49, 'customized' => 1, ); - // Exported menu link: menu-social-connection_like-us-on-facebook:https://www.facebook.com/commerceguys + // Exported menu link: menu-social-connection_like-us-on-facebook:https://www.facebook.com/commerceguys. $menu_links['menu-social-connection_like-us-on-facebook:https://www.facebook.com/commerceguys'] = array( 'menu_name' => 'menu-social-connection', 'link_path' => 'https://www.facebook.com/commerceguys', @@ -58,7 +58,7 @@ function commerce_kickstart_social_menu_default_menu_links() { 'weight' => -50, 'customized' => 1, ); - // Exported menu link: menu-social-connection_what-we-like-on-pinterest:http://pinterest.com/ + // Exported menu link: menu-social-connection_what-we-like-on-pinterest:http://pinterest.com/. $menu_links['menu-social-connection_what-we-like-on-pinterest:http://pinterest.com/'] = array( 'menu_name' => 'menu-social-connection', 'link_path' => 'http://pinterest.com/', @@ -82,12 +82,12 @@ function commerce_kickstart_social_menu_default_menu_links() { 'weight' => -48, 'customized' => 1, ); + // Translatables // Included for use with string extractors like potx. t('Follow Us on Twitter'); t('Like us on Facebook'); t('What We Like on Pinterest'); - return $menu_links; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.info index c41f6d69..513a0d0d 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.info @@ -2,7 +2,6 @@ name = Commerce Kickstart Social description = Social features for Commerce kickstart. core = 7.x package = Commerce Kickstart -php = 5.2.4 dependencies[] = block dependencies[] = connector_action_default_register_form dependencies[] = ctools @@ -33,9 +32,8 @@ features[variable][] = service_links_show features[variable][] = service_links_style features[variable][] = service_links_visibility_for_node -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.strongarm.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.strongarm.inc index 6cdaa0fa..356f7424 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.strongarm.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_social/commerce_kickstart_social.strongarm.inc @@ -31,6 +31,33 @@ function commerce_kickstart_social_strongarm() { $strongarm->value = ''; $export['service_links_label_in_node'] = $strongarm; + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'service_links_node_types'; + $strongarm->value = array( + 0 => 'bags_cases', + 1 => 'drinks', + 2 => 'hats', + 3 => 'shoes', + 4 => 'storage_devices', + 5 => 'tops', + ); + $export['service_links_node_types'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'service_links_node_view_modes'; + $strongarm->value = array( + 'full' => 'full', + 'teaser' => 0, + 'rss' => 0, + 'token' => 0, + 'product_list' => 0, + ); + $export['service_links_node_view_modes'] = $strongarm; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; @@ -56,25 +83,5 @@ function commerce_kickstart_social_strongarm() { $strongarm->value = '0'; $export['service_links_visibility_for_node'] = $strongarm; - $strongarm = new stdClass(); - $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ - $strongarm->api_version = 1; - $strongarm->name = 'service_links_node_types'; - $strongarm->value = array_keys(commerce_product_reference_node_types()); - $export['service_links_node_types'] = $strongarm; - - $strongarm = new stdClass(); - $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ - $strongarm->api_version = 1; - $strongarm->name = 'service_links_node_view_modes'; - $strongarm->value = array( - 'full' => 'full', - 'teaser' => 0, - 'rss' => 0, - 'token' => 0, - 'product_list' => 0, - ); - $export['service_links_node_view_modes'] = $strongarm; - return $export; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.info index e3255ccb..aeb79ee9 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.info @@ -9,9 +9,8 @@ dependencies[] = views ; Views files files[] = includes/views/handlers/commerce_kickstart_taxonomy_handler_field_text.inc -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.module b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.module index 5dfd0bb7..e04982af 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.module +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/commerce_kickstart_taxonomy.module @@ -98,7 +98,7 @@ function commerce_kickstart_taxonomy_term_path($vid, $tid) { } else { $path = $vocabulary->machine_name . '/' . $tid; - if (variable_get(_taxonomy_menu_build_variable('display_decendants', $vid), FALSE)) { + if (variable_get(_taxonomy_menu_build_variable('display_descendants', $vid), FALSE)) { // Use 'all' at the end of the path if (variable_get(_taxonomy_menu_build_variable('end_all', $vid), FALSE)) { $path .= '/all'; diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/includes/views/commerce_kickstart_taxonomy.views_default.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/includes/views/commerce_kickstart_taxonomy.views_default.inc index d6fde2f6..67cdea45 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/includes/views/commerce_kickstart_taxonomy.views_default.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_taxonomy/includes/views/commerce_kickstart_taxonomy.views_default.inc @@ -199,6 +199,10 @@ function commerce_kickstart_taxonomy_views_default_views() { * Add specific overrides for the no demo store. */ function commerce_kickstart_taxonomy_views_default_views_alter(&$views) { + if (!isset($views['collection_products'])) { + return; + } + $install_demo_store = variable_get('commerce_kickstart_demo_store', FALSE); if (empty($install_demo_store)) { $view = &$views['collection_products']; diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_custom.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_custom.inc index ad83b5b6..91cb5a00 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_custom.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_custom.inc @@ -20,6 +20,5 @@ function commerce_kickstart_user_menu_default_menu_custom() { // Included for use with string extractors like potx. t('Kickstart User menu'); - return $menus; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_links.inc b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_links.inc index 8ab65d91..709e757b 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_links.inc +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.features.menu_links.inc @@ -10,7 +10,7 @@ function commerce_kickstart_user_menu_default_menu_links() { $menu_links = array(); - // Exported menu link: menu-user-menu_create-account:user/register + // Exported menu link: menu-user-menu_create-account:user/register. $menu_links['menu-user-menu_create-account:user/register'] = array( 'menu_name' => 'menu-user-menu', 'link_path' => 'user/register', @@ -28,7 +28,7 @@ function commerce_kickstart_user_menu_default_menu_links() { 'weight' => 2, 'customized' => 1, ); - // Exported menu link: menu-user-menu_log-in:user/login + // Exported menu link: menu-user-menu_log-in:user/login. $menu_links['menu-user-menu_log-in:user/login'] = array( 'menu_name' => 'menu-user-menu', 'link_path' => 'user/login', @@ -46,7 +46,7 @@ function commerce_kickstart_user_menu_default_menu_links() { 'weight' => 1, 'customized' => 1, ); - // Exported menu link: menu-user-menu_log-out:user/logout + // Exported menu link: menu-user-menu_log-out:user/logout. $menu_links['menu-user-menu_log-out:user/logout'] = array( 'menu_name' => 'menu-user-menu', 'link_path' => 'user/logout', @@ -64,7 +64,7 @@ function commerce_kickstart_user_menu_default_menu_links() { 'weight' => 4, 'customized' => 1, ); - // Exported menu link: menu-user-menu_my-account:user + // Exported menu link: menu-user-menu_my-account:user. $menu_links['menu-user-menu_my-account:user'] = array( 'menu_name' => 'menu-user-menu', 'link_path' => 'user', @@ -83,6 +83,7 @@ function commerce_kickstart_user_menu_default_menu_links() { 'weight' => 3, 'customized' => 1, ); + // Translatables // Included for use with string extractors like potx. t('Create account'); @@ -90,6 +91,5 @@ function commerce_kickstart_user_menu_default_menu_links() { t('Log out'); t('My account'); - return $menu_links; } diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.info b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.info index 09446aed..b5de2b22 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/commerce_kickstart_user/commerce_kickstart_user.info @@ -39,9 +39,8 @@ features[variable][] = user_email_verification features[variable][] = user_pictures features[variable][] = user_register -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/commerce_kickstart/toolbar_megamenu/toolbar_megamenu.info b/profiles/commerce_kickstart/modules/commerce_kickstart/toolbar_megamenu/toolbar_megamenu.info index 45ce985b..186aa679 100644 --- a/profiles/commerce_kickstart/modules/commerce_kickstart/toolbar_megamenu/toolbar_megamenu.info +++ b/profiles/commerce_kickstart/modules/commerce_kickstart/toolbar_megamenu/toolbar_megamenu.info @@ -3,9 +3,8 @@ description = "Extension of Toolbar to support dropdown megamenus." core = 7.x dependencies[] = toolbar -; Information added by Drupal.org packaging script on 2015-08-20 -version = "7.x-2.28" +; Information added by Drupal.org packaging script on 2018-10-18 +version = "7.x-2.55" core = "7.x" project = "commerce_kickstart" -datestamp = "1440110572" - +datestamp = "1539873597" diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addresses.txt b/profiles/commerce_kickstart/modules/contrib/addressfield/addresses.txt index e64b8202..1f11bd89 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addresses.txt +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addresses.txt @@ -1,298 +1,298 @@ -AT NULL Feldkirch NULL 6800 Pater Grimm Weg 20 -AU NULL Melbourne NULL -AU NULL Sydney NULL -AU 04 NULL NORMANBY NULL 4059 30 Normanby Terrace -BD NULL Dhaka NULL 1205 23, Subal Das Road, Chowdhury Bazar, Lalbagh -BD NULL Dhaka NULL 1207 R-1,H-19,Kallaynpur,Mirpur,Dhaka -BD NULL Dhaka NULL 1207 World Bank Office Dhaka, Plot E 32, Agargaon, Sher-E-Bangla Nagar -BD NULL Dhaka NULL 1209 House# 66B, Flat# B2 Zigatola -BD NULL Dhaka NULL 1219 390 West Rampura Dhaka -BD NULL Dhaka NULL 1230 Uttara -BD 81 NULL Dhaka NULL 1000 Institute of Water and Flood Management -BD 81 NULL Dhaka NULL 1203 84/a maniknagar -BD 81 NULL Dhaka NULL 1205 Dhaka Bangladesh -BD 81 NULL Dhaka NULL 1207 BetterStories Limited 17 West Panthopath -BD 81 NULL Dhaka NULL 1216 Mirpur, Dhaka -BD 81 NULL Dhaka NULL 1230 830, Prembagan, Dhakshin Khan -BD 82 NULL khulna NULL 9203 -BD NULL NULL Dhaka NULL 1000 Institute of Water and Flood Management -BD NULL NULL Dhaka NULL 1207 World Bank Office Dhaka, Plot E 32, Agargaon, Sher-E-Bangla Nagar -BE NULL Brussels NULL -BE NULL Watermael-Boitsfort NULL 1170 Avenue des Staphylins -BH NULL Manama NULL 00973 Manama Bahrain Manama Bahrain -BR NULL Porto Alegre NULL -BR NULL Recife NULL -BR RJ NULL Rio de Janeiro NULL -BW NULL Francistown NULL NULL -BW NULL NULL Francistown NULL NULL -CA NULL Montreal NULL -CA NULL Toronto NULL -CA BC NULL Vancouver NULL -CA ON NULL Kitchener NULL -CA ON NULL wterloo NULL n2l3g1 200 University Avenue West -CH NULL Geneva NULL 1202 15, chemin Louis-Dunant -CH 25 NULL Zurich NULL 8098 UBS Optimus Foundation Augustinerhof 1 -DE NULL Berlin NULL -DE 05 NULL Frankfurt am Main NULL 60386 Johanna-Tesch-Platz 7 -DK NULL Aarhus NULL -ES NULL Bilbao NULL -ET 44 NULL ADDIS ABABA NULL 11945 ADDIS ABABA,P.O.BOX 11945 -FI NULL Espoo NULL 02130 Mahlarinne 3B -FI NULL Helsinki NULL 00580 Hermannin rantatie 2 A Hermannin rantatie 2 A -FI NULL Tampere NULL 33101 Tampere Univerity of Technology -FI 13 NULL Espoo NULL 02150 Aalto Venture Garage Betonimiehenkuja 3 -GB NULL Exeter NULL -GB NULL London NULL -GB NULL London NULL N4 2DP 2 Myddleton Ave -GB NULL London NULL N7 0AH 104 St George’s Avenue -GB NULL London NULL SE16 3UL 25 Blue Anchor Lane -GB NULL London NULL SW18 5SP Flat 1 150 Merton road -GB NULL London NULL W1T 4BQ 13 Fitzroy Street -GB NULL Oxford NULL -GB NULL Southampton NULL -GB C3 NULL NULL cb244qg 32 market street swavesey -GB E7 NULL London NULL SE3 7TP -GB F3 NULL Wood Green NULL N22 5RU 6 Cedar House -GB H1 NULL London NULL SE11 5JD 47-49 Durham Street -GB H6 NULL London NULL SE8 4DD 8 Harton St Deptford -GB K2 NULL Oxford NULL OX2 6QY 3 The Villas, Rutherway -GH 05 NULL NSAWAM NULL NULL P.O.BOX 455 -GH NULL NULL Accra NULL NULL -ID NULL Bandung NULL 40134 Jalan Sadang Hegar 1 No. 12 RT04 RW13 Sadang Serang -ID NULL Bekasi NULL 17411 Jl.Binadharma 1 No.62. Jatiwaringin -ID NULL Jakarta NULL -ID NULL Jakarta NULL 12440 Jl. H. Niin 7 Lebak Bulus, Cilandak -ID NULL Jakarta NULL 13330 Otista -ID NULL Jakarta selatan NULL 12000 jl. rawa jati timur 6 no. 10 -ID NULL Jakarta Timur NULL Jl.Mulia No.15B Kel.Bidara Cina, Kec.Jatinegara, Jakarta Timur -ID NULL Pematang Siantar NULL 51511 Jl. Durian I 30 -ID 04 NULL Bogor NULL 16165 -ID 04 NULL jakarta NULL otista -ID 04 NULL Jakarta NULL 12520 Jl. Pertanian Raya III No.42 Jakarta Selatan Pasar Minggu -ID 04 NULL Jakarta NULL 13330 Jakarta -ID 04 NULL Jakarta NULL 13330 Jl Sensus IIC Bidaracina Jaktim -ID 04 NULL Jakarta NULL 13330 Jl. Bonasut 2 no.22 -ID 04 NULL Jakarta NULL 13330 Otista 64c -ID 04 NULL jakarta NULL 13330 Otista jaktim -ID 04 NULL Jakarta Timur NULL 13330 Kebon Sayur I no. 1 RT 10/15 -ID 04 NULL Jakarta Timur NULL 13460 Jl. Pondok Kopi Blok G4/5 RT. 005/08 Jakarta Timur -ID 04 NULL Jakarta Timur NULL 13810 Jl. Raya Pondok Gede Rt03 Rw08 no.35 , Lubang Buaya, Jakarta Timur Jl. Raya Pondok Gede Rt03 Rw08 no.35 , Lubang Buaya, Jakarta Timur -ID 07 NULL Brebes NULL 54321 Jl Kersem Blok D14 Perum Taman Indo Kaligangsa Wetan Brebes -ID 07 NULL Semarang NULL 50143 Puspowarno Tengah 2/2 -ID 08 NULL Lumajang NULL 67373 Desa Tumpeng Kecamatan Candipuro Lumajang -ID 30 NULL Bandung NULL 55241 Jl Pelesiran No 55A/56 -ID 30 NULL Bekasi NULL 17510 bekasi West Java Indonesia -ID 30 NULL Depok NULL 16245 Jalan juragan sinda 2 no 10 -ID 30 NULL Depok NULL 16424 Jalan Margonda RayaJalan Kober Gang Mawar -ID 30 NULL Depok NULL 16424 Jl. Haji Yahya Nuih no.24, Pondok Cina -ID 30 NULL Depok NULL 16425 Kukusan Kelurahan -ID 30 NULL Depok NULL 16518 Jl. Salak No.1/C.88 Durenseribu Bojongsari -ID 30 NULL Depok NULL 16952 Jl. Merak No.34 -36 Rt.004/014 Jl. Merak No. 34 -36 Rt. 004/014 -ID 36 NULL biak numfor NULL 98111 jl. s. mamberamo no 6782 biak numfor -IL NULL Tel Aviv NULL -IN NULL Bangalore NULL -IN NULL India NULL -IN NULL new delhi NULL 110003 55 lodi estate -IN 07 NULL NEW DELHI NULL 110018 15/11 A 1ST FLOOR TILAK NAGAR -IN 07 NULL New Delhu NULL 110075 B 54 Hilansh Apartments Plot No 1, Sector 10, Dwarka -IN 10 NULL Gurgaon NULL D- 201 Ivy Apartments Sushant Lok 1 Gurgaon Haryana -IN 13 NULL Trivandrum NULL 695010 TC 9/1615, SRMH Road, Sasthamangalam, Trivandrum -IN 16 NULL Mumbai NULL 400020 Bharat Mahal, Flat#55 Marine Drive -IN 16 NULL Mumbai NULL 400028 303,Shree Parvati Co-Op Housing Society, D.L.Vaidya Road,Dadar -IN 16 NULL Pune NULL -IN 16 NULL Pune NULL Infosys Campus Hinjewadi Phase 2 -IN 16 NULL Pune NULL 400705 #22 Iris Garden Gokhale Road -IN 16 NULL PUNE NULL 411043 -IN 16 NULL Pune NULL 411051 -IN 16 NULL Pune NULL 411057 Infosys Ltd. Rajiv gandhi infostech park Hinjewadi phase 2 -IN 16 NULL Pune NULL 412108 Pune Maharatshtra -IN 16 NULL Pune NULL 433011 502 utkarsh vihar golande state pune -IN 19 NULL Bangalore NULL 560080 Indian Institute for Human Settlements IIHS Bangalore City Campus, Sadashivanagar, -IN 19 NULL Bangalore NULL 560100 electronic city -IN 19 NULL Bhalki NULL 585411 bhalki,bidar ,karnataka karnataka -IN 24 NULL Jaipur NULL 302011 Institute of Health Management Research 1, Prabhu Dayal Marg -IR 26 NULL Tehran NULL 1118844454 Baharestan sq. mostafa khomeini str., javahery Ave., no. 11, -IT NULL Trento NULL -JM 08 NULL Kingston NULL Kgn 7 MOna Campus UWI -KE NULL Nairobi NULL -KE 05 NULL Nairobi NULL 30300 212,kapsabet -KH NULL NULL Phnom Penh NULL -LR NULL Monrovia NULL 00000 -NG 11 NULL Abuja NULL 930001 17 Bechar street Wuse zone 2 -PE 15 NULL Lima NULL 18 Lima Lima -PE 15 NULL Lima NULL Lima 18 123 Miraflores -PE NULL NULL Lima NULL 03 Calle Granada 104 -PE NULL NULL Lima NULL 18 Lima Lima -PH NULL Manila NULL Globe Telepark 111 Valero Street -PH NULL Quezon Coty NULL 1109 86 Harvard Street, Cubao, Quezon City, Philippines 84 Harvard Street, Cubao, Quezon City,hilippines -PH 20 NULL Silang NULL 4118 370 Bayungan Kaong Silang Cavite -PH 57 NULL Kidapawan NULL 9400 Kidapawan City Kidapawan City -PH 66 NULL zamboanga NULL 7000 29-tripplet rd san jose 29-tripplet rd san jose -PH D9 NULL Pasig City NULL World Bank Office Manila, 20/F Taipan Place F. Ortigas Jr. Road, Ortigas Center -PK NULL Lahore NULL 54000 17-R Model Town Lahore -PK NULL Lahore NULL 54000 53- chamber lane road Lahore -PK NULL Lahore NULL 54000 85 E block Model Town -PK NULL Lahore NULL 54000 House no 227, street no 5, Imamia Colony Shahadra Lahore -PK NULL LAHORE NULL 54000 room no.6 khalid bim waleed hall, near New Anarkali, LAHORE room no.6 khalid bim waleed hall, near New Anarkali, LAHORE -PK NULL Lahore NULL pk097 LUMS, Lahore, -PK NULL Sheikhupura NULL 03935 D.H.Q.Hospital Sheikhupura House number 08. Room no 109 Khalid bin waleed haal, punjab University lahore old campus. -PK 02 NULL Quetta NULL 87000 Postal Address 87000, Kuchlak, Quetta, Balochistan. H#24 Peer Abul Khair road Quetta, Balochistan. -PK 02 NULL Quetta NULL 87300 block no-1 falt no. 7 New Crime Branch Abbas Ali Road Cantt -PK 02 NULL Quetta NULL 87300 Flat no. 3 Shafeen Centre Jinnah Town ,Near I.T university , Quetta -PK 02 NULL Quetta NULL 87300 H-no. C-220 Zarghoonabad Phase-2 , Nawa Killi ,Quetta -PK 04 NULL burewala NULL 60101 Fatima Fayyaz Hazrat Sakina hall girls hostel number 9 Punjab university Lahore Pakistan Sardar Wajid Azim Azeem abad Burewala dist Vehari Pakistan -PK 04 NULL Faisalabad NULL 38000 P 101/1, Green Town, Millat Road, Faisalabad -PK 04 NULL Islamabad NULL 44000 P.O Tarlai kalan chappar Islamabad -PK 04 NULL lahore NULL -PK 04 NULL Lahore NULL 54000 -PK 04 NULL lahore NULL 54000 Street No.63 House 36/A Al-madad Pak Colony Ravi Road, Lahore. Street No.63 House 36/A Al-madad Pak Colony Ravi Road, Lahore. -PK 04 NULL Lahore NULL 54000 1149-1-D2 Green Town Lahore -PK 04 NULL Lahore NULL 54000 124, street# 2, karim block Allama Iqbal Town lahore. 124, street# 2, karim block Allama Iqbal Town lahore. -PK 04 NULL Lahore NULL 54000 150 A Qila Lachman Singh Ravi Road lahore -PK 04 NULL Lahore NULL 54000 166/1L DHA Lahore -PK 04 NULL Lahore NULL 54000 172 A2 Township Lahore -PK 04 NULL Lahore NULL 54000 183,S/Block, Model Town, Lhr -PK 04 NULL lahore NULL 54000 19- A block ,Eden Lane Villas Raiwind Road ,Lahore -PK 04 NULL lahore NULL 54000 3-c kaliyar road opposite kids lyceum, rustam park near mor samnabad -PK 04 NULL Lahore NULL 54000 31 Saeed Block, Canal Bank Scheme -PK 04 NULL Lahore NULL 54000 31c DHA Lahore -PK 04 NULL Lahore NULL 54000 387 E1 wapda town, Lahore -PK 04 NULL Lahore NULL 54000 45-D dha eme sector multan road,lahore -PK 04 NULL Lahore NULL 54000 5 Zafar Ali Road -PK 04 NULL Lahore NULL 54000 54-R PGECHS -PK 04 NULL lahore NULL 54000 566 E-1 johar town lahore 566 E-1 johar town lahore -PK 04 NULL Lahore NULL 54000 82/1 Z Block, Phase 3 DHA -PK 04 NULL Lahore NULL 54000 A-1 VRI Zarrar shaheed road lahore cantt A-1 VRI Zarrar shaheed road lahore cantt -PK 04 NULL lahore NULL 54000 e5/39D street 6 zaman colony cavalry ground ext -PK 04 NULL Lahore NULL 54000 Ho # 61, Block G3, Johar Town Lahore -PK 04 NULL LAhore NULL 54000 House #19-A street #5 Usman nagr Ghaziabad Lahore -PK 04 NULL lahore NULL 54000 House no 692 street no 67 sadar bazar -PK 04 NULL Lahore NULL 54000 Khosa Law Chamber 1 Turner Road -PK 04 NULL Lahore NULL 54000 Lahore,Pakistan Lahore,Pakistan -PK 04 NULL Lahore NULL 54000 room no 69, khalid bin waleed hall, anarkali -PK 04 NULL Lahore NULL 54000 Suite # 8, Al-Hafeez Suites, Gulberg II -PK 04 NULL Lahore NULL 54085 199 Shadman 2 -PK 04 NULL Lahore NULL 54300 Mughalpura Lahore Pakistan -PK 04 NULL Lahore NULL 54660 SD 69 falcon complex gulberg III lahore -PK 04 NULL lahore NULL 54800 764-G4 johar town ,lahore -PK 04 NULL Rawalpindi NULL 44000 House 522, F-Block Sattellite Town, Rawalpindi -PK 04 NULL Rawalpindi NULL 46000 1950/c, Indusroad 2, Tariqabad, Rawalpindi Cantt -PK 04 NULL Rawalpindi NULL 46000 House 54-E Lane 9 Sector 4, AECHS Chaklala Rawalpindi -PK 04 NULL Rawalpindi NULL 46000 House B-1343, Sattellite town Rawalpindi -PK 04 NULL Rawalpindi NULL 46000 House CB-299F, Street 1, Lane 4 Peshawar Road Rawalpindi -PK 04 NULL Rawalpindi NULL 46300 House No 1518 Umer Block phase 8 BehriaTown -PK 04 NULL sialkot NULL 51310 The National Model School, Ismaiealabad, Pacca Garah Sialkot -PK 08 NULL Islamabad NULL CIomsats Institute of Information Technology Islamabad -PK 08 NULL Islamabad NULL 38700 COMSATS tarlai boys hostel Islamabad. COMSATS tarlai boys hostel Islamabad (Room 30) -PK 08 NULL Islamabad NULL 44000 -PK 08 NULL Islamabad NULL 44000 House # 256, Street # 9, Shahzad Town, Islamabad. -PK 08 NULL Islamabad NULL 44000 Islamabad , Comsats University Islamabd ,Pakistan -PK 08 NULL Islamabad NULL 44000 World Bank Building Sector G 5 -PK 08 NULL lahore NULL 54000 3c zafar ali road gulburg 5 3c zafar ali road gulburg 5 -PK 08 NULL lahore NULL 54000 49-a bilal park, chaburgy 49-a bilal park, chaburgy -PK NULL NULL Lahore NULL 54000 -PK NULL NULL Lahore NULL 54000 85 E block Model Town -SN 01 NULL NULL ouakam cité comico en face 217 -SN 01 NULL Dakar NULL -SN 01 NULL Dakar NULL IDEV-ic Patte d'oie Builder's Villa B11 -SN 01 NULL Dakar NULL liberte 6/ dakar -SN 01 NULL Dakar NULL ngor -SN 01 NULL Dakar NULL 4027 ZAC Mbao Cité Fadia -SN NULL NULL Dakar NULL IDEV-ic Patte d'oie Builder's Villa B11 -TZ NULL Dar es Salaam NULL NULL -TZ NULL Dar es salaam NULL NULL 76021 Dar es salaam 1507 Morogoro -TZ NULL Dar es salaam NULL NULL dar es salaam nassoro.ahmedy@yahoo.com -TZ NULL DAR ES SALAAM NULL NULL dar es salaam UDSM -TZ NULL Dar es salaam NULL NULL NA -TZ NULL DAR ES SALAAM NULL NULL P O BOX 23409 -TZ NULL dar es salaam NULL NULL p. o. box 104994 -TZ NULL Dar es Salaam NULL NULL P.o. BOX 71415 Dar es Salaam -TZ NULL Dar es Salaam NULL NULL P.O.BOx 66675 DSM -TZ NULL Dar es salaam NULL NULL Tz Tz -TZ NULL dsm NULL NULL -TZ 02 NULL Bagamoyo NULL NULL PO.Box 393 -TZ 02 NULL Dar es salaam NULL NULL 22548 -TZ 03 NULL Dar-es-salaam NULL NULL Dodoma Municipal Kimara, Dar-es-salaa, -TZ 23 NULL Dar es Salaam NULL NULL -TZ 23 NULL dar es salaam NULL NULL 35074 -TZ 23 NULL dar es salaam NULL NULL 67389 -TZ 23 NULL Dar es Salaam NULL NULL COSTECH, Dar es Salaam, Tanzania -TZ 23 NULL Dar es salaam NULL NULL na -TZ 23 NULL dar es salaam NULL NULL p o box 60164 -TZ 23 NULL dar es salaam NULL NULL P. O. Box 77588 -TZ 23 NULL dar es salaam NULL NULL P.O BOX 78144 -TZ 23 NULL Dar es Salaam NULL NULL P.O.BOX 78373 -TZ 23 NULL Dar es salaam NULL NULL UDSM Dar es Salaam -TZ 23 NULL Dar es salaam NULL NULL udsm udsm -TZ 23 NULL Temeke NULL NULL P.O. Box 50127 -TZ NULL NULL Dar es Salaam NULL NULL -TZ NULL NULL Dar es Salaam NULL NULL Kigoma -TZ NULL NULL Dar es Salaam NULL NULL Mwanza -UG NULL Kampala NULL NULL -UG NULL Kampala NULL NULL Kampala Uganda East Africa -US NULL London NULL SE1 8RT Capital Tower 91 Waterloo Road -US CA NULL Los Angeles NULL -US CA NULL Pleasanton NULL 94588 3412 Pickens Lane -US CA NULL Sacramento NULL -US CA NULL San Francisco NULL -US CA NULL seattle NULL 98113 1234 1st st -US CO NULL Denver NULL 80235 6666 West Quincy Ave -US CT NULL Greenwich NULL 06830 140 Milbank -US CT NULL Hartford NULL 06106 Center for Urban and Global Studies at Trinity College, 70 Vernon Street -US DC NULL Washington NULL -US DC NULL Washington NULL 20007 World Bank Headquarters 1818 H Street NW -US DC NULL Washington NULL 20010 -US DC NULL Washington NULL 20036 -US DC NULL Washington NULL 20405 1889 F St NW -US DC NULL Washington NULL 20433 -US DC NULL Washington NULL 20433 1818 H Street NW -US DC NULL Washington NULL 20433 1818H St -US DC NULL Washington NULL 20433 1818 H Street NW -US DC NULL Washington DC NULL 20005 1424, K Street, NW Suite 600 -US DC NULL Washington DC NULL 20010 1818 H Street, NW -US DC NULL Washington, DC NULL 20003 1818 H Street NW -US DE NULL Virgin Islands|Charlotte Amalie,Cruz Bay,Christiansted NULL Morocco|Tafraout,Rabat,Tangier,Tetouan,Casablanca,Marrakesh,Fez,Oujda,Meknes,Agadir United Arab Emirates|Garhoud,Dubai,Bur Dubai,Ras al Khaymah,Abu Dhabi,Ajman,Al Fujayrah,Sharjah -US FL NULL Falmouth NULL Falmouth Falmouth -US FL NULL Lilongwe NULL Lilongwe Lilongwe -US GA NULL Atlanta NULL -US GU NULL Herndon NULL 15642 Ht USA -US GU NULL Miami NULL Miami Miami -US MD NULL Gaithersburg NULL 20877 554 N Frederick Avenue Suite 216 -US MD NULL Potomac NULL 20854 14 Sandalfoot Court -US MD NULL Silver Spring NULL 20901 9202 Whitney St. -US MI NULL Traverse City NULL 49685 PO Box 792 -US ND NULL Pirassununga NULL Pirassununga Pirassununga -US NJ NULL Princeton NULL -US NY NULL Brooklyn NULL 11206-1980 25 Montrose Ave. Apt 304 -US NY NULL Brooklyn NULL 11225 975 washington ave 2d -US NY NULL Brooklyn NULL 11217 150 4TH AVE APT 9E -US NY NULL New York NULL -US NY NULL New York NULL 10013 148 Lafayette St. PH -US NY NULL New York NULL 10017 UNICEF 3 UN Plaza -US NY NULL New York NULL 10019 25 Columbus Circle Suite 52E -US NY NULL New York NULL 10024 65 West 85th Street 3A -US NY NULL New York NULL 10027 606 W. 116th Street #22 -US NY NULL New York NULL 10037 -US NY NULL Rochester NULL -US NY NULL Scarsdale NULL 10583-1423 54 Walworth Avenue -US OR NULL Portland NULL -US PA NULL Philadelphia NULL -US PA NULL Philadelphia NULL -US PR NULL Colonel Hill NULL Colonel Hill Colonel Hill -US SD NULL Banjul NULL Banjul Banjul -US SD NULL London NULL London London -US TX NULL Aledo NULL 76008 1588 Hunterglenn Dr -US TX NULL Keller NULL 76248 810 Placid View Ct. -US WA NULL Seattle NULL -ZA NULL Cape Town NULL -ZA NULL Cape Town NULL 7945 Alexander Road Muizenberg -ZA NULL Pretoria NULL -ZA 11 NULL Cape Town NULL -ZA 11 NULL Cape Town NULL 7435 PostNet Suite #57, Private Bag X18 Milnerton -ZA 11 NULL Cape town NULL 7508 24 Solyet Court, Lansdowne Road Claremont -ZA 11 NULL Cape Town NULL 7701 -ZA 11 NULL Cape Town NULL 7785 10 Nyamakazi Road Luzuko Park Phillipi East -ZA 11 NULL Cape Town NULL 7915 66 Albert Rd -ZA 11 NULL Cape Town NULL 8001 210 Long Street -ZM NULL Lusaka NULL -ZM 09 NULL LUSAKA NULL 10101 P.O. BOX FW 174 +AT NULL Feldkirch NULL 6800 Pater Grimm Weg 20 NULL +AU NULL Melbourne NULL NULL +AU NULL Sydney NULL NULL +AU 4 NULL NORMANBY NULL 4059 30 Normanby Terrace NULL +BD NULL Dhaka NULL 1205 23, Subal Das Road, Chowdhury Bazar, Lalbagh NULL +BD NULL Dhaka NULL 1207 R-1,H-19,Kallaynpur,Mirpur,Dhaka NULL +BD NULL Dhaka NULL 1207 World Bank Office Dhaka, Plot E 32, Agargaon, Sher-E-Bangla Nagar NULL +BD NULL Dhaka NULL 1209 House# 66B, Flat# B2 Zigatola NULL +BD NULL Dhaka NULL 1219 390 West Rampura Dhaka NULL +BD NULL Dhaka NULL 1230 Uttara NULL +BD 81 NULL Dhaka NULL 1000 Institute of Water and Flood Management NULL +BD 81 NULL Dhaka NULL 1203 84/a maniknagar NULL +BD 81 NULL Dhaka NULL 1205 Dhaka Bangladesh NULL +BD 81 NULL Dhaka NULL 1207 BetterStories Limited 17 West Panthopath NULL +BD 81 NULL Dhaka NULL 1216 Mirpur, Dhaka NULL +BD 81 NULL Dhaka NULL 1230 830, Prembagan, Dhakshin Khan NULL +BD 82 NULL khulna NULL 9203 NULL +BD NULL NULL Dhaka NULL 1000 Institute of Water and Flood Management NULL +BD NULL NULL Dhaka NULL 1207 World Bank Office Dhaka, Plot E 32, Agargaon, Sher-E-Bangla Nagar NULL +BE NULL Brussels NULL NULL +BE NULL Watermael-Boitsfort NULL 1170 Avenue des Staphylins NULL +BH NULL Manama NULL 973 Manama Bahrain Manama Bahrain NULL +BR NULL Porto Alegre NULL NULL +BR NULL Recife NULL NULL +BR RJ NULL Rio de Janeiro NULL NULL +BW NULL Francistown NULL NULL NULL +BW NULL NULL Francistown NULL NULL NULL +CA NULL Montreal NULL NULL +CA NULL Toronto NULL NULL +CA BC NULL Vancouver NULL NULL +CA ON NULL Kitchener NULL NULL +CA ON NULL wterloo NULL n2l3g1 200 University Avenue West NULL +CH NULL Geneva NULL 1202 15, chemin Louis-Dunant NULL +CH 25 NULL Zurich NULL 8098 UBS Optimus Foundation Augustinerhof 1 NULL +DE NULL Berlin NULL NULL +DE 5 NULL Frankfurt am Main NULL 60386 Johanna-Tesch-Platz 7 NULL +DK NULL Aarhus NULL NULL +ES NULL Bilbao NULL NULL +ET 44 NULL ADDIS ABABA NULL 11945 ADDIS ABABA,P.O.BOX 11945 NULL +FI NULL Espoo NULL 2130 Mahlarinne 3B NULL +FI NULL Helsinki NULL 580 Hermannin rantatie 2 A Hermannin rantatie 2 A NULL +FI NULL Tampere NULL 33101 Tampere University of Technology NULL +FI 13 NULL Espoo NULL 2150 Aalto Venture Garage Betonimiehenkuja 3 NULL +GB NULL Exeter NULL NULL +GB NULL London NULL NULL +GB NULL London NULL N4 2DP 2 Myddleton Ave NULL +GB NULL London NULL N7 0AH 104 St George’s Avenue NULL +GB NULL London NULL SE16 3UL 25 Blue Anchor Lane NULL +GB NULL London NULL SW18 5SP Flat 1 150 Merton road NULL +GB NULL London NULL W1T 4BQ 13 Fitzroy Street NULL +GB NULL Oxford NULL NULL +GB NULL Southampton NULL NULL +GB C3 NULL NULL cb244qg 32 market street swavesey NULL +GB E7 NULL London NULL SE3 7TP NULL +GB F3 NULL Wood Green NULL N22 5RU 6 Cedar House NULL +GB H1 NULL London NULL SE11 5JD 47-49 Durham Street NULL +GB H6 NULL London NULL SE8 4DD 8 Harton St Deptford NULL +GB K2 NULL Oxford NULL OX2 6QY 3 The Villas, Rutherway NULL +GH 5 NULL NSAWAM NULL NULL P.O.BOX 455 NULL +GH NULL NULL Accra NULL NULL NULL +ID NULL Bandung NULL 40134 Jalan Sadang Hegar 1 No. 12 RT04 RW13 Sadang Serang NULL +ID NULL Bekasi NULL 17411 Jl.Binadharma 1 No.62. Jatiwaringin NULL +ID NULL Jakarta NULL NULL +ID NULL Jakarta NULL 12440 Jl. H. Niin 7 Lebak Bulus, Cilandak NULL +ID NULL Jakarta NULL 13330 Otista NULL +ID NULL Jakarta selatan NULL 12000 jl. rawa jati timur 6 no. 10 NULL +ID NULL Jakarta Timur NULL Jl.Mulia No.15B Kel.Bidara Cina, Kec.Jatinegara, Jakarta Timur NULL +ID NULL Pematang Siantar NULL 51511 Jl. Durian I 30 NULL +ID 4 NULL Bogor NULL 16165 NULL +ID 4 NULL jakarta NULL otista NULL +ID 4 NULL Jakarta NULL 12520 Jl. Pertanian Raya III No.42 Jakarta Selatan Pasar Minggu NULL +ID 4 NULL Jakarta NULL 13330 Jakarta NULL +ID 4 NULL Jakarta NULL 13330 Jl Sensus IIC Bidaracina Jaktim NULL +ID 4 NULL Jakarta NULL 13330 Jl. Bonasut 2 no.22 NULL +ID 4 NULL Jakarta NULL 13330 Otista 64c NULL +ID 4 NULL jakarta NULL 13330 Otista jaktim NULL +ID 4 NULL Jakarta Timur NULL 13330 Kebon Sayur I no. 1 RT 10/15 NULL +ID 4 NULL Jakarta Timur NULL 13460 Jl. Pondok Kopi Blok G4/5 RT. 005/08 Jakarta Timur NULL +ID 4 NULL Jakarta Timur NULL 13810 Jl. Raya Pondok Gede Rt03 Rw08 no.35 , Lubang Buaya, Jakarta Timur Jl. Raya Pondok Gede Rt03 Rw08 no.35 , Lubang Buaya, Jakarta Timur NULL +ID 7 NULL Brebes NULL 54321 Jl Kersem Blok D14 Perum Taman Indo Kaligangsa Wetan Brebes NULL +ID 7 NULL Semarang NULL 50143 Puspowarno Tengah 2/2 NULL +ID 8 NULL Lumajang NULL 67373 Desa Tumpeng Kecamatan Candipuro Lumajang NULL +ID 30 NULL Bandung NULL 55241 Jl Pelesiran No 55A/56 NULL +ID 30 NULL Bekasi NULL 17510 bekasi West Java Indonesia NULL +ID 30 NULL Depok NULL 16245 Jalan juragan sinda 2 no 10 NULL +ID 30 NULL Depok NULL 16424 Jalan Margonda RayaJalan Kober Gang Mawar NULL +ID 30 NULL Depok NULL 16424 Jl. Haji Yahya Nuih no.24, Pondok Cina NULL +ID 30 NULL Depok NULL 16425 Kukusan Kelurahan NULL +ID 30 NULL Depok NULL 16518 Jl. Salak No.1/C.88 Durenseribu Bojongsari NULL +ID 30 NULL Depok NULL 16952 Jl. Merak No.34 -36 Rt.004/014 Jl. Merak No. 34 -36 Rt. 004/014 NULL +ID 36 NULL biak numfor NULL 98111 jl. s. mamberamo no 6782 biak numfor NULL +IL NULL Tel Aviv NULL NULL +IN NULL Bangalore NULL NULL +IN NULL India NULL NULL +IN NULL new delhi NULL 110003 55 lodi estate NULL +IN 7 NULL NEW DELHI NULL 110018 15/11 A 1ST FLOOR TILAK NAGAR NULL +IN 7 NULL New Delhu NULL 110075 B 54 Hilansh Apartments Plot No 1, Sector 10, Dwarka NULL +IN 10 NULL Gurgaon NULL D- 201 Ivy Apartments Sushant Lok 1 Gurgaon Haryana NULL +IN 13 NULL Trivandrum NULL 695010 TC 9/1615, SRMH Road, Sasthamangalam, Trivandrum NULL +IN 16 NULL Mumbai NULL 400020 Bharat Mahal, Flat#55 Marine Drive NULL +IN 16 NULL Mumbai NULL 400028 303,Shree Parvati Co-Op Housing Society, D.L.Vaidya Road,Dadar NULL +IN 16 NULL Pune NULL NULL +IN 16 NULL Pune NULL Infosys Campus Hinjewadi Phase 2 NULL +IN 16 NULL Pune NULL 400705 #22 Iris Garden Gokhale Road NULL +IN 16 NULL PUNE NULL 411043 NULL +IN 16 NULL Pune NULL 411051 NULL +IN 16 NULL Pune NULL 411057 Infosys Ltd. Rajiv gandhi infostech park Hinjewadi phase 2 NULL +IN 16 NULL Pune NULL 412108 Pune Maharatshtra NULL +IN 16 NULL Pune NULL 433011 502 utkarsh vihar golande state pune NULL +IN 19 NULL Bangalore NULL 560080 Indian Institute for Human Settlements IIHS Bangalore City Campus, Sadashivanagar, NULL +IN 19 NULL Bangalore NULL 560100 electronic city NULL +IN 19 NULL Bhalki NULL 585411 bhalki,bidar ,karnataka karnataka NULL +IN 24 NULL Jaipur NULL 302011 Institute of Health Management Research 1, Prabhu Dayal Marg NULL +IR 26 NULL Tehran NULL 1118844454 Baharestan sq. mostafa khomeini str., javahery Ave., no. 11, NULL +IT NULL Trento NULL NULL +JM 8 NULL Kingston NULL Kgn 7 MOna Campus UWI NULL +KE NULL Nairobi NULL NULL +KE 5 NULL Nairobi NULL 30300 212,kapsabet NULL +KH NULL NULL Phnom Penh NULL NULL +LR NULL Monrovia NULL 0 NULL +NG 11 NULL Abuja NULL 930001 17 Bechar street Wuse zone 2 NULL +PE 15 NULL Lima NULL 18 Lima Lima NULL +PE 15 NULL Lima NULL Lima 18 123 Miraflores NULL +PE NULL NULL Lima NULL 3 Calle Granada 104 NULL +PE NULL NULL Lima NULL 18 Lima Lima NULL +PH NULL Manila NULL Globe Telepark 111 Valero Street NULL +PH NULL Quezon Coty NULL 1109 86 Harvard Street, Cubao, Quezon City, Philippines 84 Harvard Street, Cubao, Quezon City,hilippines NULL +PH 20 NULL Silang NULL 4118 370 Bayungan Kaong Silang Cavite NULL +PH 57 NULL Kidapawan NULL 9400 Kidapawan City Kidapawan City NULL +PH 66 NULL zamboanga NULL 7000 29-tripplet rd san jose 29-tripplet rd san jose NULL +PH D9 NULL Pasig City NULL World Bank Office Manila, 20/F Taipan Place F. Ortigas Jr. Road, Ortigas Center NULL +PK NULL Lahore NULL 54000 17-R Model Town Lahore NULL +PK NULL Lahore NULL 54000 53- chamber lane road Lahore NULL +PK NULL Lahore NULL 54000 85 E block Model Town NULL +PK NULL Lahore NULL 54000 House no 227, street no 5, Imamia Colony Shahadra Lahore NULL +PK NULL LAHORE NULL 54000 room no.6 khalid bim waleed hall, near New Anarkali, LAHORE room no.6 khalid bim waleed hall, near New Anarkali, LAHORE NULL +PK NULL Lahore NULL pk097 LUMS, Lahore, NULL +PK NULL Sheikhupura NULL 3935 D.H.Q.Hospital Sheikhupura House number 08. Room no 109 Khalid bin waleed haal, punjab University lahore old campus. NULL +PK 2 NULL Quetta NULL 87000 Postal Address 87000, Kuchlak, Quetta, Balochistan. H#24 Peer Abul Khair road Quetta, Balochistan. NULL +PK 2 NULL Quetta NULL 87300 block no-1 falt no. 7 New Crime Branch Abbas Ali Road Cantt NULL +PK 2 NULL Quetta NULL 87300 Flat no. 3 Shafeen Centre Jinnah Town ,Near I.T university , Quetta NULL +PK 2 NULL Quetta NULL 87300 H-no. C-220 Zarghoonabad Phase-2 , Nawa Killi ,Quetta NULL +PK 4 NULL burewala NULL 60101 Fatima Fayyaz Hazrat Sakina hall girls hostel number 9 Punjab university Lahore Pakistan Sardar Wajid Azim Azeem abad Burewala dist Vehari Pakistan NULL +PK 4 NULL Faisalabad NULL 38000 P 101/1, Green Town, Millat Road, Faisalabad NULL +PK 4 NULL Islamabad NULL 44000 P.O Tarlai kalan chappar Islamabad NULL +PK 4 NULL lahore NULL NULL +PK 4 NULL Lahore NULL 54000 NULL +PK 4 NULL lahore NULL 54000 Street No.63 House 36/A Al-madad Pak Colony Ravi Road, Lahore. Street No.63 House 36/A Al-madad Pak Colony Ravi Road, Lahore. NULL +PK 4 NULL Lahore NULL 54000 1149-1-D2 Green Town Lahore NULL +PK 4 NULL Lahore NULL 54000 124, street# 2, karim block Allama Iqbal Town lahore. 124, street# 2, karim block Allama Iqbal Town lahore. NULL +PK 4 NULL Lahore NULL 54000 150 A Qila Lachman Singh Ravi Road lahore NULL +PK 4 NULL Lahore NULL 54000 166/1L DHA Lahore NULL +PK 4 NULL Lahore NULL 54000 172 A2 Township Lahore NULL +PK 4 NULL Lahore NULL 54000 183,S/Block, Model Town, Lhr NULL +PK 4 NULL lahore NULL 54000 19- A block ,Eden Lane Villas Raiwind Road ,Lahore NULL +PK 4 NULL lahore NULL 54000 3-c kaliyar road opposite kids lyceum, rustam park near mor samnabad NULL +PK 4 NULL Lahore NULL 54000 31 Saeed Block, Canal Bank Scheme NULL +PK 4 NULL Lahore NULL 54000 31c DHA Lahore NULL +PK 4 NULL Lahore NULL 54000 387 E1 wapda town, Lahore NULL +PK 4 NULL Lahore NULL 54000 45-D dha eme sector multan road,lahore NULL +PK 4 NULL Lahore NULL 54000 5 Zafar Ali Road NULL +PK 4 NULL Lahore NULL 54000 54-R PGECHS NULL +PK 4 NULL lahore NULL 54000 566 E-1 johar town lahore 566 E-1 johar town lahore NULL +PK 4 NULL Lahore NULL 54000 82/1 Z Block, Phase 3 DHA NULL +PK 4 NULL Lahore NULL 54000 A-1 VRI Zarrar shaheed road lahore cantt A-1 VRI Zarrar shaheed road lahore cantt NULL +PK 4 NULL lahore NULL 54000 e5/39D street 6 zaman colony cavalry ground ext NULL +PK 4 NULL Lahore NULL 54000 Ho # 61, Block G3, Johar Town Lahore NULL +PK 4 NULL LAhore NULL 54000 House #19-A street #5 Usman nagr Ghaziabad Lahore NULL +PK 4 NULL lahore NULL 54000 House no 692 street no 67 sadar bazar NULL +PK 4 NULL Lahore NULL 54000 Khosa Law Chamber 1 Turner Road NULL +PK 4 NULL Lahore NULL 54000 Lahore,Pakistan Lahore,Pakistan NULL +PK 4 NULL Lahore NULL 54000 room no 69, khalid bin waleed hall, anarkali NULL +PK 4 NULL Lahore NULL 54000 Suite # 8, Al-Hafeez Suites, Gulberg II NULL +PK 4 NULL Lahore NULL 54085 199 Shadman 2 NULL +PK 4 NULL Lahore NULL 54300 Mughalpura Lahore Pakistan NULL +PK 4 NULL Lahore NULL 54660 SD 69 falcon complex gulberg III lahore NULL +PK 4 NULL lahore NULL 54800 764-G4 johar town ,lahore NULL +PK 4 NULL Rawalpindi NULL 44000 House 522, F-Block Sattellite Town, Rawalpindi NULL +PK 4 NULL Rawalpindi NULL 46000 1950/c, Indusroad 2, Tariqabad, Rawalpindi Cantt NULL +PK 4 NULL Rawalpindi NULL 46000 House 54-E Lane 9 Sector 4, AECHS Chaklala Rawalpindi NULL +PK 4 NULL Rawalpindi NULL 46000 House B-1343, Sattellite town Rawalpindi NULL +PK 4 NULL Rawalpindi NULL 46000 House CB-299F, Street 1, Lane 4 Peshawar Road Rawalpindi NULL +PK 4 NULL Rawalpindi NULL 46300 House No 1518 Umer Block phase 8 BehriaTown NULL +PK 4 NULL sialkot NULL 51310 The National Model School, Ismaiealabad, Pacca Garah Sialkot NULL +PK 8 NULL Islamabad NULL CIomsats Institute of Information Technology Islamabad NULL +PK 8 NULL Islamabad NULL 38700 COMSATS tarlai boys hostel Islamabad. COMSATS tarlai boys hostel Islamabad (Room 30) NULL +PK 8 NULL Islamabad NULL 44000 NULL +PK 8 NULL Islamabad NULL 44000 House # 256, Street # 9, Shahzad Town, Islamabad. NULL +PK 8 NULL Islamabad NULL 44000 Islamabad , Comsats University Islamabd ,Pakistan NULL +PK 8 NULL Islamabad NULL 44000 World Bank Building Sector G 5 NULL +PK 8 NULL lahore NULL 54000 3c zafar ali road gulburg 5 3c zafar ali road gulburg 5 NULL +PK 8 NULL lahore NULL 54000 49-a bilal park, chaburgy 49-a bilal park, chaburgy NULL +PK NULL NULL Lahore NULL 54000 NULL +PK NULL NULL Lahore NULL 54000 85 E block Model Town NULL +SN 1 NULL NULL ouakam cité comico en face 217 NULL +SN 1 NULL Dakar NULL NULL +SN 1 NULL Dakar NULL IDEV-ic Patte d'oie Builder's Villa B11 NULL +SN 1 NULL Dakar NULL liberte 6/ dakar NULL +SN 1 NULL Dakar NULL ngor NULL +SN 1 NULL Dakar NULL 4027 ZAC Mbao Cité Fadia NULL +SN NULL NULL Dakar NULL IDEV-ic Patte d'oie Builder's Villa B11 NULL +TZ NULL Dar es Salaam NULL NULL NULL +TZ NULL Dar es salaam NULL NULL 76021 Dar es salaam 1507 Morogoro NULL +TZ NULL Dar es salaam NULL NULL dar es salaam nassoro.ahmedy@yahoo.com NULL +TZ NULL DAR ES SALAAM NULL NULL dar es salaam UDSM NULL +TZ NULL Dar es salaam NULL NULL NA NULL +TZ NULL DAR ES SALAAM NULL NULL P O BOX 23409 NULL +TZ NULL dar es salaam NULL NULL p. o. box 104994 NULL +TZ NULL Dar es Salaam NULL NULL P.o. BOX 71415 Dar es Salaam NULL +TZ NULL Dar es Salaam NULL NULL P.O.BOx 66675 DSM NULL +TZ NULL Dar es salaam NULL NULL Tz Tz NULL +TZ NULL dsm NULL NULL NULL +TZ 2 NULL Bagamoyo NULL NULL PO.Box 393 NULL +TZ 2 NULL Dar es salaam NULL NULL 22548 NULL +TZ 3 NULL Dar-es-salaam NULL NULL Dodoma Municipal Kimara, Dar-es-salaa, NULL +TZ 23 NULL Dar es Salaam NULL NULL NULL +TZ 23 NULL dar es salaam NULL NULL 35074 NULL +TZ 23 NULL dar es salaam NULL NULL 67389 NULL +TZ 23 NULL Dar es Salaam NULL NULL COSTECH, Dar es Salaam, Tanzania NULL +TZ 23 NULL Dar es salaam NULL NULL na NULL +TZ 23 NULL dar es salaam NULL NULL p o box 60164 NULL +TZ 23 NULL dar es salaam NULL NULL P. O. Box 77588 NULL +TZ 23 NULL dar es salaam NULL NULL P.O BOX 78144 NULL +TZ 23 NULL Dar es Salaam NULL NULL P.O.BOX 78373 NULL +TZ 23 NULL Dar es salaam NULL NULL UDSM Dar es Salaam NULL +TZ 23 NULL Dar es salaam NULL NULL udsm udsm NULL +TZ 23 NULL Temeke NULL NULL P.O. Box 50127 NULL +TZ NULL NULL Dar es Salaam NULL NULL NULL +TZ NULL NULL Dar es Salaam NULL NULL Kigoma NULL +TZ NULL NULL Dar es Salaam NULL NULL Mwanza NULL +UG NULL Kampala NULL NULL NULL +UG NULL Kampala NULL NULL Kampala Uganda East Africa NULL +US NULL London NULL SE1 8RT Capital Tower 91 Waterloo Road NULL +US CA NULL Los Angeles NULL NULL +US CA NULL Pleasanton NULL 94588 3412 Pickens Lane NULL +US CA NULL Sacramento NULL NULL +US CA NULL San Francisco NULL NULL +US CA NULL seattle NULL 98113 1234 1st st NULL +US CO NULL Denver NULL 80235 6666 West Quincy Ave NULL +US CT NULL Greenwich NULL 6830 140 Milbank NULL +US CT NULL Hartford NULL 6106 Center for Urban and Global Studies at Trinity College, 70 Vernon Street NULL +US DC NULL Washington NULL NULL +US DC NULL Washington NULL 20007 World Bank Headquarters 1818 H Street NW NULL +US DC NULL Washington NULL 20010 NULL +US DC NULL Washington NULL 20036 NULL +US DC NULL Washington NULL 20405 1889 F St NW NULL +US DC NULL Washington NULL 20433 NULL +US DC NULL Washington NULL 20433 1818 H Street NW NULL +US DC NULL Washington NULL 20433 1818H St NULL +US DC NULL Washington NULL 20433 1818 H Street NW NULL +US DC NULL Washington DC NULL 20005 1424, K Street, NW Suite 600 NULL +US DC NULL Washington DC NULL 20010 1818 H Street, NW NULL +US DC NULL Washington, DC NULL 20003 1818 H Street NW NULL +US DE NULL Virgin Islands|Charlotte Amalie,Cruz Bay,Christiansted NULL Morocco|Tafraout,Rabat,Tangier,Tetouan,Casablanca,Marrakesh,Fez,Oujda,Meknes,Agadir United Arab Emirates|Garhoud,Dubai,Bur Dubai,Ras al Khaymah,Abu Dhabi,Ajman,Al Fujayrah,Sharjah NULL +US FL NULL Falmouth NULL Falmouth Falmouth NULL +US FL NULL Lilongwe NULL Lilongwe Lilongwe NULL +US GA NULL Atlanta NULL NULL +US GU NULL Herndon NULL 15642 Ht USA NULL +US GU NULL Miami NULL Miami Miami NULL +US MD NULL Gaithersburg NULL 20877 554 N Frederick Avenue Suite 216 NULL +US MD NULL Potomac NULL 20854 14 Sandalfoot Court NULL +US MD NULL Silver Spring NULL 20901 9202 Whitney St. NULL +US MI NULL Traverse City NULL 49685 PO Box 792 NULL +US ND NULL Pirassununga NULL Pirassununga Pirassununga NULL +US NJ NULL Princeton NULL NULL +US NY NULL Brooklyn NULL 11206-1980 25 Montrose Ave. Apt 304 NULL +US NY NULL Brooklyn NULL 11225 975 washington ave 2d NULL +US NY NULL Brooklyn NULL 11217 150 4TH AVE APT 9E NULL +US NY NULL New York NULL NULL +US NY NULL New York NULL 10013 148 Lafayette St. PH NULL +US NY NULL New York NULL 10017 UNICEF 3 UN Plaza NULL +US NY NULL New York NULL 10019 25 Columbus Circle Suite 52E NULL +US NY NULL New York NULL 10024 65 West 85th Street 3A NULL +US NY NULL New York NULL 10027 606 W. 116th Street #22 NULL +US NY NULL New York NULL 10037 NULL +US NY NULL Rochester NULL NULL +US NY NULL Scarsdale NULL 10583-1423 54 Walworth Avenue NULL +US OR NULL Portland NULL NULL +US PA NULL Philadelphia NULL NULL +US PA NULL Philadelphia NULL NULL +US PR NULL Colonel Hill NULL Colonel Hill Colonel Hill NULL +US SD NULL Banjul NULL Banjul Banjul NULL +US SD NULL London NULL London London NULL +US TX NULL Aledo NULL 76008 1588 Hunterglenn Dr NULL +US TX NULL Keller NULL 76248 810 Placid View Ct. NULL +US WA NULL Seattle NULL NULL +ZA NULL Cape Town NULL NULL +ZA NULL Cape Town NULL 7945 Alexander Road Muizenberg NULL +ZA NULL Pretoria NULL NULL +ZA 11 NULL Cape Town NULL NULL +ZA 11 NULL Cape Town NULL 7435 PostNet Suite #57, Private Bag X18 Milnerton NULL +ZA 11 NULL Cape town NULL 7508 24 Solyet Court, Lansdowne Road Claremont NULL +ZA 11 NULL Cape Town NULL 7701 NULL +ZA 11 NULL Cape Town NULL 7785 10 Nyamakazi Road Luzuko Park Phillipi East NULL +ZA 11 NULL Cape Town NULL 7915 66 Albert Rd NULL +ZA 11 NULL Cape Town NULL 8001 210 Long Street NULL +ZM NULL Lusaka NULL NULL +ZM 9 NULL LUSAKA NULL 10101 P.O. BOX FW 174 NULL diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.address_formats.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.address_formats.inc index 793e2f1e..19e7958b 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.address_formats.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.address_formats.inc @@ -41,11 +41,11 @@ function addressfield_get_address_format($country_code) { // postal code in 'used_fields'. $countries_with_optional_postal_code = array( 'AC', 'AD', 'AL', 'AZ', 'BA', 'BB', 'BD', 'BG', 'BH', 'BM', 'BN', 'BT', - 'CR', 'CY', 'CZ', 'DO', 'DZ', 'EC', 'EH', 'ET', 'FO', 'GE', 'GN', 'GT', + 'CR', 'CY', 'DO', 'DZ', 'EC', 'EH', 'ET', 'FO', 'GE', 'GN', 'GT', 'GW', 'HR', 'HT', 'IL', 'IS', 'JO', 'KE', 'KG', 'KH', 'KW', 'LA', 'LA', 'LB', 'LK', 'LR', 'LS', 'MA', 'MC', 'MD', 'ME', 'MG', 'MK', 'MM', 'MT', 'MU', 'MV', 'NE', 'NP', 'OM', 'PK', 'PY', 'RO', 'RS', 'SA', 'SI', - 'SK', 'SN', 'SZ', 'TA', 'TJ', 'TM', 'TN', 'VA', 'VC', 'VG', 'XK', 'ZM', + 'SN', 'SZ', 'TA', 'TJ', 'TM', 'TN', 'VA', 'VC', 'VG', 'XK', 'ZM', ); foreach ($countries_with_optional_postal_code as $code) { $address_formats[$code] = array( @@ -56,9 +56,9 @@ function addressfield_get_address_format($country_code) { // These formats differ from the default only by the presence of the // postal code in 'used_fields' and 'required_fields'. $countries_with_required_postal_code = array( - 'AT', 'AX', 'BE', 'BL', 'CH', 'DE', 'DK', 'FI', 'FK', 'FR', 'GF', 'GG', + 'AT', 'AX', 'BE', 'BL', 'CH', 'CZ', 'DE', 'DK', 'FI', 'FK', 'FR', 'GF', 'GG', 'GL', 'GP', 'GR', 'GS', 'HU', 'IM', 'IO', 'JE', 'LI', 'LU', 'MF', 'MQ', 'NC', - 'NL', 'NO', 'PL', 'PM', 'PN', 'PT', 'RE', 'SE', 'SH', 'SJ', 'TC', 'WF', + 'NL', 'NO', 'PL', 'PM', 'PN', 'PT', 'RE', 'SE', 'SH', 'SJ', 'SK', 'TC', 'WF', 'YT', ); foreach ($countries_with_required_postal_code as $code) { @@ -114,7 +114,7 @@ function addressfield_get_address_format($country_code) { 'used_fields' => array('locality', 'administrative_area', 'postal_code'), ); $address_formats['CL'] = array( - 'used_fields' => array('locality', 'administrative_area', 'postal_code'), + 'used_fields' => array('dependent_locality', 'locality', 'administrative_area', 'postal_code'), 'administrative_area_label' => t('State', array(), array('context' => 'Territory of a country')), 'render_administrative_area_value' => TRUE, ); @@ -124,7 +124,7 @@ function addressfield_get_address_format($country_code) { 'dependent_locality_label' => t('District'), ); $address_formats['CO'] = array( - 'used_fields' => array('locality', 'administrative_area'), + 'used_fields' => array('locality', 'administrative_area', 'postal_code'), 'administrative_area_label' => t('Department', array(), array('context' => 'Territory of a country')), ); $address_formats['CV'] = array( @@ -235,6 +235,7 @@ function addressfield_get_address_format($country_code) { 'used_fields' => array('dependent_locality', 'locality', 'administrative_area', 'postal_code'), 'required_fields' => array('locality', 'administrative_area', 'postal_code'), 'dependent_locality_label' => t('District'), + 'render_administrative_area_value' => TRUE, ); $address_formats['KY'] = array( 'used_fields' => array('administrative_area', 'postal_code'), diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.administrative_areas.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.administrative_areas.inc index 88343de9..aa6ebad6 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.administrative_areas.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.administrative_areas.inc @@ -11,6 +11,29 @@ * NULL if not found. */ function addressfield_get_administrative_areas($country_code) { + // Maintain a static cache to avoid passing the administrative areas through + // t() more than once per request. + $administrative_areas = &drupal_static(__FUNCTION__, array()); + if (empty($administrative_areas)) { + // Get the default administrative areas. + $administrative_areas = _addressfield_get_administrative_areas_defaults(); + + // Allow other modules to alter the administrative areas. + drupal_alter('addressfield_administrative_areas', $administrative_areas); + } + + return isset($administrative_areas[$country_code]) ? $administrative_areas[$country_code] : NULL; +} + +/** + * Provides the default administrative areas. + */ +function _addressfield_get_administrative_areas_defaults() { + // To avoid needless pollution of the strings list we only pass to t() + // those administrative areas that are in English (or a latin transcription), + // and belong to a country that either has multiple official languages (CA) + // or uses a non-latin script (AE, CN, JP, KR, UA, RU, etc). + // No translation is expected in other cases. $administrative_areas = array(); $administrative_areas['AE'] = array( 'AZ' => t('Abu Dhabi'), @@ -22,69 +45,69 @@ function addressfield_get_administrative_areas($country_code) { 'AJ' => t('Ajmān'), ); $administrative_areas['AR'] = array( - 'B' => t('Buenos Aires'), - 'K' => t('Catamarca'), - 'H' => t('Chaco'), - 'U' => t('Chubut'), - 'C' => t('Ciudad de Buenos Aires'), - 'X' => t('Córdoba'), - 'W' => t('Corrientes'), - 'E' => t('Entre Ríos'), - 'P' => t('Formosa'), - 'Y' => t('Jujuy'), - 'L' => t('La Pampa'), - 'F' => t('La Rioja'), - 'M' => t('Mendoza'), - 'N' => t('Misiones'), - 'Q' => t('Neuquén'), - 'R' => t('Río Negro'), - 'A' => t('Salta'), - 'J' => t('San Juan'), - 'D' => t('San Luis'), - 'Z' => t('Santa Cruz'), - 'S' => t('Santa Fe'), - 'G' => t('Santiago del Estero'), - 'V' => t('Tierra del Fuego'), - 'T' => t('Tucumán'), + 'B' => 'Buenos Aires', + 'K' => 'Catamarca', + 'H' => 'Chaco', + 'U' => 'Chubut', + 'C' => 'Ciudad de Buenos Aires', + 'X' => 'Córdoba', + 'W' => 'Corrientes', + 'E' => 'Entre Ríos', + 'P' => 'Formosa', + 'Y' => 'Jujuy', + 'L' => 'La Pampa', + 'F' => 'La Rioja', + 'M' => 'Mendoza', + 'N' => 'Misiones', + 'Q' => 'Neuquén', + 'R' => 'Río Negro', + 'A' => 'Salta', + 'J' => 'San Juan', + 'D' => 'San Luis', + 'Z' => 'Santa Cruz', + 'S' => 'Santa Fe', + 'G' => 'Santiago del Estero', + 'V' => 'Tierra del Fuego', + 'T' => 'Tucumán', ); $administrative_areas['AU'] = array( - 'ACT' => t('Australian Capital Territory'), - 'NSW' => t('New South Wales'), - 'NT' => t('Northern Territory'), - 'QLD' => t('Queensland'), - 'SA' => t('South Australia'), - 'TAS' => t('Tasmania'), - 'VIC' => t('Victoria'), - 'WA' => t('Western Australia'), + 'ACT' => 'Australian Capital Territory', + 'NSW' => 'New South Wales', + 'NT' => 'Northern Territory', + 'QLD' => 'Queensland', + 'SA' => 'South Australia', + 'TAS' => 'Tasmania', + 'VIC' => 'Victoria', + 'WA' => 'Western Australia', ); $administrative_areas['BR'] = array( - 'AC' => t('Acre'), - 'AL' => t('Alagoas'), - 'AM' => t('Amazonas'), - 'AP' => t('Amapá'), - 'BA' => t('Bahia'), - 'CE' => t('Ceará'), - 'DF' => t('Distrito Federal'), - 'ES' => t('Espírito Santo'), - 'GO' => t('Goiás'), - 'MA' => t('Maranhão'), - 'MG' => t('Minas Gerais'), - 'MS' => t('Mato Grosso do Sul'), - 'MT' => t('Mato Grosso'), - 'PA' => t('Pará'), - 'PB' => t('Paraíba'), - 'PE' => t('Pernambuco'), - 'PI' => t('Piauí'), - 'PR' => t('Paraná'), - 'RJ' => t('Rio de Janeiro'), - 'RN' => t('Rio Grande do Norte'), - 'RO' => t('Rondônia'), - 'RR' => t('Roraima'), - 'RS' => t('Rio Grande do Sul'), - 'SC' => t('Santa Catarina'), - 'SE' => t('Sergipe'), - 'SP' => t('São Paulo'), - 'TO' => t('Tocantins'), + 'AC' => 'Acre', + 'AL' => 'Alagoas', + 'AM' => 'Amazonas', + 'AP' => 'Amapá', + 'BA' => 'Bahia', + 'CE' => 'Ceará', + 'DF' => 'Distrito Federal', + 'ES' => 'Espírito Santo', + 'GO' => 'Goiás', + 'MA' => 'Maranhão', + 'MG' => 'Minas Gerais', + 'MS' => 'Mato Grosso do Sul', + 'MT' => 'Mato Grosso', + 'PA' => 'Pará', + 'PB' => 'Paraíba', + 'PE' => 'Pernambuco', + 'PI' => 'Piauí', + 'PR' => 'Paraná', + 'RJ' => 'Rio de Janeiro', + 'RN' => 'Rio Grande do Norte', + 'RO' => 'Rondônia', + 'RR' => 'Roraima', + 'RS' => 'Rio Grande do Sul', + 'SC' => 'Santa Catarina', + 'SE' => 'Sergipe', + 'SP' => 'São Paulo', + 'TO' => 'Tocantins', ); $administrative_areas['CA'] = array( 'AB' => t('Alberta'), @@ -102,21 +125,21 @@ function addressfield_get_administrative_areas($country_code) { 'YT' => t('Yukon Territory'), ); $administrative_areas['CL'] = array( - 'AI' => t('Aysén del General Carlos Ibáñez del Campo'), - 'AN' => t('Antofagasta'), - 'AR' => t('Araucanía'), - 'AP' => t('Arica y Parinacota'), - 'AT' => t('Atacama'), - 'BI' => t('Biobío'), - 'CO' => t('Coquimbo'), - 'LI' => t('Libertador General Bernardo O\'Higgins'), - 'LL' => t('Los Lagos'), - 'LR' => t('Los Ríos'), - 'MA' => t('Magallanes y de la Antártica Chilena'), - 'ML' => t('Maule'), - 'RM' => t('Metropolitana de Santiago'), - 'TA' => t('Tarapacá'), - 'VS' => t('Valparaíso'), + 'AI' => 'Aysén del General Carlos Ibáñez del Campo', + 'AN' => 'Antofagasta', + 'AR' => 'Araucanía', + 'AP' => 'Arica y Parinacota', + 'AT' => 'Atacama', + 'BI' => 'Biobío', + 'CO' => 'Coquimbo', + 'LI' => 'Libertador General Bernardo O\'Higgins', + 'LL' => 'Los Lagos', + 'LR' => 'Los Ríos', + 'MA' => 'Magallanes y de la Antártica Chilena', + 'ML' => 'Maule', + 'RM' => 'Metropolitana de Santiago', + 'TA' => 'Tarapacá', + 'VS' => 'Valparaíso', ); $administrative_areas['CN'] = array( '34' => t('Anhui Sheng'), @@ -155,55 +178,55 @@ function addressfield_get_administrative_areas($country_code) { '33' => t('Zhejiang Sheng'), ); $administrative_areas['CO'] = array( - 'AMA' => t('Amazonas'), - 'ANT' => t('Antioquia'), - 'ARA' => t('Arauca'), - 'ATL' => t('Atlántico'), - 'BOL' => t('Bolívar'), - 'BOY' => t('Boyacá'), - 'CAL' => t('Caldas'), - 'CAQ' => t('Caquetá'), - 'CAS' => t('Casanare'), - 'CAU' => t('Cauca'), - 'CES' => t('Cesar'), - 'COR' => t('Córdoba'), - 'CUN' => t('Cundinamarca'), - 'CHO' => t('Chocó'), - 'GUA' => t('Guainía'), - 'GUV' => t('Guaviare'), - 'HUI' => t('Huila'), - 'LAG' => t('La Guajira'), - 'MAG' => t('Magdalena'), - 'MET' => t('Meta'), - 'NAR' => t('Nariño'), - 'NSA' => t('Norte de Santander'), - 'PUT' => t('Putumayo'), - 'QUI' => t('Quindío'), - 'RIS' => t('Risaralda'), - 'SAP' => t('San Andrés, Providencia y Santa Catalina'), - 'SAN' => t('Santander'), - 'SUC' => t('Sucre'), - 'TOL' => t('Tolima'), - 'VAC' => t('Valle del Cauca'), - 'VAU' => t('Vaupés'), - 'VID' => t('Vichada'), + 'AMA' => 'Amazonas', + 'ANT' => 'Antioquia', + 'ARA' => 'Arauca', + 'ATL' => 'Atlántico', + 'BOL' => 'Bolívar', + 'BOY' => 'Boyacá', + 'CAL' => 'Caldas', + 'CAQ' => 'Caquetá', + 'CAS' => 'Casanare', + 'CAU' => 'Cauca', + 'CES' => 'Cesar', + 'COR' => 'Córdoba', + 'CUN' => 'Cundinamarca', + 'CHO' => 'Chocó', + 'GUA' => 'Guainía', + 'GUV' => 'Guaviare', + 'HUI' => 'Huila', + 'LAG' => 'La Guajira', + 'MAG' => 'Magdalena', + 'MET' => 'Meta', + 'NAR' => 'Nariño', + 'NSA' => 'Norte de Santander', + 'PUT' => 'Putumayo', + 'QUI' => 'Quindío', + 'RIS' => 'Risaralda', + 'SAP' => 'San Andrés, Providencia y Santa Catalina', + 'SAN' => 'Santander', + 'SUC' => 'Sucre', + 'TOL' => 'Tolima', + 'VAC' => 'Valle del Cauca', + 'VAU' => 'Vaupés', + 'VID' => 'Vichada', ); $administrative_areas['EE'] = array( - '37' => t('Harjumaa'), - '39' => t('Hiiumaa'), - '44' => t('Ida-Virumaa'), - '49' => t('Jõgevamaa'), - '51' => t('Järvamaa'), - '57' => t('Läänemaa'), - '59' => t('Lääne-Virumaa'), - '65' => t('Põlvamaa'), - '67' => t('Pärnumaa'), - '70' => t('Raplamaa'), - '74' => t('Saaremaa'), - '78' => t('Tartumaa'), - '82' => t('Valgamaa'), - '84' => t('Viljandimaa'), - '86' => t('Võrumaa'), + '37' => 'Harjumaa', + '39' => 'Hiiumaa', + '44' => 'Ida-Virumaa', + '49' => 'Jõgevamaa', + '51' => 'Järvamaa', + '57' => 'Läänemaa', + '59' => 'Lääne-Virumaa', + '65' => 'Põlvamaa', + '67' => 'Pärnumaa', + '70' => 'Raplamaa', + '74' => 'Saaremaa', + '78' => 'Tartumaa', + '82' => 'Valgamaa', + '84' => 'Viljandimaa', + '86' => 'Võrumaa', ); $administrative_areas['EG'] = array( 'ALX' => t('Alexandria'), @@ -235,58 +258,58 @@ function addressfield_get_administrative_areas($country_code) { 'LX' => t('Luxor'), ); $administrative_areas['ES'] = array( - 'C' => t("A Coruña"), - 'VI' => t('Alava'), - 'AB' => t('Albacete'), - 'A' => t('Alicante'), - 'AL' => t("Almería"), - 'O' => t('Asturias'), - 'AV' => t("Ávila"), - 'BA' => t('Badajoz'), - 'PM' => t('Baleares'), - 'B' => t('Barcelona'), - 'BU' => t('Burgos'), - 'CC' => t("Cáceres"), - 'CA' => t("Cádiz"), - 'S' => t('Cantabria'), - 'CS' => t("Castellón"), - 'CE' => t('Ceuta'), - 'CR' => t('Ciudad Real'), - 'CO' => t("Córdoba"), - 'CU' => t('Cuenca'), - 'GI' => t('Gerona'), - 'GR' => t('Granada'), - 'GU' => t('Guadalajara'), - 'SS' => t("Guipúzcoa"), - 'H' => t('Huelva'), - 'HU' => t('Huesca'), - 'J' => t("Jaén"), - 'LO' => t('La Rioja'), - 'GC' => t('Las Palmas'), - 'LE' => t("León"), - 'L' => t("Lérida"), - 'LU' => t('Lugo'), - 'M' => t('Madrid'), - 'MA' => t("Málaga"), - 'ML' => t('Melilla'), - 'MU' => t('Murcia'), - 'NA' => t('Navarra'), - 'OR' => t('Ourense'), - 'P' => t('Palencia'), - 'PO' => t('Pontevedra'), - 'SA' => t('Salamanca'), - 'TF' => t('Santa Cruz de Tenerife'), - 'SG' => t('Segovia'), - 'SE' => t('Sevilla'), - 'SO' => t('Soria'), - 'T' => t('Tarragona'), - 'TE' => t('Teruel'), - 'TO' => t('Toledo'), - 'V' => t('Valencia'), - 'VA' => t('Valladolid'), - 'BI' => t('Vizcaya'), - 'ZA' => t('Zamora'), - 'Z' => t('Zaragoza'), + 'C' => "A Coruña", + 'VI' => 'Alava', + 'AB' => 'Albacete', + 'A' => 'Alicante', + 'AL' => "Almería", + 'O' => 'Asturias', + 'AV' => "Ávila", + 'BA' => 'Badajoz', + 'PM' => 'Baleares', + 'B' => 'Barcelona', + 'BU' => 'Burgos', + 'CC' => "Cáceres", + 'CA' => "Cádiz", + 'S' => 'Cantabria', + 'CS' => "Castellón", + 'CE' => 'Ceuta', + 'CR' => 'Ciudad Real', + 'CO' => "Córdoba", + 'CU' => 'Cuenca', + 'GI' => 'Girona', + 'GR' => 'Granada', + 'GU' => 'Guadalajara', + 'SS' => "Guipúzcoa", + 'H' => 'Huelva', + 'HU' => 'Huesca', + 'J' => "Jaén", + 'LO' => 'La Rioja', + 'GC' => 'Las Palmas', + 'LE' => "León", + 'L' => "Lleida", + 'LU' => 'Lugo', + 'M' => 'Madrid', + 'MA' => "Málaga", + 'ML' => 'Melilla', + 'MU' => 'Murcia', + 'NA' => 'Navarra', + 'OR' => 'Ourense', + 'P' => 'Palencia', + 'PO' => 'Pontevedra', + 'SA' => 'Salamanca', + 'TF' => 'Santa Cruz de Tenerife', + 'SG' => 'Segovia', + 'SE' => 'Sevilla', + 'SO' => 'Soria', + 'T' => 'Tarragona', + 'TE' => 'Teruel', + 'TO' => 'Toledo', + 'V' => 'Valencia', + 'VA' => 'Valladolid', + 'BI' => 'Vizcaya', + 'ZA' => 'Zamora', + 'Z' => 'Zaragoza', ); $administrative_areas['HK'] = array( // HK subdivisions have no ISO codes assigned. @@ -330,57 +353,57 @@ function addressfield_get_administrative_areas($country_code) { 'SU' => t('Sumatera Utara'), ); $administrative_areas['IE'] = array( - 'CW' => t('Co Carlow'), - 'CN' => t('Co Cavan'), - 'CE' => t('Co Clare'), - 'CO' => t('Co Cork'), - 'DL' => t('Co Donegal'), - 'D' => t('Co Dublin'), - 'D1' => t('Dublin 1'), - 'D2' => t('Dublin 2'), - 'D3' => t('Dublin 3'), - 'D4' => t('Dublin 4'), - 'D5' => t('Dublin 5'), - 'D6' => t('Dublin 6'), - 'D6W' => t('Dublin 6w'), - 'D7' => t('Dublin 7'), - 'D8' => t('Dublin 8'), - 'D9' => t('Dublin 9'), - 'D10' => t('Dublin 10'), - 'D11' => t('Dublin 11'), - 'D12' => t('Dublin 12'), - 'D13' => t('Dublin 13'), - 'D14' => t('Dublin 14'), - 'D15' => t('Dublin 15'), - 'D16' => t('Dublin 16'), - 'D17' => t('Dublin 17'), - 'D18' => t('Dublin 18'), - 'D19' => t('Dublin 19'), - 'D20' => t('Dublin 20'), - 'D21' => t('Dublin 21'), - 'D22' => t('Dublin 22'), - 'D23' => t('Dublin 23'), - 'D24' => t('Dublin 24'), - 'G' => t('Co Galway'), - 'KY' => t('Co Kerry'), - 'KE' => t('Co Kildare'), - 'KK' => t('Co Kilkenny'), - 'LS' => t('Co Laois'), - 'LM' => t('Co Leitrim'), - 'LK' => t('Co Limerick'), - 'LD' => t('Co Longford'), - 'LH' => t('Co Louth'), - 'MO' => t('Co Mayo'), - 'MH' => t('Co Meath'), - 'MN' => t('Co Monaghan'), - 'OY' => t('Co Offaly'), - 'RN' => t('Co Roscommon'), - 'SO' => t('Co Sligo'), - 'TA' => t('Co Tipperary'), - 'WD' => t('Co Waterford'), - 'WH' => t('Co Westmeath'), - 'WX' => t('Co Wexford'), - 'WW' => t('Co Wicklow'), + 'CW' => 'Co Carlow', + 'CN' => 'Co Cavan', + 'CE' => 'Co Clare', + 'CO' => 'Co Cork', + 'DL' => 'Co Donegal', + 'D' => 'Co Dublin', + 'D1' => 'Dublin 1', + 'D2' => 'Dublin 2', + 'D3' => 'Dublin 3', + 'D4' => 'Dublin 4', + 'D5' => 'Dublin 5', + 'D6' => 'Dublin 6', + 'D6W' => 'Dublin 6w', + 'D7' => 'Dublin 7', + 'D8' => 'Dublin 8', + 'D9' => 'Dublin 9', + 'D10' => 'Dublin 10', + 'D11' => 'Dublin 11', + 'D12' => 'Dublin 12', + 'D13' => 'Dublin 13', + 'D14' => 'Dublin 14', + 'D15' => 'Dublin 15', + 'D16' => 'Dublin 16', + 'D17' => 'Dublin 17', + 'D18' => 'Dublin 18', + 'D19' => 'Dublin 19', + 'D20' => 'Dublin 20', + 'D21' => 'Dublin 21', + 'D22' => 'Dublin 22', + 'D23' => 'Dublin 23', + 'D24' => 'Dublin 24', + 'G' => 'Co Galway', + 'KY' => 'Co Kerry', + 'KE' => 'Co Kildare', + 'KK' => 'Co Kilkenny', + 'LS' => 'Co Laois', + 'LM' => 'Co Leitrim', + 'LK' => 'Co Limerick', + 'LD' => 'Co Longford', + 'LH' => 'Co Louth', + 'MO' => 'Co Mayo', + 'MH' => 'Co Meath', + 'MN' => 'Co Monaghan', + 'OY' => 'Co Offaly', + 'RN' => 'Co Roscommon', + 'SO' => 'Co Sligo', + 'TA' => 'Co Tipperary', + 'WD' => 'Co Waterford', + 'WH' => 'Co Westmeath', + 'WX' => 'Co Wexford', + 'WW' => 'Co Wicklow', ); $administrative_areas['IN'] = array( 'AP' => t('Andhra Pradesh'), @@ -388,8 +411,6 @@ function addressfield_get_administrative_areas($country_code) { 'AS' => t('Assam'), 'BR' => t('Bihar'), 'CT' => t('Chhattisgarh'), - 'DD' => t('Daman & Diu'), - 'DN' => t('Dadra & Nagar Haveli'), 'GA' => t('Goa'), 'GJ' => t('Gujarat'), 'HP' => t('Himachal Pradesh'), @@ -424,116 +445,116 @@ function addressfield_get_administrative_areas($country_code) { 'PY' => t('Puducherry'), ); $administrative_areas['IT'] = array( - 'AG' => t('Agrigento'), - 'AL' => t('Alessandria'), - 'AN' => t('Ancona'), - 'AO' => t('Aosta'), - 'AP' => t('Ascoli Piceno'), - 'AQ' => t("L'Aquila"), - 'AR' => t('Arezzo'), - 'AT' => t('Asti'), - 'AV' => t('Avellino'), - 'BA' => t('Bari'), - 'BG' => t('Bergamo'), - 'BI' => t('Biella'), - 'BL' => t('Belluno'), - 'BN' => t('Benevento'), - 'BO' => t('Bologna'), - 'BR' => t('Brindisi'), - 'BS' => t('Brescia'), - 'BT' => t('Barletta-Andria-Trani'), - 'BZ' => t('Bolzano/Bozen'), - 'CA' => t('Cagliari'), - 'CB' => t('Campobasso'), - 'CE' => t('Caserta'), - 'CH' => t('Chieti'), - 'CI' => t('Carbonia-Iglesias'), - 'CL' => t('Caltanissetta'), - 'CN' => t('Cuneo'), - 'CO' => t('Como'), - 'CR' => t('Cremona'), - 'CS' => t('Cosenza'), - 'CT' => t('Catania'), - 'CZ' => t('Catanzaro'), - 'EN' => t('Enna'), - 'FC' => t('Forlì-Cesena'), - 'FE' => t('Ferrara'), - 'FG' => t('Foggia'), - 'FI' => t('Firenze'), - 'FM' => t('Fermo'), - 'FR' => t('Frosinone'), - 'GE' => t('Genova'), - 'GO' => t('Gorizia'), - 'GR' => t('Grosseto'), - 'IM' => t('Imperia'), - 'IS' => t('Isernia'), - 'KR' => t('Crotone'), - 'LC' => t('Lecco'), - 'LE' => t('Lecce'), - 'LI' => t('Livorno'), - 'LO' => t('Lodi'), - 'LT' => t('Latina'), - 'LU' => t('Lucca'), - 'MB' => t('Monza e Brianza'), - 'MC' => t('Macerata'), - 'ME' => t('Messina'), - 'MI' => t('Milano'), - 'MN' => t('Mantova'), - 'MO' => t('Modena'), - 'MS' => t('Massa-Carrara'), - 'MT' => t('Matera'), - 'NA' => t('Napoli'), - 'NO' => t('Novara'), - 'NU' => t('Nuoro'), - 'OG' => t('Ogliastra'), - 'OR' => t('Oristano'), - 'OT' => t('Olbia-Tempio'), - 'PA' => t('Palermo'), - 'PC' => t('Piacenza'), - 'PD' => t('Padova'), - 'PE' => t('Pescara'), - 'PG' => t('Perugia'), - 'PI' => t('Pisa'), - 'PN' => t('Pordenone'), - 'PO' => t('Prato'), - 'PR' => t('Parma'), - 'PT' => t('Pistoia'), - 'PU' => t('Pesaro e Urbino'), - 'PV' => t('Pavia'), - 'PZ' => t('Potenza'), - 'RA' => t('Ravenna'), - 'RC' => t('Reggio Calabria'), - 'RE' => t('Reggio Emilia'), - 'RG' => t('Ragusa'), - 'RI' => t('Rieti'), - 'RM' => t('Roma'), - 'RN' => t('Rimini'), - 'RO' => t('Rovigo'), - 'SA' => t('Salerno'), - 'SI' => t('Siena'), - 'SO' => t('Sondrio'), - 'SP' => t('La Spezia'), - 'SR' => t('Siracusa'), - 'SS' => t('Sassari'), - 'SV' => t('Savona'), - 'TA' => t('Taranto'), - 'TE' => t('Teramo'), - 'TN' => t('Trento'), - 'TO' => t('Torino'), - 'TP' => t('Trapani'), - 'TR' => t('Terni'), - 'TS' => t('Trieste'), - 'TV' => t('Treviso'), - 'UD' => t('Udine'), - 'VA' => t('Varese'), - 'VB' => t('Verbano-Cusio-Ossola'), - 'VC' => t('Vercelli'), - 'VE' => t('Venezia'), - 'VI' => t('Vicenza'), - 'VR' => t('Verona'), - 'VS' => t('Medio Campidano'), - 'VT' => t('Viterbo'), - 'VV' => t('Vibo Valentia'), + 'AG' => 'Agrigento', + 'AL' => 'Alessandria', + 'AN' => 'Ancona', + 'AO' => 'Aosta', + 'AP' => 'Ascoli Piceno', + 'AQ' => "L'Aquila", + 'AR' => 'Arezzo', + 'AT' => 'Asti', + 'AV' => 'Avellino', + 'BA' => 'Bari', + 'BG' => 'Bergamo', + 'BI' => 'Biella', + 'BL' => 'Belluno', + 'BN' => 'Benevento', + 'BO' => 'Bologna', + 'BR' => 'Brindisi', + 'BS' => 'Brescia', + 'BT' => 'Barletta-Andria-Trani', + 'BZ' => 'Bolzano/Bozen', + 'CA' => 'Cagliari', + 'CB' => 'Campobasso', + 'CE' => 'Caserta', + 'CH' => 'Chieti', + 'CI' => 'Carbonia-Iglesias', + 'CL' => 'Caltanissetta', + 'CN' => 'Cuneo', + 'CO' => 'Como', + 'CR' => 'Cremona', + 'CS' => 'Cosenza', + 'CT' => 'Catania', + 'CZ' => 'Catanzaro', + 'EN' => 'Enna', + 'FC' => 'Forlì-Cesena', + 'FE' => 'Ferrara', + 'FG' => 'Foggia', + 'FI' => 'Firenze', + 'FM' => 'Fermo', + 'FR' => 'Frosinone', + 'GE' => 'Genova', + 'GO' => 'Gorizia', + 'GR' => 'Grosseto', + 'IM' => 'Imperia', + 'IS' => 'Isernia', + 'KR' => 'Crotone', + 'LC' => 'Lecco', + 'LE' => 'Lecce', + 'LI' => 'Livorno', + 'LO' => 'Lodi', + 'LT' => 'Latina', + 'LU' => 'Lucca', + 'MB' => 'Monza e Brianza', + 'MC' => 'Macerata', + 'ME' => 'Messina', + 'MI' => 'Milano', + 'MN' => 'Mantova', + 'MO' => 'Modena', + 'MS' => 'Massa-Carrara', + 'MT' => 'Matera', + 'NA' => 'Napoli', + 'NO' => 'Novara', + 'NU' => 'Nuoro', + 'OG' => 'Ogliastra', + 'OR' => 'Oristano', + 'OT' => 'Olbia-Tempio', + 'PA' => 'Palermo', + 'PC' => 'Piacenza', + 'PD' => 'Padova', + 'PE' => 'Pescara', + 'PG' => 'Perugia', + 'PI' => 'Pisa', + 'PN' => 'Pordenone', + 'PO' => 'Prato', + 'PR' => 'Parma', + 'PT' => 'Pistoia', + 'PU' => 'Pesaro e Urbino', + 'PV' => 'Pavia', + 'PZ' => 'Potenza', + 'RA' => 'Ravenna', + 'RC' => 'Reggio Calabria', + 'RE' => 'Reggio Emilia', + 'RG' => 'Ragusa', + 'RI' => 'Rieti', + 'RM' => 'Roma', + 'RN' => 'Rimini', + 'RO' => 'Rovigo', + 'SA' => 'Salerno', + 'SI' => 'Siena', + 'SO' => 'Sondrio', + 'SP' => 'La Spezia', + 'SR' => 'Siracusa', + 'SS' => 'Sassari', + 'SV' => 'Savona', + 'TA' => 'Taranto', + 'TE' => 'Teramo', + 'TN' => 'Trento', + 'TO' => 'Torino', + 'TP' => 'Trapani', + 'TR' => 'Terni', + 'TS' => 'Trieste', + 'TV' => 'Treviso', + 'UD' => 'Udine', + 'VA' => 'Varese', + 'VB' => 'Verbano-Cusio-Ossola', + 'VC' => 'Vercelli', + 'VE' => 'Venezia', + 'VI' => 'Vicenza', + 'VR' => 'Verona', + 'VS' => 'Medio Campidano', + 'VT' => 'Viterbo', + 'VV' => 'Vibo Valentia', ); $administrative_areas['JM'] = array( '13' => 'Clarendon', @@ -638,38 +659,38 @@ function addressfield_get_administrative_areas($country_code) { 'ZHA' => t('Zhambyl region'), ); $administrative_areas['MX'] = array( - 'AGU' => t('Aguascalientes'), - 'BCN' => t('Baja California'), - 'BCS' => t('Baja California Sur'), - 'CAM' => t('Campeche'), - 'COA' => t('Coahuila'), - 'COL' => t('Colima'), - 'CHP' => t('Chiapas'), - 'CHH' => t('Chihuahua'), - 'DIF' => t('Distrito Federal'), - 'DUG' => t('Durango'), - 'MEX' => t('Estado de México'), - 'GUA' => t('Guanajuato'), - 'GRO' => t('Guerrero'), - 'HID' => t('Hidalgo'), - 'JAL' => t('Jalisco'), - 'MIC' => t('Michoacán'), - 'MOR' => t('Morelos'), - 'NAY' => t('Nayarit'), - 'NLE' => t('Nuevo León'), - 'OAX' => t('Oaxaca'), - 'PUE' => t('Puebla'), - 'QUE' => t('Queretaro'), - 'ROO' => t('Quintana Roo'), - 'SLP' => t('San Luis Potosí'), - 'SIN' => t('Sinaloa'), - 'SON' => t('Sonora'), - 'TAB' => t('Tabasco'), - 'TAM' => t('Tamaulipas'), - 'TLA' => t('Tlaxcala'), - 'VER' => t('Veracruz'), - 'YUC' => t('Yucatán'), - 'ZAC' => t('Zacatecas'), + 'AGU' => 'Aguascalientes', + 'BCN' => 'Baja California', + 'BCS' => 'Baja California Sur', + 'CAM' => 'Campeche', + 'COA' => 'Coahuila', + 'COL' => 'Colima', + 'CHP' => 'Chiapas', + 'CHH' => 'Chihuahua', + 'DIF' => 'Distrito Federal', + 'DUG' => 'Durango', + 'MEX' => 'Estado de México', + 'GUA' => 'Guanajuato', + 'GRO' => 'Guerrero', + 'HID' => 'Hidalgo', + 'JAL' => 'Jalisco', + 'MIC' => 'Michoacán', + 'MOR' => 'Morelos', + 'NAY' => 'Nayarit', + 'NLE' => 'Nuevo León', + 'OAX' => 'Oaxaca', + 'PUE' => 'Puebla', + 'QUE' => 'Queretaro', + 'ROO' => 'Quintana Roo', + 'SLP' => 'San Luis Potosí', + 'SIN' => 'Sinaloa', + 'SON' => 'Sonora', + 'TAB' => 'Tabasco', + 'TAM' => 'Tamaulipas', + 'TLA' => 'Tlaxcala', + 'VER' => 'Veracruz', + 'YUC' => 'Yucatán', + 'ZAC' => 'Zacatecas', ); $administrative_areas['MY'] = array( '01' => t('Johor'), @@ -690,31 +711,31 @@ function addressfield_get_administrative_areas($country_code) { '11' => t('Terengganu'), ); $administrative_areas['PE'] = array( - 'AMA' => t('Amazonas'), - 'ANC' => t('Ancash'), - 'APU' => t('Apurimac'), - 'ARE' => t('Arequipa'), - 'AYA' => t('Ayacucho'), - 'CAJ' => t('Cajamarca'), - 'CAL' => t('Callao'), - 'CUS' => t('Cusco'), - 'HUV' => t('Huancavelica'), - 'HUC' => t('Huanuco'), - 'ICA' => t('Ica'), - 'JUN' => t('Junin'), - 'LAL' => t('La Libertad'), - 'LAM' => t('Lambayeque'), - 'LIM' => t('Lima'), - 'LOR' => t('Loreto'), - 'MDD' => t('Madre de Dios'), - 'MOQ' => t('Moquegua'), - 'PAS' => t('Pasco'), - 'PIU' => t('Piura'), - 'PUN' => t('Puno'), - 'SAM' => t('San Martin'), - 'TAC' => t('Tacna'), - 'TUM' => t('Tumbes'), - 'UCA' => t('Ucayali'), + 'AMA' => 'Amazonas', + 'ANC' => 'Ancash', + 'APU' => 'Apurimac', + 'ARE' => 'Arequipa', + 'AYA' => 'Ayacucho', + 'CAJ' => 'Cajamarca', + 'CAL' => 'Callao', + 'CUS' => 'Cusco', + 'HUV' => 'Huancavelica', + 'HUC' => 'Huanuco', + 'ICA' => 'Ica', + 'JUN' => 'Junin', + 'LAL' => 'La Libertad', + 'LAM' => 'Lambayeque', + 'LIM' => 'Lima', + 'LOR' => 'Loreto', + 'MDD' => 'Madre de Dios', + 'MOQ' => 'Moquegua', + 'PAS' => 'Pasco', + 'PIU' => 'Piura', + 'PUN' => 'Puno', + 'SAM' => 'San Martin', + 'TAC' => 'Tacna', + 'TUM' => 'Tumbes', + 'UCA' => 'Ucayali', ); $administrative_areas['RU'] = array( 'MOW' => t('Moskva'), @@ -918,7 +939,6 @@ function addressfield_get_administrative_areas($country_code) { '21' => t('Zakarpats\'ka oblast'), '23' => t('Zaporiz\'ka oblast'), '26' => t('Ivano-Frankivs\'ka oblast'), - '30' => t('Kyiv city'), '30' => t('Kiev Oblast'), '35' => t('Kirovohrads\'ka oblast'), '09' => t('Luhans\'ka oblast'), @@ -1003,35 +1023,32 @@ function addressfield_get_administrative_areas($country_code) { 'VI' => t('Virgin Islands'), ); $administrative_areas['VE'] = array( - 'Z' => t('Amazonas'), - 'B' => t('Anzoátegui'), - 'C' => t('Apure'), - 'D' => t('Aragua'), - 'E' => t('Barinas'), - 'F' => t('Bolívar'), - 'G' => t('Carabobo'), - 'H' => t('Cojedes'), - 'Y' => t('Delta Amacuro'), - 'W' => t('Dependencias Federales'), - 'A' => t('Distrito Federal'), - 'I' => t('Falcón'), - 'J' => t('Guárico'), - 'K' => t('Lara'), - 'L' => t('Mérida'), - 'M' => t('Miranda'), - 'N' => t('Monagas'), - 'O' => t('Nueva Esparta'), - 'P' => t('Portuguesa'), - 'R' => t('Sucre'), - 'S' => t('Táchira'), - 'T' => t('Trujillo'), - 'X' => t('Vargas'), - 'U' => t('Yaracuy'), - 'V' => t('Zulia'), + 'Z' => 'Amazonas', + 'B' => 'Anzoátegui', + 'C' => 'Apure', + 'D' => 'Aragua', + 'E' => 'Barinas', + 'F' => 'Bolívar', + 'G' => 'Carabobo', + 'H' => 'Cojedes', + 'Y' => 'Delta Amacuro', + 'W' => 'Dependencias Federales', + 'A' => 'Distrito Federal', + 'I' => 'Falcón', + 'J' => 'Guárico', + 'K' => 'Lara', + 'L' => 'Mérida', + 'M' => 'Miranda', + 'N' => 'Monagas', + 'O' => 'Nueva Esparta', + 'P' => 'Portuguesa', + 'R' => 'Sucre', + 'S' => 'Táchira', + 'T' => 'Trujillo', + 'X' => 'Vargas', + 'U' => 'Yaracuy', + 'V' => 'Zulia', ); - // Allow other modules to alter the administrative areas. - drupal_alter('addressfield_administrative_areas', $administrative_areas); - - return isset($administrative_areas[$country_code]) ? $administrative_areas[$country_code] : null; + return $administrative_areas; } diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.devel_generate.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.devel_generate.inc index e14c8885..2eb9c41a 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.devel_generate.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.devel_generate.inc @@ -43,7 +43,6 @@ function _addressfield_sample_addresses() { $fields = array(); if ($handle = @fopen("$filepath/addresses.txt",'r')) { if (is_resource($handle)) { - $addresses = array(); while (($buffer = fgets($handle)) !== false) { list($country, $administrative_area, $sub_administrative_area, $locality, $dependent_locality, $postal_code, $thoroughfare, $premise, $sub_premise) = explode("\t", $buffer); $fields[] = array( diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.feeds.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.feeds.inc index 2b8537ad..062b221f 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.feeds.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.feeds.inc @@ -6,10 +6,10 @@ */ /** - * Implements hook_feeds_node_processor_targets_alter(). + * Implements hook_feeds_processor_targets_alter(). */ -function addressfield_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) { - foreach (field_info_instances($entity_type, $bundle_name) as $name => $instance) { +function addressfield_feeds_processor_targets_alter(&$targets, $entity_type, $bundle) { + foreach (field_info_instances($entity_type, $bundle) as $name => $instance) { $info = field_info_field($name); if ($info['type'] == 'addressfield') { foreach ($info['columns'] as $sub_field => $schema_info) { @@ -34,7 +34,7 @@ function addressfield_feeds_processor_targets_alter(&$targets, $entity_type, $bu * An entity object, for instance a node object. * @param $target * A string identifying the target on the node. - * @param $value + * @param $values * The value to populate the target with. */ function addressfield_set_target($source, $entity, $target, $values) { diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.info b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.info index 991621bb..89e95157 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.info +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.info @@ -6,12 +6,13 @@ package = Fields dependencies[] = ctools files[] = addressfield.migrate.inc +files[] = views/addressfield_views_handler_field_administrative_area.inc files[] = views/addressfield_views_handler_field_country.inc files[] = views/addressfield_views_handler_filter_country.inc -; Information added by Drupal.org packaging script on 2015-04-23 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2015-10-07 +version = "7.x-1.2" core = "7.x" project = "addressfield" -datestamp = "1429819382" +datestamp = "1444254070" diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.migrate.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.migrate.inc index 6e74d63f..cc98911c 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.migrate.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.migrate.inc @@ -152,7 +152,7 @@ class MigrateAddressFieldHandler extends MigrateFieldHandler { if ($value) { if (isset($field_info['columns'][$column_key])) { - // Store the data in a seperate column. + // Store the data in a separate column. $result[$column_key] = $value; } else { diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.module b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.module index db7e0236..25b277dc 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.module +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/addressfield.module @@ -534,7 +534,9 @@ function addressfield_field_widget_form(&$form, &$form_state, $field, $instance, // $form_state['values'] is empty because of #limit_validation_errors, so // $form_state['input'] needs to be used instead. $parents = array_merge($element['#field_parents'], array($element['#field_name'], $langcode, $delta)); - $input_address = drupal_array_get_nested_value($form_state['input'], $parents); + if (!empty($form_state['input'])) { + $input_address = drupal_array_get_nested_value($form_state['input'], $parents); + } if (!empty($input_address)) { $address = $input_address; } @@ -728,8 +730,6 @@ function addressfield_field_formatter_settings_summary($field, $instance, $view_ $display = $instance['display'][$view_mode]; $settings = $display['settings']; - $summary = ''; - if ($settings['use_widget_handlers']) { return t('Use widget configuration'); } diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/example/addressfield_example.info b/profiles/commerce_kickstart/modules/contrib/addressfield/example/addressfield_example.info index c7120e3b..b0f19829 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/example/addressfield_example.info +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/example/addressfield_example.info @@ -7,9 +7,9 @@ hidden = TRUE dependencies[] = ctools dependencies[] = addressfield -; Information added by Drupal.org packaging script on 2015-04-23 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2015-10-07 +version = "7.x-1.2" core = "7.x" project = "addressfield" -datestamp = "1429819382" +datestamp = "1444254070" diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/example/plugins/format/address-ch-example.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/example/plugins/format/address-ch-example.inc index db3a98e2..4f92daa5 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/example/plugins/format/address-ch-example.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/example/plugins/format/address-ch-example.inc @@ -3552,8 +3552,6 @@ function addressfield_form_ch_postal_code_validation($element, &$form_state, &$f if (!empty($element['#value']) && (isset($data[$element['#value']]))) { // Get the base #parents for this address form. $base_parents = array_slice($element['#parents'], 0, -1); - $base_array_parents = array_slice($element['#array_parents'], 0, -2); - $city = $data[$element['#value']]; // Set the new values in the form. diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address-optional.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address-optional.inc index 201e40ea..bb4408be 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address-optional.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address-optional.inc @@ -7,7 +7,7 @@ */ $plugin = array( - 'title' => t('Make all fields optional (Not recommended)'), + 'title' => t('Make all fields optional (No validation - unsuitable for postal purposes)'), 'format callback' => 'addressfield_format_address_optional', 'type' => 'address', 'weight' => 100, diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address.inc index 0523ffe1..e9b801f1 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/address.inc @@ -83,7 +83,7 @@ function addressfield_format_address_generate(&$format, $address, $context = arr '#tag' => 'div', '#attributes' => array( 'class' => array('dependent-locality'), - 'autocomplete' => '"address-level3', + 'autocomplete' => 'address-level3', ), // Most formats place this field in its own row. '#suffix' => $clearfix, @@ -97,7 +97,7 @@ function addressfield_format_address_generate(&$format, $address, $context = arr '#prefix' => ' ', '#attributes' => array( 'class' => array('locality'), - 'autocomplete' => '"address-level2', + 'autocomplete' => 'address-level2', ), ); $format['locality_block']['administrative_area'] = array( diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/organisation.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/organisation.inc index 5cef00e3..3cec0f7f 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/organisation.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/plugins/format/organisation.inc @@ -20,7 +20,7 @@ $plugin = array( function addressfield_format_organisation_generate(&$format, $address) { $format['organisation_block'] = array( '#type' => 'addressfield_container', - '#attributes' => array('class' => array('addressfield-container-inline', 'name-block')), + '#attributes' => array('class' => array('addressfield-container-inline', 'organisation-block')), '#weight' => -50, // The addressfield is considered empty without a country, hide all fields // until one is selected. diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield.views.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield.views.inc index 9be1637e..f059da34 100644 --- a/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield.views.inc +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield.views.inc @@ -26,7 +26,7 @@ function addressfield_field_views_data($field) { // Only expose these components as Views field handlers. $implemented = array( 'country' => 'addressfield_views_handler_field_country', - 'administrative_area' => 'views_handler_field', + 'administrative_area' => 'addressfield_views_handler_field_administrative_area', 'sub_administrative_area' => 'views_handler_field', 'dependent_locality' => 'views_handler_field', 'locality' => 'views_handler_field', diff --git a/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield_views_handler_field_administrative_area.inc b/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield_views_handler_field_administrative_area.inc new file mode 100644 index 00000000..daeae662 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/addressfield/views/addressfield_views_handler_field_administrative_area.inc @@ -0,0 +1,48 @@ +country_alias = $this->query->add_field($this->table_alias, $this->definition['field_name'] . '_country'); + } + + function option_definition() { + $options = parent::option_definition(); + $options['display_name'] = array('default' => TRUE); + return $options; + } + + function options_form(&$form, &$form_state) { + parent::options_form($form, $form_state); + + $form['display_name'] = array( + '#type' => 'checkbox', + '#title' => t('Display the name of administrative area instead of the code.'), + '#default_value' => $this->options['display_name'], + ); + } + + function get_value($values, $field = NULL) { + $value = parent::get_value($values, $field); + + // If we have a value for the field, look for the administrative area name in the + // Address Field options list array if specified. + if (!empty($value) && !empty($this->options['display_name'])) { + module_load_include('inc', 'addressfield', 'addressfield.administrative_areas'); + $country = $values->{$this->country_alias}; + $areas = addressfield_get_administrative_areas($country); + + if (!empty($areas[$value])) { + $value = $areas[$value]; + } + } + + return $value; + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/admin_views/admin_views.info b/profiles/commerce_kickstart/modules/contrib/admin_views/admin_views.info index 3bce29f5..2dc00a58 100644 --- a/profiles/commerce_kickstart/modules/contrib/admin_views/admin_views.info +++ b/profiles/commerce_kickstart/modules/contrib/admin_views/admin_views.info @@ -10,9 +10,9 @@ files[] = plugins/views_plugin_access_menu.inc files[] = tests/admin_views.test -; Information added by Drupal.org packaging script on 2015-07-08 -version = "7.x-1.5" +; Information added by Drupal.org packaging script on 2016-08-02 +version = "7.x-1.6" core = "7.x" project = "admin_views" -datestamp = "1436376676" +datestamp = "1470165840" diff --git a/profiles/commerce_kickstart/modules/contrib/admin_views/plugins/views_plugin_access_menu.inc b/profiles/commerce_kickstart/modules/contrib/admin_views/plugins/views_plugin_access_menu.inc index 82c9ceaa..79a2e93f 100644 --- a/profiles/commerce_kickstart/modules/contrib/admin_views/plugins/views_plugin_access_menu.inc +++ b/profiles/commerce_kickstart/modules/contrib/admin_views/plugins/views_plugin_access_menu.inc @@ -24,6 +24,11 @@ class views_plugin_access_menu extends views_plugin_access { // view itself. The 'current display' could be set to something else, like // default. $path = $this->display->handler->get_option('path'); + + if (empty($path)) { + return FALSE; + } + $item = menu_get_item($path); // If we are on the original router path, the menu system has checked access already. diff --git a/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views.test b/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views.test index 727bded3..22d4e2bd 100644 --- a/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views.test +++ b/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views.test @@ -199,6 +199,7 @@ class AdminViewsPageDisplayTestCase extends AdminViewsWebTestCase { * Returns a test page view with a path under "admin/content". */ protected function normalPageView() { + views_include('view'); $view = new view(); $view->name = 'admin_views_test_normal'; $view->description = ''; @@ -283,5 +284,17 @@ class AdminViewsAccessHandlerTestCase extends AdminViewsWebTestCase { // The next item in the AJAX data will be the insert command containing the // rendered view. $this->assertTrue(empty($response_data[1])); + + // Test the access again with the default display. + $params['views_display_id'] = 'default'; + + $response_data = $this->drupalGetAJAX('views/ajax', array('query' => $params)); + + $this->assertResponse(200); + // Check no views settings are returned. + $this->assertTrue(empty($response_data[0]['settings']['views'])); + // The next item in the AJAX data will be the insert command containing the + // rendered view. + $this->assertTrue(empty($response_data[1])); } } diff --git a/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views_test/admin_views_test.info b/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views_test/admin_views_test.info index 80f2f406..ff8fdfc8 100644 --- a/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views_test/admin_views_test.info +++ b/profiles/commerce_kickstart/modules/contrib/admin_views/tests/admin_views_test/admin_views_test.info @@ -6,9 +6,9 @@ hidden = TRUE dependencies[] admin_views -; Information added by Drupal.org packaging script on 2015-07-08 -version = "7.x-1.5" +; Information added by Drupal.org packaging script on 2016-08-02 +version = "7.x-1.6" core = "7.x" project = "admin_views" -datestamp = "1436376676" +datestamp = "1470165840" diff --git a/profiles/commerce_kickstart/modules/contrib/chosen/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/chosen/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/chosen/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/profiles/commerce_kickstart/modules/contrib/chosen/README.txt b/profiles/commerce_kickstart/modules/contrib/chosen/README.txt index 658c4e0c..619533e2 100644 --- a/profiles/commerce_kickstart/modules/contrib/chosen/README.txt +++ b/profiles/commerce_kickstart/modules/contrib/chosen/README.txt @@ -1,13 +1,17 @@ -- SUMMARY -- -Chosen uses the Chosen jQuery plugin to make your - ' . t('Users with sufficient permissions can create vocabularies and terms through the Taxonomy page. The page listing the terms provides a drag-and-drop interface for controlling the order of the terms and sub-terms within a vocabulary, in a hierarchical fashion. A controlled vocabulary classifying music by genre with terms and sub-terms could look as follows:', array('@taxo' => url('admin/structure/taxonomy'), '@perm' => url('admin/people/permissions', array('fragment' => 'module-taxonomy')))); $output .= '
You have no expiring authorizations.
'; + /* Field: Time ago */ + $handler->display->display_options['fields']['created_1']['id'] = 'created_1'; + $handler->display->display_options['fields']['created_1']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['fields']['created_1']['field'] = 'created'; + $handler->display->display_options['fields']['created_1']['ui_name'] = 'Time ago'; + $handler->display->display_options['fields']['created_1']['label'] = ''; + $handler->display->display_options['fields']['created_1']['exclude'] = TRUE; + $handler->display->display_options['fields']['created_1']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['created_1']['date_format'] = 'time ago'; + $handler->display->display_options['fields']['created_1']['custom_date_format'] = '2'; + $handler->display->display_options['fields']['created_1']['second_date_format'] = 'long'; + /* Field: Commerce Payment Transaction: Amount */ + $handler->display->display_options['fields']['amount']['id'] = 'amount'; + $handler->display->display_options['fields']['amount']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['fields']['amount']['field'] = 'amount'; + /* Field: Commerce Payment Transaction: Remote ID */ + $handler->display->display_options['fields']['remote_id']['id'] = 'remote_id'; + $handler->display->display_options['fields']['remote_id']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['fields']['remote_id']['field'] = 'remote_id'; + /* Field: Commerce Payment Transaction: Remote status */ + $handler->display->display_options['fields']['remote_status']['id'] = 'remote_status'; + $handler->display->display_options['fields']['remote_status']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['fields']['remote_status']['field'] = 'remote_status'; + /* Field: Commerce Payment Transaction: Created date */ + $handler->display->display_options['fields']['created']['id'] = 'created'; + $handler->display->display_options['fields']['created']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['fields']['created']['field'] = 'created'; + $handler->display->display_options['fields']['created']['alter']['alter_text'] = TRUE; + $handler->display->display_options['fields']['created']['alter']['text'] = '[created] ([created_1])'; + $handler->display->display_options['fields']['created']['date_format'] = 'custom'; + $handler->display->display_options['fields']['created']['custom_date_format'] = 'l, F jS, Y'; + $handler->display->display_options['fields']['created']['second_date_format'] = 'long'; + /* Field: Commerce Order: Link */ + $handler->display->display_options['fields']['view_order']['id'] = 'view_order'; + $handler->display->display_options['fields']['view_order']['table'] = 'commerce_order'; + $handler->display->display_options['fields']['view_order']['field'] = 'view_order'; + /* Sort criterion: Commerce Payment Transaction: Created date */ + $handler->display->display_options['sorts']['created']['id'] = 'created'; + $handler->display->display_options['sorts']['created']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['sorts']['created']['field'] = 'created'; + /* Filter criterion: Commerce Payment Transaction: Payment method */ + $handler->display->display_options['filters']['payment_method']['id'] = 'payment_method'; + $handler->display->display_options['filters']['payment_method']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['filters']['payment_method']['field'] = 'payment_method'; + $handler->display->display_options['filters']['payment_method']['value'] = array( + 'commerce_amazon_login_and_pay' => 'commerce_amazon_login_and_pay', + ); + $handler->display->display_options['filters']['payment_method']['group'] = 1; + /* Filter criterion: Commerce Payment Transaction: Remote status */ + $handler->display->display_options['filters']['remote_status']['id'] = 'remote_status'; + $handler->display->display_options['filters']['remote_status']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['filters']['remote_status']['field'] = 'remote_status'; + $handler->display->display_options['filters']['remote_status']['operator'] = 'longerthan'; + $handler->display->display_options['filters']['remote_status']['value'] = '1'; + $handler->display->display_options['filters']['remote_status']['group'] = 1; + /* Filter criterion: Commerce Payment Transaction: Status */ + $handler->display->display_options['filters']['status']['id'] = 'status'; + $handler->display->display_options['filters']['status']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['filters']['status']['field'] = 'status'; + $handler->display->display_options['filters']['status']['value'] = array( + 'pending' => 'pending', + ); + $handler->display->display_options['filters']['status']['group'] = 1; + /* Filter criterion: Commerce Payment Transaction: Created date */ + $handler->display->display_options['filters']['created']['id'] = 'created'; + $handler->display->display_options['filters']['created']['table'] = 'commerce_payment_transaction'; + $handler->display->display_options['filters']['created']['field'] = 'created'; + $handler->display->display_options['filters']['created']['operator'] = '<'; + $handler->display->display_options['filters']['created']['value']['value'] = 'now -21 days'; + $handler->display->display_options['filters']['created']['value']['type'] = 'offset'; + + /* Display: Page */ + $handler = $view->new_display('page', 'Page', 'page'); + $handler->display->display_options['path'] = 'admin/commerce/orders/pending-authorizations'; + $handler->display->display_options['menu']['type'] = 'tab'; + $handler->display->display_options['menu']['title'] = 'Expiring Authorizations'; + $handler->display->display_options['menu']['description'] = 'Orders whose Amazon Payment authorizations will be expiring in the next week.'; + $handler->display->display_options['menu']['weight'] = '0'; + $handler->display->display_options['menu']['context'] = 0; + $handler->display->display_options['menu']['context_only_inline'] = 0; + + $views['commerce_amazon_lpa_pending_authorizations'] = $view; + + return $views; +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonLPA.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonLPA.php new file mode 100644 index 00000000..3e9fdb2a --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonLPA.php @@ -0,0 +1,1040 @@ + 'A33DP3YE7OHVLV', + 'DE' => 'A1ZBM19RFMXA83', + 'US' => 'A294FY3QW7KJ8X', + ); + + /** + * Returns if the API is working in sandbox mode. + * + * @return bool + * Returns TRUE if sandbox, or FALSE for production. + */ + public static function is_sandbox() { + return (variable_get('commerce_amazon_lpa_environment', self::ENV_SANDBOX) == self::ENV_SANDBOX); + } + + /** + * Returns if running in ERP mode. + * + * @return bool + * Returns TRUE if in ERP mode, or FALSE for not. + */ + public static function is_erp_mode() { + return (bool) variable_get('commerce_amazon_lpa_erp_mode', 0); + } + + /** + * Checks if Login and Pay with Amazon has been configured. + * + * @return bool + * Returns TRUE if service has been configured. + */ + public static function is_configured() { + return ( + variable_get('commerce_amazon_lpa_merchant_id') !== NULL || + variable_get('commerce_amazon_lpa_access_key') !== NULL || + variable_get('commerce_amazon_lpa_secret_key') !== NULL + ); + } + + /** + * Returns if the Login and Pay with Amazon buttons have been hidden. + * + * @return bool + * Returns boolean indicating hidden status. + */ + public static function is_hidden() { + $hidden_mode = variable_get('commerce_amazon_lpa_hidden_mode'); + return ( + $GLOBALS['user']->uid != 1 && + !empty($hidden_mode) && + !user_has_role(variable_get('commerce_amazon_lpa_hidden_mode')) + ); + } + + /** + * Returns the current operation mode. + * + * @return string + * The current operation mode. + */ + public static function get_operation_mode() { + return variable_get('commerce_amazon_lpa_operation_mode', AmazonLPA::OPERATION_MODE_LOGIN_AND_PAY); + } + + /** + * Returns currency for a seller's region, or region currency map. + * + * @param null|string $region + * A region code. + * + * @return array|string|bool + * Array or single region currency code. + */ + public static function get_region_currency_code($region = NULL) { + $currencies = array( + 'DE' => 'EUR', + 'UK' => 'GBP', + 'US' => 'USD', + ); + + if ($region === NULL) { + return $currencies; + } + elseif (isset($currencies[$region])) { + return $currencies[$region]; + } + else { + return FALSE; + } + } + + /** + * Returns the language code for a region. + * + * @param null $region + * + * @return array|bool + */ + public static function get_region_langcode($region = NULL) { + $lang_codes = array( + 'DE' => 'de-DE', + 'UK' => 'en-GB', + 'US' => 'en-US', + ); + + if ($region === NULL) { + return $lang_codes; + } + elseif (isset($lang_codes[$region])) { + return $lang_codes[$region]; + } + else { + return FALSE; + } + } + + /** + * Returns the current capture mode. + * + * @return string + * The current capture mode. + */ + public static function get_capture_mode() { + return variable_get('commerce_amazon_lpa_capture_mode', 'shipment_capture'); + } + + /** + * Get the current authorization mode. + * + * @return string + * The current authorization mode. + */ + public static function get_authorization_mode() { + return variable_get('commerce_amazon_lpa_authorization_mode', self::AUTH_NONSYNC); + } + + /** + * Helper function to get a new instance. + * + * @return \AmazonLPA + * The API instance. + */ + public static function instance() { + return new self(); + } + + /** + * @var \AmazonPayClient + */ + protected $client; + + /** + * AmazonLPA constructor. + */ + public function __construct() { + if (!self::is_configured()) { + throw new Exception(t('You must configured Login and Pay with Amazon.')); + } + $this->client = new AmazonPayClient(array( + 'merchant_id' => variable_get('commerce_amazon_lpa_merchant_id'), + 'access_key' => variable_get('commerce_amazon_lpa_access_key'), + 'secret_key' => variable_get('commerce_amazon_lpa_secret_key'), + 'client_id' => variable_get('commerce_amazon_lpa_client_id'), + 'region' => variable_get('commerce_amazon_lpa_region'), + 'sandbox' => self::is_sandbox(), + )); + } + + /** + * Returns current API client. + * + * @return \AmazonPayClient + * Returns SDK client. + */ + public function getClient() { + return $this->client; + } + + /** + * Returns the current Amazon user info. + * + * @return array|mixed + * The current Amazon user information. + */ + public function getUserInfo() { + if (empty($this->user_info)) { + if (isset($_COOKIE['amazon_Login_accessToken'])) { + $access_token = $_COOKIE['amazon_Login_accessToken']; + try { + $this->user_info = $this->client->getUserInfo($access_token); + } + catch (Exception $e) { + + } + } + } + return $this->user_info; + } + + /** + * Sends API request to cancel an order. + * + * @param \EntityDrupalWrapper $order + * + * @return bool|mixed + * + * @throws \Exception + */ + public function cancel(EntityDrupalWrapper $order) { + $contract_id = $this->getOrderReferenceId($order); + $balance = commerce_payment_order_balance($order->value()); + + if (!empty($contract_id) && $balance['amount'] > 0) { + $params = array( + 'amazon_order_reference_id' => $contract_id, + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('cancel_order_reference', $params, $order); + + $response = $this->client->cancelOrderReference($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging cancel response: !debug>'), array( + '!debug' => '' . check_plain(print_r($data, TRUE)) . '', + )); + + if ($this->client->success) { + return $data; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to cancel @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ) + )); + } + } + + return FALSE; + } + + /** + * Captures payment on an authorization. + * + * @param \EntityDrupalWrapper $order + * @param string $authorization_id + * @param array|null $balance + * A price array structure for the balance to process. + * + * @return bool|mixed + * + * @throws \Exception + */ + public function capture(EntityDrupalWrapper $order, $authorization_id, $balance = NULL) { + $contract_id = $this->getOrderReferenceId($order); + + if (!$balance) { + $balance = commerce_payment_order_balance($order->value()); + } + + if (!empty($contract_id) && $balance['amount'] > 0) { + $params = array( + 'amazon_order_reference_id' => $contract_id, + 'amazon_authorization_id' => $authorization_id, + 'capture_amount' => commerce_currency_amount_to_decimal($balance['amount'], $balance['currency_code']), + 'currency_code' => $balance['currency_code'], + 'capture_reference_id' => 'capture_' . $order->order_id->value() . '_' . REQUEST_TIME, + 'transaction_timeout' => 0, + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('capture', $params, $order); + + $response = $this->client->capture($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging capture response: !debug>'), array('!debug' => '
' . check_plain(print_r($data, TRUE)) . '')); + + if ($this->client->success) { + return $data['CaptureResult']['CaptureDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to capture payment for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + return FALSE; + } + + /** + * Closes an authorization with Amazon. + * + * @param \EntityDrupalWrapper $order + * @param $authorization_id + * @param string $reason + * + * @return bool|mixed + * + * @throws \Exception + */ + public function closeAuthorization(EntityDrupalWrapper $order, $authorization_id, $reason = '') { + + $params = array( + 'amazon_authorization_id' => $authorization_id, + 'closure_reason' => $reason, + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('close_authorization', $params, $order); + + $response = $this->client->closeAuthorization($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging close authorization response: !debug>'), array( + '!debug' => '
' . check_plain(print_r($data, TRUE)) . '', + )); + + if ($this->client->success) { + return $data; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to close authorization for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * Creates an authorization transaction on an order. + * + * @param \EntityDrupalWrapper $order + * Entity metadata wrapper for a commerce order entity. + * @param bool $capture_now + * @param array|null $balance + * A price array structure for the balance to process. + * + * @return mixed + * Authorization transaction result. + * + * @throws \Exception + */ + public function authorize(EntityDrupalWrapper $order, $capture_now = FALSE, $balance = NULL) { + + if (!$balance) { + $balance = commerce_payment_order_balance($order->value()); + } + + $params = array( + 'amazon_order_reference_id' => $this->getOrderReferenceId($order), + 'authorization_amount' => commerce_currency_amount_to_decimal($balance['amount'], $balance['currency_code']), + 'currency_code' => $balance['currency_code'], + 'authorization_reference_id' => 'auth_' . $order->order_id->value() . '_' . REQUEST_TIME, + 'capture_now' => $capture_now, + ); + + if ($capture_now) { + $params['seller_authorization_note'] = check_plain(variable_get('commerce_amazon_lpa_capture_auth_statement', '')); + } + + // If using sync, set transaction timeout to 0. + if (self::get_authorization_mode() == self::AUTH_SYNC) { + $params['transaction_timeout'] = 0; + } + // Otherwise use max timeout. + else { + $params['transaction_timeout'] = variable_get('commerce_amazon_lpa_transaction_timeout', 1440); + } + + // Allow modules to modify the request params. + $this->alterRequestParams('authorize', $params, $order); + + $response = $this->client->authorize($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging authorize response: !debug'), array('!debug' => '
' . check_plain(print_r($data, TRUE)) . '')); + + if ($this->client->success) { + return $data['AuthorizeResult']['AuthorizationDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to authorize payment for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * Processes and saves a payment transaction that is in authorization. + * + * @param object $transaction + * The transaction in authorization. + * @param array $data + * API data. + * + * @throws \Exception + * Exception. + */ + public function processAuthorizeTransaction($transaction, array $data) { + $order = commerce_order_load($transaction->order_id); + + // Amazon has at least two different ways that Buyer information is conveyed + // back to an API client. The first is that the OrderReference has a Buyer + // object that contains a name and email address (with an optional phone no.). + // The second is an AuthorizationBillingDetails object that is returned on + // some versions of the API. At the time of writing, the US version of the API + // doesn't provide this information, but the UK version does. Since we do not + // know what the API is going to return, we'll look for the + // AuthorizationBillingDetails object and, if it exists, process it. If not, + // then the Buyer information on the Order Reference will have to suffice. + // @see https://payments.amazon.com/documentation/apireference/201752660#201752450 + // @see https://payments.amazon.co.uk/developer/documentation/apireference/201752450 + $billing_address = NULL; + if (isset($data['AuthorizationBillingAddress'])) { + $billing_address = $data['AuthorizationBillingAddress']; + } + + // If we found a billing address, sync it. + if ($billing_address) { + try { + commerce_amazon_lpa_amazon_address_to_customer_profile($order, 'billing', $billing_address); + commerce_order_save($order); + } + catch (Exception $e) { + watchdog('commerce_amazon_lpa', 'Error processing order billing information for Amazon: !error', array('!error' => '
' . print_r($data, TRUE) . ''), WATCHDOG_ERROR); + } + } + // Otherwise just use shipping address so it isn't empty. + else { + $order_reference = $this->getOrderRef(entity_metadata_wrapper('commerce_order', $order)); + if (isset($order_reference['Destination']['PhysicalDestination'])) { + $shipping_address = $order_reference['Destination']['PhysicalDestination']; + commerce_amazon_lpa_amazon_address_to_customer_profile($order, 'billing', $shipping_address); + commerce_amazon_lpa_amazon_address_to_customer_profile($order, 'shipping', $shipping_address); + commerce_order_save($order); + } + } + + $transaction->remote_id = $data['AmazonAuthorizationId']; + $transaction->amount = commerce_currency_decimal_to_amount($data['AuthorizationAmount']['Amount'], $data['AuthorizationAmount']['CurrencyCode']); + $transaction->currency_code = $data['AuthorizationAmount']['CurrencyCode']; + + $transaction->data['commerce_amazon_lpa']['environment'] = variable_get('commerce_amazon_lpa_environment', self::ENV_SANDBOX); + $transaction->data['commerce_amazon_lpa']['auth_reference_id'] = $data['AuthorizationReferenceId']; + $transaction->data['commerce_amazon_lpa']['transaction_type'] = 'authorization'; + + // Capture is only pending if pre-authorized. Otherwise declined during + // validation. Check the payment object's state and update transaction + // status. + commerce_amazon_lpa_payment_state_to_status($transaction, $data['AuthorizationStatus']); + + commerce_amazon_lpa_transaction_message_update_data($transaction, 'Authorization', $data['AuthorizationStatus']); + $transaction->payload[REQUEST_TIME . '-authorization'] = $data; + + // If we did capture, set it up so that we can properly refund, etc. + if ($transaction->status == COMMERCE_PAYMENT_STATUS_SUCCESS && $data['AuthorizationStatus']['ReasonCode'] == 'MaxCapturesProcessed') { + // Create a capture transaction. + if (isset($data['IdList']['member'])) { + $capture_id = $data['IdList']['member']; + } + else { + $capture_id = $data['IdList']['Id']; + } + $capture_details = $this->getCaptureDetails($capture_id); + $transaction->remote_id = $capture_details['AmazonCaptureId']; + $transaction->data['commerce_amazon_lpa']['capture_id'] = $capture_details['AmazonCaptureId']; + $transaction->data['commerce_amazon_lpa']['transaction_type'] = 'capture'; + // The authorization will be "Closed" but the capture will be "Completed". + // The value returned by Amazon must be overridden so that refunds will + // work. + commerce_amazon_lpa_payment_state_to_status($transaction, $capture_details['CaptureStatus']); + commerce_amazon_lpa_transaction_message_update_data($transaction, 'Capture', $capture_details['CaptureStatus']); + $transaction->payload[REQUEST_TIME . '-capture'] = $capture_details; + + // Create a revision, since we have changed the remote ID. + $transaction->revision = TRUE; + $transaction->log = t('Authorization was captured'); + } + // If we have a pending transaction, we need to make sure the order status + // matches the one configured. + if ($transaction->status == COMMERCE_PAYMENT_STATUS_PENDING && + $data['AuthorizationStatus']['State'] == 'Open' && + variable_get('commerce_amazon_lpa_auth_order_status', 'pending') != $order->status) { + $order->data['commerce_amazon_lpa_set_as_auth'] = TRUE; + } + + commerce_payment_transaction_save($transaction); + + // If the authorization is Rejected, then set the order lock on the + // order's data object to forbid any further transactions from taking + // place. + if (AmazonLPA::get_authorization_mode() == AmazonLPA::AUTH_NONSYNC) { + if ($data['AuthorizationStatus']['State'] == 'Declined') { + $reason_code = $data['AuthorizationStatus']['ReasonCode']; + if ($reason_code == 'InvalidPaymentMethod') { + rules_invoke_all('commerce_amazon_lpa_nonsync_auth_soft_decline', $order, $transaction, $data); + } + else { + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $order_wrapper->{AmazonLPA::REFERENCE_ID_FIELD} = ''; + commerce_amazon_lpa_user_logout($order_wrapper->owner->value()); + commerce_order_status_update($order, 'cart', FALSE, TRUE, t('The payment method was rejected by Amazon.')); + + rules_invoke_all('commerce_amazon_lpa_nonsync_auth_hard_decline', $order, $transaction, $data); + } + } + } + } + + /** + * Processes and saves a payment transaction that is a capture. + * + * @param object $transaction + * The transaction in authorization. + * @param array $data + * API data. + * + * @throws \Exception + * Exception. + */ + public function processCaptureTransaction($transaction, array $data) { + $transaction->remote_id = $data['AmazonCaptureId']; + $transaction->amount = commerce_currency_decimal_to_amount($data['CaptureAmount']['Amount'], $data['CaptureAmount']['CurrencyCode']); + $transaction->currency_code = $data['CaptureAmount']['CurrencyCode']; + + $transaction->data['commerce_amazon_lpa']['environment'] = variable_get('commerce_amazon_lpa_environment', self::ENV_SANDBOX); + $transaction->data['commerce_amazon_lpa']['auth_reference_id'] = $data['AmazonCaptureId']; + $transaction->data['commerce_amazon_lpa']['transaction_type'] = 'capture'; + + commerce_amazon_lpa_payment_state_to_status($transaction, $data['CaptureStatus']); + commerce_amazon_lpa_transaction_message_update_data($transaction, 'Capture', $data['CaptureStatus']); + $transaction->payload[REQUEST_TIME . '-capture'] = $data; + + commerce_payment_transaction_save($transaction); + } + + /** + * Processes and saves a payment transaction that is a refund. + * + * @param object $transaction + * The transaction in authorization. + * @param array $data + * API data. + * + * @throws \Exception + * Exception. + */ + public function processRefundTransaction($transaction, array $data) { + $transaction->remote_id = $data['AmazonRefundId']; + $transaction->amount = commerce_currency_decimal_to_amount($data['RefundAmount']['Amount'], $data['RefundAmount']['CurrencyCode']) * -1; + $transaction->currency_code = $data['RefundAmount']['CurrencyCode']; + + $transaction->data['commerce_amazon_lpa']['environment'] = variable_get('commerce_amazon_lpa_environment', self::ENV_SANDBOX); + $transaction->data['commerce_amazon_lpa']['refund_id'] = $data['AmazonRefundId']; + $transaction->data['commerce_amazon_lpa']['transaction_type'] = 'refund'; + + commerce_amazon_lpa_payment_state_to_status($transaction, $data['RefundStatus']); + commerce_amazon_lpa_transaction_message_update_data($transaction, 'Refund', $data['RefundStatus']); + $transaction->payload[REQUEST_TIME . '-refund'] = $data; + commerce_payment_transaction_save($transaction); + } + + /** + * Confirms that an order reference has been fulfilled to Amazon Payments. + * + * Call the CloseOrderReference operation to indicate that a previously + * confirmed order reference has been fulfilled (fully or partially) and that + * you do not expect to create any new authorizations on this order reference. + * + * You can still capture funds against open authorizations on the order + * reference. + * + * @link https://payments.amazon.com/documentation/apireference/201752000 + * + * @param \EntityDrupalWrapper $order + * Entity metadata wrapper for a commerce order entity. + * + * @return mixed + * Response details. + * + * @throws \Exception + */ + public function closeOrderRef(EntityDrupalWrapper $order) { + $params = array( + 'amazon_order_reference_id' => $this->getOrderReferenceId($order), + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('close_order_reference', $params, $order); + + $response = $this->client->closeOrderReference($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging close order reference response: !debug>'), array('!debug' => '
' . check_plain(print_r($data, TRUE)) . '')); + + if ($this->client->success) { + return $data; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to close the reference for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * Gets the order reference from Amazon Payments. + * + * The GetOrderReferenceDetails operation returns details about the Order + * Reference object and its current state. + * + * @link https://payments.amazon.com/documentation/apireference/201751970 + * + * @param \EntityDrupalWrapper $order + * Entity metadata wrapper for a commerce order entity. + * + * @return array + * Array of order reference detail information. + * + * @throws \Exception + */ + public function getOrderRef(EntityDrupalWrapper $order) { + $params = array( + 'amazon_order_reference_id' => $this->getOrderReferenceId($order), + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('get_order_reference', $params, $order); + + $response = $this->client->getOrderReferenceDetails($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging get order reference response: !debug>'), array('!debug' => '
' . check_plain(print_r($data, TRUE)) . '')); + + if ($this->client->success) { + return $data['GetOrderReferenceDetailsResult']['OrderReferenceDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to get the order reference for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * Confirms an order reference. + * + * Call the ConfirmOrderReference operation after the order reference is free + * of constraints and all required information has been set on the order + * reference. After you call this operation, the order reference is set to + * the Open state and you can submit authorizations against the order + * reference. + * + * @link https://payments.amazon.com/documentation/apireference/201751980 + * + * @param \EntityDrupalWrapper $order + * Entity metadata wrapper for a commerce order entity. + * + * @return mixed + * Array of order reference detail information. + * + * @throws \Exception + */ + public function confirmOrderRef(EntityDrupalWrapper $order) { + $params = array( + 'amazon_order_reference_id' => $this->getOrderReferenceId($order), + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('confirm_order_reference', $params, $order); + + $response = $this->client->confirmOrderReference($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging confirm order reference response: !debug>'), array('!debug' => '
' . check_plain(print_r($data, TRUE)) . '')); + + if ($this->client->success) { + return $data; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to confirm the order reference for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * Sets an order reference to Amazon Payments. + * + * Call the SetOrderReferenceDetails operation to specify order details such + * as the amount of the order, a description of the order, and other order + * attributes. + * + * @link https://payments.amazon.com/documentation/apireference/201751960 + * + * @param \EntityDrupalWrapper $order + * Entity metadata wrapper for a commerce order entity. + * + * @return mixed + * The order reference details response. + * + * @throws \Exception + */ + public function setOrderRef(EntityDrupalWrapper $order) { + $params = array( + 'amazon_order_reference_id' => $this->getOrderReferenceId($order), + 'amount' => $order->commerce_order_total->amount_decimal->value(), + 'currency_code' => $order->commerce_order_total->currency_code->value(), + 'seller_order_id' => $order->getIdentifier(), + 'store_name' => variable_get('site_name'), + 'platform_id' => $this->platform_ids[variable_get('commerce_amazon_lpa_region')], + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('set_order_reference', $params, $order); + + $response = $this->client->setOrderReferenceDetails($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging set order reference response: !debug>', array( + '!debug' => '
' . check_plain(print_r($data, TRUE)) . '', + ))); + + if ($this->client->success) { + return $data['SetOrderReferenceDetailsResult']['OrderReferenceDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to set the order reference for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * @param $capture_id + * + * @return mixed + * @throws \Exception + */ + public function getCaptureDetails($capture_id) { + $params = array( + 'amazon_capture_id' => $capture_id, + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('get_capture_details', $params); + + $response = $this->client->getCaptureDetails($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging capture details response: !debug>', array('!debug' => '
' . check_plain(print_r($data, TRUE)) . ''))); + + if ($this->client->success) { + return $data['GetCaptureDetailsResult']['CaptureDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to capture payment for @order_id: @reason', array( + '@order_id' => $capture_id, + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * @param string $authorization_id + * + * @return mixed + * @throws \Exception + */ + public function getAuthorizationDetails($authorization_id) { + $response = $this->client->getAuthorizationDetails(array( + 'amazon_authorization_id' => $authorization_id, + )); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging authorization details response: !debug>', array('!debug' => '
' . check_plain(print_r($data, TRUE)) . ''))); + + if ($this->client->success) { + return $data['GetAuthorizationDetailsResult']['AuthorizationDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to get authorization details for @order_id', array('@order_id' => $authorization_id) + )); + } + } + + /** + * Refunds a transation for specified amount. + * + * @param $order + * @param $captureId + * @param $amount + * @param string $note + * + * @return mixed + * + * @throws \Exception + */ + public function refund(EntityDrupalWrapper $order, $captureId, $amount, $note = '') { + $balance = commerce_payment_order_balance($order->value()); + + $params = array( + 'amazon_capture_id' => $captureId, + 'refund_amount' => $amount, + 'currency_code' => $balance['currency_code'], + 'refund_reference_id' => 'refund_' . $order->order_id->value() . '_' . REQUEST_TIME, + 'seller_refund_note' => $note, + ); + + // Allow modules to modify the request params. + $this->alterRequestParams('refund', $params); + + $response = $this->client->refund($params); + $data = $response->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Debugging refund response: !debug>', array('!debug' => '
' . check_plain(print_r($data, TRUE)) . ''))); + + if ($this->client->success) { + return $data['RefundResult']['RefundDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to refund payment for @order_id: @reason', array( + '@order_id' => $order->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $data['Error']['Code'], + '@message' => $data['Error']['Message'], + )), + ))); + } + } + + /** + * @param string $refund_id + * + * @return mixed + * @throws \Exception + */ + public function getRefundDetails($refund_id) { + $response = $this->client->getRefundDetails(array( + 'amazon_refund_id' => $refund_id, + )); + $data = $response->toArray(); + + if ($this->client->success) { + return $data['GetRefundDetailsResult']['RefundDetails']; + } + else { + throw new AmazonApiException( + $data['Error']['Code'], + $data, + t('Unable to get refund details for @order_id', array('@order_id' => $refund_id))); + } + } + + /** + * Returns the reference ID from an order. + * + * @param \EntityDrupalWrapper $order + * Entity metadata wrapper for a commerce order entity. + * + * @return mixed + */ + public function getOrderReferenceId(EntityDrupalWrapper $order) { + if (isset($order->{AmazonLPA::REFERENCE_ID_FIELD})) { + return $order->{AmazonLPA::REFERENCE_ID_FIELD}->value(); + } + return NULL; + } + + /** + * Invokes alter to allow modules to adjust API call parameters. + * + * @param $type + * @param $params + * @param $data + */ + public function alterRequestParams($type, array &$params, $data = NULL) { + drupal_alter('commerce_amazon_lpa_request_params', $params, $type, $data); + } + +} +/** + * + */ +class AmazonApiException extends Exception { + protected $errorCode; + protected $response; + + /** + * + */ + public function __construct($error_code, array $response, $message = "", $code = 0, Throwable $previous = NULL) { + parent::__construct($message, $code, $previous); + $this->errorCode = $error_code; + $this->response = $response; + } + + /** + * + */ + public function getErrorCode() { + return $this->errorCode; + } + + /** + * + */ + public function getResponse() { + return $this->response; + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayClient.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayClient.php new file mode 100644 index 00000000..631a0d8d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayClient.php @@ -0,0 +1,1492 @@ + NULL, + 'secret_key' => NULL, + 'access_key' => NULL, + 'region' => NULL, + 'currency_code' => NULL, + 'sandbox' => FALSE, + 'platform_id' => NULL, + 'cabundle_file' => NULL, + 'application_name' => NULL, + 'application_version' => NULL, + 'proxy_host' => NULL, + 'proxy_port' => -1, + 'proxy_username' => NULL, + 'proxy_password' => NULL, + 'client_id' => NULL, + 'app_id' => NULL, + 'handle_throttle' => TRUE, + ); + + private $modePath = NULL; + + protected $mwsServiceUrl = NULL; + + public $mwsServiceUrls = array( + 'eu' => 'mws-eu.amazonservices.com', + 'na' => 'mws.amazonservices.com', + 'jp' => 'mws.amazonservices.jp', + ); + + public $profileEndpointUrls = array( + 'uk' => 'amazon.co.uk', + 'us' => 'amazon.com', + 'de' => 'amazon.de', + 'jp' => 'amazon.co.jp', + ); + + public $regionMappings = array( + 'de' => 'eu', + 'uk' => 'eu', + 'us' => 'na', + 'jp' => 'jp', + ); + + /** + * Boolean variable to check if the API call was a success. + * + * @var bool + */ + public $success = FALSE; + + /** + * + */ + public function __construct($config = array()) { + $this->checkConfigKeys($config); + if (empty($this->config['region'])) { + throw new \Exception("config['region'] is a required parameter and is not set"); + } + if (!isset($this->regionMappings[strtolower($this->config['region'])])) { + throw new \Exception($this->config['region'] . ' is not a valid region'); + } + $this->modePath = strtolower($this->config['sandbox']) ? 'OffAmazonPayments_Sandbox' : 'OffAmazonPayments'; + $this->mwsEndpointUrl = $this->mwsServiceUrls[$this->regionMappings[strtolower($this->config['region'])]]; + $this->mwsServiceUrl = 'https://' . $this->mwsEndpointUrl . '/' . $this->modePath . '/' . self::MWS_VERSION; + $this->mwsEndpointPath = '/' . $this->modePath . '/' . self::MWS_VERSION; + } + + /** + * Logs message. + * + * @param $message + */ + protected function logMessage($message) { + commerce_amazon_lpa_add_debug_log($message, array(), WATCHDOG_INFO); + } + + /** + * Checks if the keys of the input configuration matches the keys in the + * config array if they match the values are taken else throws exception + * strict case match is not performed. + * + * @param $config + * + * @throws \Exception + */ + protected function checkConfigKeys($config) { + foreach ($config as $key => $value) { + if (array_key_exists($key, $this->config)) { + if (!is_array($value) && !is_bool($value) && $key !== 'proxy_password') { + $this->config[$key] = trim($value); + } + else { + $this->config[$key] = $value; + } + } + else { + throw new \Exception('Key ' . $key . ' is either not part of the configuration or has incorrect Key name. + check the config array key names to match your key names of your config array', 1); + } + } + } + + /** + * Gets the value for the key if the key exists in config. + * + * @param $name + * + * @return mixed + * + * @throws \Exception + */ + public function __get($name) { + if (array_key_exists(strtolower($name), $this->config)) { + return $this->config[strtolower($name)]; + } + else { + throw new \Exception('Key ' . $name . ' is either not a part of the configuration array config or the ' . $name . ' does not match the key name in the config array', 1); + } + } + + /** + * GetUserInfo convenience function - Returns user's profile information from + * Amazon using the access token returned by the Button widget. + * + * @see http://login.amazon.com/website Step 4 + * @param $accessToken [String] + */ + public function getUserInfo($accessToken) { + // Get the correct Profile Endpoint URL based off the country/region provided in the config['region']. + $environment = strtolower($this->config['sandbox']) ? "api.sandbox" : "api"; + $region = strtolower($this->config['region']); + $profile_endpoint = 'https://' . $environment . '.' . $this->profileEndpointUrls[$region]; + + if (empty($accessToken)) { + throw new \InvalidArgumentException('Access Token is a required parameter and is not set'); + } + + // To make sure double encoding doesn't occur decode first and encode again. + $accessToken = urldecode($accessToken); + $url = $profile_endpoint . '/auth/o2/tokeninfo?access_token=' . str_replace('%7E', '~', rawurlencode($accessToken)); + + $httpCurlRequest = new AmazonPayHttpCurl($this->config); + + $response = $httpCurlRequest->httpGet($url); + $data = json_decode($response); + + // Ensure that the Access Token matches either the supplied Client ID *or* the supplied App ID + // Web apps and Mobile apps will have different Client ID's but App ID should be the same + // As long as one of these matches, from a security perspective, we have done our due diligence. + if (($data->aud != $this->config['client_id']) && ($data->app_id != $this->config['app_id'])) { + // The access token does not belong to us. + throw new \Exception('The Access Token belongs to neither your Client ID nor App ID'); + } + + // Exchange the access token for user profile. + $url = $profile_endpoint . '/user/profile'; + $httpCurlRequest = new AmazonPayHttpCurl($this->config); + + $httpCurlRequest->setAccessToken($accessToken); + $httpCurlRequest->setHttpHeader(); + $response = $httpCurlRequest->httpGet($url); + + $userInfo = json_decode($response, TRUE); + return $userInfo; + } + + /** + * SetParametersAndPost - sets the parameters array with non empty values from the requestParameters array sent to API calls. + * If Provider Credit Details is present, values are set by setProviderCreditDetails + * If Provider Credit Reversal Details is present, values are set by setProviderCreditDetails. + */ + protected function setParametersAndPost($parameters, $fieldMappings, $requestParameters) { + /* For loop to take all the non empty parameters in the $requestParameters and add it into the $parameters array, + * if the keys are matched from $requestParameters array with the $fieldMappings array + */ + foreach ($requestParameters as $param => $value) { + + // Do not use trim on boolean values, or it will convert them to '0' or '1'. + if (!is_array($value) && !is_bool($value)) { + $value = trim($value); + } + + // Ensure that no unexpected type coercions have happened. + if ($param === 'capture_now' || $param === 'confirm_now' || $param === 'inherit_shipping_address') { + if (!is_bool($value)) { + throw new \Exception($param . ' value ' . $value . ' is of type ' . gettype($value) . ' and should be a boolean value'); + } + } + + // When checking for non-empty values, consider any boolean as non-empty. + if (array_key_exists($param, $fieldMappings) && (is_bool($value) || $value != '')) { + + if (is_array($value)) { + // If the parameter is a provider_credit_details or provider_credit_reversal_details, call the respective functions to set the values. + if ($param === 'provider_credit_details') { + $parameters = $this->setProviderCreditDetails($parameters, $value); + } + elseif ($param === 'provider_credit_reversal_details') { + $parameters = $this->setProviderCreditReversalDetails($parameters, $value); + } + + } + else { + $parameters[$fieldMappings[$param]] = $value; + } + } + } + + $parameters = $this->setDefaultValues($parameters, $fieldMappings, $requestParameters); + $responseObject = $this->calculateSignatureAndPost($parameters); + + return $responseObject; + } + + /** + * CalculateSignatureAndPost - convert the Parameters array to string and + * curl POST the parameters to MWS. + */ + protected function calculateSignatureAndPost($parameters) { + // Call the signature and Post function to perform the actions. Returns XML in array format. + $parametersString = $this->calculateSignatureAndParametersToString($parameters); + + // POST using curl the String converted Parameters. + $response = $this->invokePost($parametersString); + + // Send this response as args to ResponseParser class which will return the object of the class. + $responseObject = new AmazonPayResponse($response); + return $responseObject; + } + + /** + * If merchant_id is not set via the requestParameters array then it's taken + * from the config array. + * + * Set the platform_id if set in the config['platform_id'] array. + * + * If currency_code is set in the $requestParameters and it exists in the $fieldMappings array, strtoupper it + * else take the value from config array if set + */ + private function setDefaultValues($parameters, $fieldMappings, $requestParameters) { + if (empty($requestParameters['merchant_id'])) { + $parameters['SellerId'] = $this->config['merchant_id']; + } + + if (array_key_exists('platform_id', $fieldMappings)) { + if (empty($requestParameters['platform_id']) && !empty($this->config['platform_id'])) { + $parameters[$fieldMappings['platform_id']] = $this->config['platform_id']; + } + } + + if (array_key_exists('currency_code', $fieldMappings)) { + if (!empty($requestParameters['currency_code'])) { + $parameters[$fieldMappings['currency_code']] = strtoupper($requestParameters['currency_code']); + } + else { + $parameters[$fieldMappings['currency_code']] = strtoupper($this->config['currency_code']); + } + } + + return $parameters; + } + + /** + * SetProviderCreditDetails - sets the provider credit details sent via the Capture or Authorize API calls. + * + * @param provider_id - [String] + * @param credit_amount - [String] + * + * @optional currency_code - [String] + */ + private function setProviderCreditDetails($parameters, $providerCreditInfo) { + $providerIndex = 0; + $providerString = 'ProviderCreditList.member.'; + + $fieldMappings = array( + 'provider_id' => 'ProviderId', + 'credit_amount' => 'CreditAmount.Amount', + 'currency_code' => 'CreditAmount.CurrencyCode', + ); + + foreach ($providerCreditInfo as $key => $value) { + $value = array_change_key_case($value, CASE_LOWER); + $providerIndex = $providerIndex + 1; + + foreach ($value as $param => $val) { + if (array_key_exists($param, $fieldMappings) && trim($val) != '') { + $parameters[$providerString . $providerIndex . '.' . $fieldMappings[$param]] = $val; + } + } + + // If currency code is not entered take it from the config array. + if (empty($parameters[$providerString . $providerIndex . '.' . $fieldMappings['currency_code']])) { + $parameters[$providerString . $providerIndex . '.' . $fieldMappings['currency_code']] = strtoupper($this->config['currency_code']); + } + } + + return $parameters; + } + + /** + * SetProviderCreditReversalDetails - sets the reverse provider credit details sent via the Refund API call. + * + * @param provider_id - [String] + * @param credit_amount - [String] + * + * @optional currency_code - [String] + */ + protected function setProviderCreditReversalDetails($parameters, $providerCreditInfo) { + $providerIndex = 0; + $providerString = 'ProviderCreditReversalList.member.'; + + $fieldMappings = array( + 'provider_id' => 'ProviderId', + 'credit_reversal_amount' => 'CreditReversalAmount.Amount', + 'currency_code' => 'CreditReversalAmount.CurrencyCode', + ); + + foreach ($providerCreditInfo as $key => $value) { + $value = array_change_key_case($value, CASE_LOWER); + $providerIndex = $providerIndex + 1; + + foreach ($value as $param => $val) { + if (array_key_exists($param, $fieldMappings) && trim($val) != '') { + $parameters[$providerString . $providerIndex . '.' . $fieldMappings[$param]] = $val; + } + } + + // If currency code is not entered take it from the config array. + if (empty($parameters[$providerString . $providerIndex . '.' . $fieldMappings['currency_code']])) { + $parameters[$providerString . $providerIndex . '.' . $fieldMappings['currency_code']] = strtoupper($this->config['currency_code']); + } + } + + return $parameters; + } + + /** + * GetOrderReferenceDetails API call - Returns details about the Order Reference object and its current state. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751970 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_order_reference_id'] - [String] + * + * @optional requestParameters['address_consent_token'] - [String] + * @optional requestParameters['access_token'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + * + * You cannot pass both address_consent_token and access_token in + * the same call or you will encounter a 400/"AmbiguousToken" error + */ + public function getOrderReferenceDetails($requestParameters = array()) { + + $parameters['Action'] = 'GetOrderReferenceDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_order_reference_id' => 'AmazonOrderReferenceId', + 'address_consent_token' => 'AddressConsentToken', + 'access_token' => 'AccessToken', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + return ($responseObject); + } + + /** + * SetOrderReferenceDetails API call - Sets order reference details such as the order total and a description for the order. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751960 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_order_reference_id'] - [String] + * @param requestParameters['amount'] - [String] + * @param requestParameters['currency_code'] - [String] + * + * @optional requestParameters['platform_id'] - [String] + * @optional requestParameters['seller_note'] - [String] + * @optional requestParameters['seller_order_id'] - [String] + * @optional requestParameters['store_name'] - [String] + * @optional requestParameters['custom_information'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function setOrderReferenceDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'SetOrderReferenceDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_order_reference_id' => 'AmazonOrderReferenceId', + 'amount' => 'OrderReferenceAttributes.OrderTotal.Amount', + 'currency_code' => 'OrderReferenceAttributes.OrderTotal.CurrencyCode', + 'platform_id' => 'OrderReferenceAttributes.PlatformId', + 'seller_note' => 'OrderReferenceAttributes.SellerNote', + 'seller_order_id' => 'OrderReferenceAttributes.SellerOrderAttributes.SellerOrderId', + 'store_name' => 'OrderReferenceAttributes.SellerOrderAttributes.StoreName', + 'custom_information' => 'OrderReferenceAttributes.SellerOrderAttributes.CustomInformation', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * ConfirmOrderReference API call - Confirms that the order reference is free of constraints and all required information has been set on the order reference. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751980 + * * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_order_reference_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function confirmOrderReference($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'ConfirmOrderReference'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_order_reference_id' => 'AmazonOrderReferenceId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * CancelOrderReference API call - Cancels a previously confirmed order reference. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751990 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_order_reference_id'] - [String] + * + * @optional requestParameters['cancelation_reason'] [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function cancelOrderReference($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'CancelOrderReference'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_order_reference_id' => 'AmazonOrderReferenceId', + 'cancelation_reason' => 'CancelationReason', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * CloseOrderReference API call - Confirms that an order reference has been fulfilled (fully or partially) + * and that you do not expect to create any new authorizations on this order reference. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752000 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_order_reference_id'] - [String] + * + * @optional requestParameters['closure_reason'] [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function closeOrderReference($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'CloseOrderReference'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_order_reference_id' => 'AmazonOrderReferenceId', + 'closure_reason' => 'ClosureReason', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * CloseAuthorization API call - Closes an authorization. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752070 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_authorization_id'] - [String] + * + * @optional requestParameters['closure_reason'] [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function closeAuthorization($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'CloseAuthorization'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_authorization_id' => 'AmazonAuthorizationId', + 'closure_reason' => 'ClosureReason', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * Authorize API call - Reserves a specified amount against the payment method(s) stored in the order reference. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752010 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_order_reference_id'] - [String] + * @param requestParameters['authorization_amount'] [String] + * @param requestParameters['currency_code'] - [String] + * @param requestParameters['authorization_reference_id'] [String] + * + * @optional requestParameters['capture_now'] [String] + * @optional requestParameters['provider_credit_details'] - [array (array())] + * @optional requestParameters['seller_authorization_note'] [String] + * @optional requestParameters['transaction_timeout'] [String] - Defaults to 1440 minutes + * @optional requestParameters['soft_descriptor'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function authorize($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'Authorize'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_order_reference_id' => 'AmazonOrderReferenceId', + 'authorization_amount' => 'AuthorizationAmount.Amount', + 'currency_code' => 'AuthorizationAmount.CurrencyCode', + 'authorization_reference_id' => 'AuthorizationReferenceId', + 'capture_now' => 'CaptureNow', + 'provider_credit_details' => array(), + 'seller_authorization_note' => 'SellerAuthorizationNote', + 'transaction_timeout' => 'TransactionTimeout', + 'soft_descriptor' => 'SoftDescriptor', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * GetAuthorizationDetails API call - Returns the status of a particular authorization and the total amount captured on the authorization. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752030 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_authorization_id'] [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function getAuthorizationDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetAuthorizationDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_authorization_id' => 'AmazonAuthorizationId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * Capture API call - Captures funds from an authorized payment instrument. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752040 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_authorization_id'] - [String] + * @param requestParameters['capture_amount'] - [String] + * @param requestParameters['currency_code'] - [String] + * @param requestParameters['capture_reference_id'] - [String] + * + * @optional requestParameters['provider_credit_details'] - [array (array())] + * @optional requestParameters['seller_capture_note'] - [String] + * @optional requestParameters['soft_descriptor'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function capture($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'Capture'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_authorization_id' => 'AmazonAuthorizationId', + 'capture_amount' => 'CaptureAmount.Amount', + 'currency_code' => 'CaptureAmount.CurrencyCode', + 'capture_reference_id' => 'CaptureReferenceId', + 'provider_credit_details' => array(), + 'seller_capture_note' => 'SellerCaptureNote', + 'soft_descriptor' => 'SoftDescriptor', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * GetCaptureDetails API call - Returns the status of a particular capture and the total amount refunded on the capture. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752060 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_capture_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function getCaptureDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetCaptureDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_capture_id' => 'AmazonCaptureId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * Refund API call - Refunds a previously captured amount. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752080 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_capture_id'] - [String] + * @param requestParameters['refund_reference_id'] - [String] + * @param requestParameters['refund_amount'] - [String] + * @param requestParameters['currency_code'] - [String] + * + * @optional requestParameters['provider_credit_reversal_details'] - [array(array())] + * @optional requestParameters['seller_refund_note'] [String] + * @optional requestParameters['soft_descriptor'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function refund($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'Refund'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_capture_id' => 'AmazonCaptureId', + 'refund_reference_id' => 'RefundReferenceId', + 'refund_amount' => 'RefundAmount.Amount', + 'currency_code' => 'RefundAmount.CurrencyCode', + 'provider_credit_reversal_details' => array(), + 'seller_refund_note' => 'SellerRefundNote', + 'soft_descriptor' => 'SoftDescriptor', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * GetRefundDetails API call - Returns the status of a particular refund. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752100 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_refund_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function getRefundDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetRefundDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_refund_id' => 'AmazonRefundId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * GetServiceStatus API Call - Returns the operational status of the OffAmazonPayments API section. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201752110 + * + * The GetServiceStatus operation returns the operational status of the OffAmazonPayments API + * section of Amazon Marketplace Web Service (Amazon MWS). + * Status values are GREEN, GREEN_I, YELLOW, and RED. + * + * @param requestParameters['merchant_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function getServiceStatus($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetServiceStatus'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * CreateOrderReferenceForId API Call - Creates an order reference for the given object. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751670 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['id'] - [String] + * + * @optional requestParameters['inherit_shipping_address'] [Boolean] + * @optional requestParameters['confirm_now'] - [Boolean] + * @optional Amount (required when confirm_now is set to true) [String] + * @optional requestParameters['currency_code'] - [String] + * @optional requestParameters['seller_note'] - [String] + * @optional requestParameters['seller_order_id'] - [String] + * @optional requestParameters['store_name'] - [String] + * @optional requestParameters['custom_information'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function createOrderReferenceForId($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'CreateOrderReferenceForId'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'id' => 'Id', + 'id_type' => 'IdType', + 'inherit_shipping_address' => 'InheritShippingAddress', + 'confirm_now' => 'ConfirmNow', + 'amount' => 'OrderReferenceAttributes.OrderTotal.Amount', + 'currency_code' => 'OrderReferenceAttributes.OrderTotal.CurrencyCode', + 'platform_id' => 'OrderReferenceAttributes.PlatformId', + 'seller_note' => 'OrderReferenceAttributes.SellerNote', + 'seller_order_id' => 'OrderReferenceAttributes.SellerOrderAttributes.SellerOrderId', + 'store_name' => 'OrderReferenceAttributes.SellerOrderAttributes.StoreName', + 'custom_information' => 'OrderReferenceAttributes.SellerOrderAttributes.CustomInformation', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * GetBillingAgreementDetails API Call - Returns details about the Billing Agreement object and its current state. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751690 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_billing_agreement_id'] - [String] + * + * @optional requestParameters['address_consent_token'] - [String] + * @optional requestParameters['access_token'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + * + * You cannot pass both address_consent_token and access_token in + * the same call or you will encounter a 400/"AmbiguousToken" error + */ + public function getBillingAgreementDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetBillingAgreementDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_billing_agreement_id' => 'AmazonBillingAgreementId', + 'address_consent_token' => 'AddressConsentToken', + 'access_token' => 'AccessToken', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * SetBillingAgreementDetails API call - Sets Billing Agreement details such as a description of the agreement and other information about the seller. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751700 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_billing_agreement_id'] - [String] + * @param requestParameters['amount'] - [String] + * @param requestParameters['currency_code'] - [String] + * + * @optional requestParameters['platform_id'] - [String] + * @optional requestParameters['seller_note'] - [String] + * @optional requestParameters['seller_billing_agreement_id'] - [String] + * @optional requestParameters['store_name'] - [String] + * @optional requestParameters['custom_information'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function setBillingAgreementDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'SetBillingAgreementDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_billing_agreement_id' => 'AmazonBillingAgreementId', + 'platform_id' => 'BillingAgreementAttributes.PlatformId', + 'seller_note' => 'BillingAgreementAttributes.SellerNote', + 'seller_billing_agreement_id' => 'BillingAgreementAttributes.SellerBillingAgreementAttributes.SellerBillingAgreementId', + 'custom_information' => 'BillingAgreementAttributes.SellerBillingAgreementAttributes.CustomInformation', + 'store_name' => 'BillingAgreementAttributes.SellerBillingAgreementAttributes.StoreName', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * ConfirmBillingAgreement API Call - Confirms that the Billing Agreement is free of constraints and all required information has been set on the Billing Agreement. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751710 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_billing_agreement_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function confirmBillingAgreement($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'ConfirmBillingAgreement'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_billing_agreement_id' => 'AmazonBillingAgreementId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * ValidateBillignAgreement API Call - Validates the status of the Billing Agreement object and the payment method associated with it. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751720 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_billing_agreement_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function validateBillingAgreement($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'ValidateBillingAgreement'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_billing_agreement_id' => 'AmazonBillingAgreementId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * AuthorizeOnBillingAgreement API call - Reserves a specified amount against the payment method(s) stored in the Billing Agreement. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751940 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_billing_agreement_id'] - [String] + * @param requestParameters['authorization_reference_id'] [String] + * @param requestParameters['authorization_amount'] [String] + * @param requestParameters['currency_code'] - [String] + * + * @optional requestParameters['seller_authorization_note'] [String] + * @optional requestParameters['transaction_timeout'] - Defaults to 1440 minutes + * @optional requestParameters['capture_now'] [String] + * @optional requestParameters['soft_descriptor'] - - [String] + * @optional requestParameters['seller_note'] - [String] + * @optional requestParameters['platform_id'] - [String] + * @optional requestParameters['custom_information'] - [String] + * @optional requestParameters['seller_order_id'] - [String] + * @optional requestParameters['store_name'] - [String] + * @optional requestParameters['inherit_shipping_address'] [Boolean] - Defaults to true + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function authorizeOnBillingAgreement($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'AuthorizeOnBillingAgreement'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_billing_agreement_id' => 'AmazonBillingAgreementId', + 'authorization_reference_id' => 'AuthorizationReferenceId', + 'authorization_amount' => 'AuthorizationAmount.Amount', + 'currency_code' => 'AuthorizationAmount.CurrencyCode', + 'seller_authorization_note' => 'SellerAuthorizationNote', + 'transaction_timeout' => 'TransactionTimeout', + 'capture_now' => 'CaptureNow', + 'soft_descriptor' => 'SoftDescriptor', + 'seller_note' => 'SellerNote', + 'platform_id' => 'PlatformId', + 'custom_information' => 'SellerOrderAttributes.CustomInformation', + 'seller_order_id' => 'SellerOrderAttributes.SellerOrderId', + 'store_name' => 'SellerOrderAttributes.StoreName', + 'inherit_shipping_address' => 'InheritShippingAddress', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * CloseBillingAgreement API Call - Returns details about the Billing Agreement object and its current state. + * + * @see https://pay.amazon.com/developer/documentation/apireference/201751950 + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_billing_agreement_id'] - [String] + * + * @optional requestParameters['closure_reason'] [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function closeBillingAgreement($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'CloseBillingAgreement'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_billing_agreement_id' => 'AmazonBillingAgreementId', + 'closure_reason' => 'ClosureReason', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * Charge convenience method + * Performs the API calls + * 1. SetOrderReferenceDetails / SetBillingAgreementDetails + * 2. ConfirmOrderReference / ConfirmBillingAgreement + * 3. Authorize (with Capture) / AuthorizeOnBillingAgreeemnt (with Capture) + * + * @param requestParameters['merchant_id'] - [String] + * + * @param requestParameters['amazon_reference_id'] - [String] : Order Reference ID /Billing Agreement ID + * If requestParameters['amazon_reference_id'] is empty then the following is required, + * @param requestParameters['amazon_order_reference_id'] - [String] : Order Reference ID + * or, + * @param requestParameters['amazon_billing_agreement_id'] - [String] : Billing Agreement ID + * + * @param $requestParameters['charge_amount'] - [String] : Amount value to be captured + * @param requestParameters['currency_code'] - [String] : Currency Code for the Amount + * @param requestParameters['authorization_reference_id'] - [String]- Any unique string that needs to be passed + * + * @optional requestParameters['charge_note'] - [String] : Seller Note sent to the buyer + * @optional requestParameters['transaction_timeout'] - [String] : Defaults to 1440 minutes + * @optional requestParameters['charge_order_id'] - [String] : Custom Order ID provided + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function charge($requestParameters = array()) { + + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + $setParameters = $authorizeParameters = $confirmParameters = $requestParameters; + + if (!empty($requestParameters['amazon_order_reference_id'])) { + $chargeType = 'OrderReference'; + } + elseif (!empty($requestParameters['amazon_billing_agreement_id'])) { + $chargeType = 'BillingAgreement'; + + } + elseif (!empty($requestParameters['amazon_reference_id'])) { + switch (substr(strtoupper($requestParameters['amazon_reference_id']), 0, 1)) { + case 'P': + case 'S': + $chargeType = 'OrderReference'; + $setParameters['amazon_order_reference_id'] = $requestParameters['amazon_reference_id']; + $authorizeParameters['amazon_order_reference_id'] = $requestParameters['amazon_reference_id']; + $confirmParameters['amazon_order_reference_id'] = $requestParameters['amazon_reference_id']; + break; + + case 'B': + case 'C': + $chargeType = 'BillingAgreement'; + $setParameters['amazon_billing_agreement_id'] = $requestParameters['amazon_reference_id']; + $authorizeParameters['amazon_billing_agreement_id'] = $requestParameters['amazon_reference_id']; + $confirmParameters['amazon_billing_agreement_id'] = $requestParameters['amazon_reference_id']; + break; + + default: + throw new \Exception('Invalid Amazon Reference ID'); + } + } + else { + throw new \Exception('key amazon_order_reference_id or amazon_billing_agreement_id is null and is a required parameter'); + } + + // Set the other parameters if the values are present. + $setParameters['amount'] = !empty($requestParameters['charge_amount']) ? $requestParameters['charge_amount'] : ''; + $authorizeParameters['authorization_amount'] = !empty($requestParameters['charge_amount']) ? $requestParameters['charge_amount'] : ''; + + $setParameters['seller_note'] = !empty($requestParameters['charge_note']) ? $requestParameters['charge_note'] : ''; + $authorizeParameters['seller_authorization_note'] = !empty($requestParameters['charge_note']) ? $requestParameters['charge_note'] : ''; + $authorizeParameters['seller_note'] = !empty($requestParameters['charge_note']) ? $requestParameters['charge_note'] : ''; + + $setParameters['seller_order_id'] = !empty($requestParameters['charge_order_id']) ? $requestParameters['charge_order_id'] : ''; + $setParameters['seller_billing_agreement_id'] = !empty($requestParameters['charge_order_id']) ? $requestParameters['charge_order_id'] : ''; + $authorizeParameters['seller_order_id'] = !empty($requestParameters['charge_order_id']) ? $requestParameters['charge_order_id'] : ''; + + $authorizeParameters['capture_now'] = !empty($requestParameters['capture_now']) ? $requestParameters['capture_now'] : FALSE; + + $response = $this->makeChargeCalls($chargeType, $setParameters, $confirmParameters, $authorizeParameters); + return $response; + } + + /** + * MakeChargeCalls - makes API calls based off the charge type (OrderReference or BillingAgreement) + */ + protected function makeChargeCalls($chargeType, $setParameters, $confirmParameters, $authorizeParameters) { + switch ($chargeType) { + + case 'OrderReference': + + // Get the Order Reference details and feed the response object to the ResponseParser. + $responseObj = $this->getOrderReferenceDetails($setParameters); + + // Call the function getOrderReferenceDetailsStatus in ResponseParser.php providing it the XML response + // $oroStatus is an array containing the State of the Order Reference ID. + $oroStatus = $responseObj->getOrderReferenceDetailsStatus($responseObj->toXml()); + + if ($oroStatus['State'] === 'Draft') { + $response = $this->setOrderReferenceDetails($setParameters); + if ($this->success) { + $this->confirmOrderReference($confirmParameters); + } + } + + $responseObj = $this->getOrderReferenceDetails($setParameters); + + // Check the Order Reference Status again before making the Authorization. + $oroStatus = $responseObj->getOrderReferenceDetailsStatus($responseObj->toXml()); + + if ($oroStatus['State'] === 'Open') { + if ($this->success) { + $response = $this->authorize($authorizeParameters); + } + } + if (empty($response)) { + return NULL; + } + elseif ($oroStatus['State'] != 'Open' && $oroStatus['State'] != 'Draft') { + throw new \Exception('The Order Reference is in the ' . $oroStatus['State'] . " State. It should be in the Draft or Open State"); + } + + return $response; + + case 'BillingAgreement': + + // Get the Billing Agreement details and feed the response object to the ResponseParser. + $responseObj = $this->getBillingAgreementDetails($setParameters); + + // Call the function getBillingAgreementDetailsStatus in ResponseParser.php providing it the XML response + // $baStatus is an array containing the State of the Billing Agreement. + $baStatus = $responseObj->getBillingAgreementDetailsStatus($responseObj->toXml()); + + if ($baStatus['State'] === 'Draft') { + $response = $this->setBillingAgreementDetails($setParameters); + if ($this->success) { + $response = $this->confirmBillingAgreement($confirmParameters); + } + } + + // Check the Billing Agreement status again before making the Authorization. + $responseObj = $this->getBillingAgreementDetails($setParameters); + $baStatus = $responseObj->getBillingAgreementDetailsStatus($responseObj->toXml()); + + if ($this->success && $baStatus['State'] === 'Open') { + $response = $this->authorizeOnBillingAgreement($authorizeParameters); + } + + if (empty($response)) { + return NULL; + } + elseif ($baStatus['State'] != 'Open' && $baStatus['State'] != 'Draft') { + throw new \Exception('The Billing Agreement is in the ' . $baStatus['State'] . " State. It should be in the Draft or Open State"); + } + + return $response; + } + } + + /** + * GetProviderCreditDetails API Call - Get the details of the Provider Credit. + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_provider_credit_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function getProviderCreditDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetProviderCreditDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_provider_credit_id' => 'AmazonProviderCreditId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * GetProviderCreditReversalDetails API Call - Get details of the Provider Credit Reversal. + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_provider_credit_reversal_id'] - [String] + * + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function getProviderCreditReversalDetails($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'GetProviderCreditReversalDetails'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_provider_credit_reversal_id' => 'AmazonProviderCreditReversalId', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * ReverseProviderCredit API Call - Reverse the Provider Credit. + * + * @param requestParameters['merchant_id'] - [String] + * @param requestParameters['amazon_provider_credit_id'] - [String] + * + * @optional requestParameters['credit_reversal_reference_id'] - [String] + * @param requestParameters['credit_reversal_amount'] - [String] + * + * @optional requestParameters['currency_code'] - [String] + * @optional requestParameters['credit_reversal_note'] - [String] + * @optional requestParameters['mws_auth_token'] - [String] + */ + public function reverseProviderCredit($requestParameters = array()) { + $parameters = array(); + $parameters['Action'] = 'ReverseProviderCredit'; + $requestParameters = array_change_key_case($requestParameters, CASE_LOWER); + + $fieldMappings = array( + 'merchant_id' => 'SellerId', + 'amazon_provider_credit_id' => 'AmazonProviderCreditId', + 'credit_reversal_reference_id' => 'CreditReversalReferenceId', + 'credit_reversal_amount' => 'CreditReversalAmount.Amount', + 'currency_code' => 'CreditReversalAmount.CurrencyCode', + 'credit_reversal_note' => 'CreditReversalNote', + 'mws_auth_token' => 'MWSAuthToken', + ); + + $responseObject = $this->setParametersAndPost($parameters, $fieldMappings, $requestParameters); + + return ($responseObject); + } + + /** + * Create an Array of required parameters, sort them + * Calculate signature and invoke the POST to the MWS Service URL. + * + * @param AWSAccessKeyId [String] + * @param Version [String] + * @param SignatureMethod [String] + * @param Timestamp [String] + * @param Signature [String] + */ + private function calculateSignatureAndParametersToString($parameters = array()) { + foreach ($parameters as $key => $value) { + // Ensure that no unexpected type coercions have happened. + if ($key === 'CaptureNow' || $key === 'ConfirmNow' || $key === 'InheritShippingAddress') { + if (!is_bool($value)) { + throw new \Exception($key . ' value ' . $value . ' is of type ' . gettype($value) . ' and should be a boolean value'); + } + } + + // Ensure boolean values are outputed as 'true' or 'false'. + if (is_bool($value)) { + $parameters[$key] = json_encode($value); + } + } + + $parameters['AWSAccessKeyId'] = $this->config['access_key']; + $parameters['Version'] = self::MWS_VERSION; + $parameters['SignatureMethod'] = 'HmacSHA256'; + $parameters['SignatureVersion'] = 2; + $parameters['Timestamp'] = gmdate("Y-m-d\TH:i:s.\\0\\0\\0\\Z", time()); + uksort($parameters, 'strcmp'); + + $parameters['Signature'] = $this->signParameters($parameters); + $parameters = drupal_http_build_query($parameters); + + return $parameters; + } + + /** + * Computes RFC 2104-compliant HMAC signature for request parameters + * Implements AWS Signature, as per following spec:. + * + * If Signature Version is 0, it signs concatenated Action and Timestamp. + * + * If Signature Version is 1, it performs the following: + * + * Sorts all parameters (including SignatureVersion and excluding Signature, + * the value of which is being created), ignoring case. + * + * Iterate over the sorted list and append the parameter name (in original case) + * and then its value. It will not URL-encode the parameter values before + * constructing this string. There are no separators. + * + * If Signature Version is 2, string to sign is based on following: + * + * 1. The HTTP Request Method followed by an ASCII newline (%0A) + * 2. The HTTP Host header in the form of lowercase host, followed by an ASCII newline. + * 3. The URL encoded HTTP absolute path component of the URI + * (up to but not including the query string parameters); + * if this is empty use a forward '/'. This parameter is followed by an ASCII newline. + * 4. The concatenation of all query string components (names and values) + * as UTF-8 characters which are URL encoded as per RFC 3986 + * (hex characters MUST be uppercase), sorted using lexicographic byte ordering. + * Parameter names are separated from their values by the '=' character + * (ASCII character 61), even if the value is empty. + * Pairs of parameter and values are separated by the '&' character (ASCII code 38). + */ + private function signParameters(array $parameters) { + $signatureVersion = $parameters['SignatureVersion']; + $stringToSign = NULL; + if (2 === $signatureVersion) { + $algorithm = "HmacSHA256"; + $parameters['SignatureMethod'] = $algorithm; + $stringToSign = $this->calculateStringToSignV2($parameters); + } + else { + throw new \Exception("Invalid Signature Version specified"); + } + + return $this->sign($stringToSign, $algorithm); + } + + /** + * Calculate String to Sign for SignatureVersion 2. + * + * @param array $parameters + * request parameters. + * + * @return String to Sign + */ + protected function calculateStringToSignV2(array $parameters) { + $data = 'POST'; + $data .= "\n"; + $data .= $this->mwsEndpointUrl; + $data .= "\n"; + $data .= $this->mwsEndpointPath; + $data .= "\n"; + $data .= drupal_http_build_query($parameters); + return $data; + } + + /** + * Computes RFC 2104-compliant HMAC signature. + * + * @param $data + * @param $algorithm + * + * @return string + * + * @throws \Exception + */ + protected function sign($data, $algorithm) { + if ($algorithm === 'HmacSHA1') { + $hash = 'sha1'; + } + else { + if ($algorithm === 'HmacSHA256') { + $hash = 'sha256'; + } + else { + throw new \Exception("Non-supported signing method specified"); + } + } + + return base64_encode(hash_hmac($hash, $data, $this->config['secret_key'], TRUE)); + } + + /** + * InvokePost takes the parameters and invokes the httpPost function to POST the parameters + * Exponential retries on error 500 and 503 + * The response from the POST is an XML which is converted to Array. + */ + protected function invokePost($parameters) { + $this->success = FALSE; + + // Submit the request and read response body. + try { + $retries = 0; + do { + try { + $this->constructUserAgentHeader(); + $httpCurlRequest = new AmazonPayHttpCurl($this->config); + $response = $httpCurlRequest->httpPost($this->mwsServiceUrl, $this->userAgent, $parameters); + $curlResponseInfo = $httpCurlRequest->getCurlResponseInfo(); + $statusCode = $curlResponseInfo["http_code"]; + $this->logMessage($this->userAgent); + $response = array( + 'Status' => $statusCode, + 'ResponseBody' => $response, + ); + + $statusCode = $response['Status']; + if ($statusCode == 200) { + $shouldRetry = FALSE; + $this->success = TRUE; + } + elseif ($statusCode == 500 || $statusCode == 503) { + + $shouldRetry = TRUE; + if ($shouldRetry && strtolower($this->config['handle_throttle'])) { + $this->pauseOnRetry(++$retries, $statusCode); + } + } + else { + $shouldRetry = FALSE; + } + } + catch (\Exception $e) { + throw $e; + } + } while ($shouldRetry); + } + catch (\Exception $se) { + throw $se; + } + + return $response; + } + + /** + * Exponential sleep on failed request + * Up to three retries will occur if first reqest fails + * after 1.0 second, 2.2 seconds, and finally 7.0 seconds. + * + * @param int $retries + * + * @throws Exception if maximum number of retries has been reached + */ + protected function pauseOnRetry($retries, $status) { + if ($retries <= self::MAX_ERROR_RETRY) { + // PHP delays are in microseconds (1 million microsecond = 1 sec) + // 1st delay is (4^1) * 100000 + 600000 = 0.4 + 0.6 second = 1.0 sec + // 2nd delay is (4^2) * 100000 + 600000 = 1.6 + 0.6 second = 2.2 sec + // 3rd delay is (4^3) * 100000 + 600000 = 6.4 + 0.6 second = 7.0 sec. + $delay = (int) (pow(4, $retries) * 100000) + 600000; + usleep($delay); + } + else { + throw new \Exception('Error Code: ' . $status . PHP_EOL . 'Maximum number of retry attempts - ' . $retries . ' reached'); + } + } + + /** + * Create the User Agent Header sent with the POST request. + */ + protected function constructUserAgentHeader() { + $this->userAgent = 'drupalcommerce-sdk/1.0 ('; + if (($this->config['application_name']) || ($this->config['application_version'])) { + if ($this->config['application_name']) { + $quoted_application_name = preg_replace('/ {2,}|\s/', ' ', $this->config['application_name']); + $quoted_application_name = preg_replace('/\\\\/', '\\\\\\\\', $quoted_application_name); + $quoted_application_name = preg_replace('/\//', '\\/', $quoted_application_name); + $this->userAgent .= $quoted_application_name; + if ($this->config['application_version']) { + $this->userAgent .= '/'; + } + } + + if ($this->config['application_version']) { + $quoted_user_agent_string = preg_replace('/ {2,}|\s/', ' ', $this->config['application_version']); + $quoted_user_agent_string = preg_replace('/\\\\/', '\\\\\\\\', $quoted_user_agent_string); + $quoted_user_agent_string = preg_replace('/\\(/', '\\(', $quoted_user_agent_string); + $this->userAgent .= $quoted_user_agent_string; + } + $this->userAgent .= '; '; + } + $this->userAgent .= 'PHP/' . phpversion() . '; '; + $this->userAgent .= php_uname('s') . '/' . php_uname('m') . '/' . php_uname('r'); + $this->userAgent .= ')'; + } + + /** + * Computes RFC 2104-compliant HMAC signature. + * + * @param $stringToSign + * @param $secretKey + * + * @return string + */ + public static function getSignature($stringToSign, $secretKey) { + return base64_encode(hash_hmac('sha256', $stringToSign, $secretKey, TRUE)); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayHttpCurl.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayHttpCurl.php new file mode 100755 index 00000000..b587c2e3 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayHttpCurl.php @@ -0,0 +1,139 @@ +config = $config; + } + + /** + * Setter for boolean header to get the user info . + */ + public function setHttpHeader() { + $this->header = TRUE; + } + + /** + * Setter for Access token to get the user info . + */ + public function setAccessToken($accesstoken) { + $this->accessToken = $accesstoken; + } + + /** + * Add the common Curl Parameters to the curl handler. + + * Also checks for optional parameters if provided in the config + * config['cabundle_file'] + * config['proxy_port'] + * config['proxy_host'] + * config['proxy_username'] + * config['proxy_password']. + */ + protected function commonCurlParams($url, $userAgent) { + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_PORT, 443); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE); + + if (!is_null($this->config['cabundle_file'])) { + curl_setopt($ch, CURLOPT_CAINFO, $this->config['cabundle_file']); + } + + if (!empty($userAgent)) { + curl_setopt($ch, CURLOPT_USERAGENT, $userAgent); + } + + if ($this->config['proxy_host'] != NULL && $this->config['proxy_port'] != -1) { + curl_setopt($ch, CURLOPT_PROXY, $this->config['proxy_host'] . ':' . $this->config['proxy_port']); + } + + if ($this->config['proxy_username'] != NULL && $this->config['proxy_password'] != NULL) { + curl_setopt($ch, CURLOPT_PROXYUSERPWD, $this->config['proxy_username'] . ':' . $this->config['proxy_password']); + } + + return $ch; + } + + /** + * Performs an HTTP POST request. + */ + public function httpPost($url, $userAgent = NULL, $parameters = NULL) { + $ch = $this->commonCurlParams($url, $userAgent); + + curl_setopt($ch, CURLOPT_POST, TRUE); + curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters); + curl_setopt($ch, CURLOPT_HEADER, FALSE); + + $response = $this->execute($ch); + return $response; + } + + /** + * Performs an HTTP GET request. + */ + public function httpGet($url, $userAgent = NULL) { + $ch = $this->commonCurlParams($url, $userAgent); + + // Setting the HTTP header with the Access Token only for Getting user info. + if ($this->header) { + $this->headerArray[] = 'Authorization: bearer ' . $this->accessToken; + } + + $response = $this->execute($ch); + return $response; + } + + /** + * Execute Curl request. + */ + private function execute($ch) { + // Ensure we never send the "Expect: 100-continue" header. + $this->headerArray[] = 'Expect:'; + curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headerArray); + + $response = curl_exec($ch); + if ($response === FALSE) { + $error_msg = "Unable to post request, underlying exception of " . curl_error($ch); + curl_close($ch); + throw new \Exception($error_msg); + } + else { + $this->curlResponseInfo = curl_getinfo($ch); + } + curl_close($ch); + return $response; + } + + /** + * Get the output of Curl Getinfo . + */ + public function getCurlResponseInfo() { + return $this->curlResponseInfo; + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayIpnHandler.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayIpnHandler.php new file mode 100644 index 00000000..a5532406 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayIpnHandler.php @@ -0,0 +1,437 @@ + NULL, + 'proxy_host' => NULL, + 'proxy_port' => -1, + 'proxy_username' => NULL, + 'proxy_password' => NULL, + ); + + /** + * Constructs a new AmazonPayIpnHandler object. + */ + public function __construct($headers, $body, $ipnConfig = NULL) { + $this->headers = array_change_key_case($headers, CASE_LOWER); + $this->body = $body; + + if ($ipnConfig != NULL) { + $this->checkConfigKeys($ipnConfig); + } + + // Get the list of fields that we are interested in. + $this->fields = array( + "Timestamp" => TRUE, + "Message" => TRUE, + "MessageId" => TRUE, + "Subject" => FALSE, + "TopicArn" => TRUE, + "Type" => TRUE, + ); + $this->validateHeaders(); + $this->getMessage(); + $this->checkForCorrectMessageType(); + $this->constructAndVerifySignature(); + } + + /** + * Checks config key integrity. + */ + protected function checkConfigKeys($ipnConfig) { + $ipnConfig = array_change_key_case($ipnConfig, CASE_LOWER); + $ipnConfig = $this->trimArray($ipnConfig); + + foreach ($ipnConfig as $key => $value) { + if (array_key_exists($key, $this->ipnConfig)) { + $this->ipnConfig[$key] = $value; + } + else { + throw new \Exception('Key ' . $key . ' is either not part of the configuration or has incorrect Key name. + check the ipnConfig array key names to match your key names of your config array ', 1); + } + } + } + + /** + * Helper function to log data within the Client. + */ + protected function logMessage($message) { + commerce_amazon_lpa_add_debug_log($message, array(), WATCHDOG_INFO); + } + + /** + * Sets the value for the key if the key exists in ipnConfig. + */ + public function __set($name, $value) { + if (array_key_exists(strtolower($name), $this->ipnConfig)) { + $this->ipnConfig[$name] = $value; + } + else { + throw new \Exception("Key " . $name . " is not part of the configuration", 1); + } + } + + /** + * Gets IPN config values. + */ + public function __get($name) { + if (array_key_exists(strtolower($name), $this->ipnConfig)) { + return $this->ipnConfig[$name]; + } + else { + throw new \Exception("Key " . $name . " was not found in the configuration", 1); + } + } + + /** + * Trim the input Array key values . + */ + private function trimArray($array) { + foreach ($array as $key => $value) { + $array[$key] = trim($value); + } + return $array; + } + + /** + * Validates incoming IPN headers. + */ + protected function validateHeaders() { + // Quickly check that this is a sns message. + if (!array_key_exists('x-amz-sns-message-type', $this->headers)) { + throw new \Exception("Error with message - header " . "does not contain x-amz-sns-message-type header"); + } + + if ($this->headers['x-amz-sns-message-type'] !== 'Notification') { + throw new \Exception("Error with message - header x-amz-sns-message-type is not " . "Notification, is " . $this->headers['x-amz-sns-message-type']); + } + } + + /** + * Gets the message. + */ + protected function getMessage() { + $this->snsMessage = json_decode($this->body, TRUE); + + $json_error = json_last_error(); + + if ($json_error != 0) { + $errorMsg = "Error with message - content is not in json format" . $this->getErrorMessageForJsonError($json_error) . " " . $this->snsMessage; + throw new \Exception($errorMsg); + } + } + + /** + * Convert a json error code to a descriptive error message. + * + * @param int $json_error + * The message code. + * + * @return string + * The error message. + */ + private function getErrorMessageForJsonError($json_error) { + switch ($json_error) { + case JSON_ERROR_DEPTH: + return " - maximum stack depth exceeded."; + + case JSON_ERROR_STATE_MISMATCH: + return " - invalid or malformed JSON."; + + case JSON_ERROR_CTRL_CHAR: + return " - control character error."; + + case JSON_ERROR_SYNTAX: + return " - syntax error."; + + default: + return "."; + } + } + + /** + * CheckForCorrectMessageType() + * + * Checks if the Field [Type] is set to ['Notification'] + * Gets the value for the fields marked true in the fields array + * Constructs the signature string. + */ + private function checkForCorrectMessageType() { + $type = $this->getMandatoryField("Type"); + if (strcasecmp($type, "Notification") != 0) { + throw new \Exception("Error with SNS Notification - unexpected message with Type of " . $type); + } + + if (strcmp($this->getMandatoryField("Type"), "Notification") != 0) { + throw new \Exception("Error with signature verification - unable to verify " . $this->getMandatoryField("Type") . " message"); + } + else { + + // Sort the fields into byte order based on the key name(A-Za-z) + ksort($this->fields); + + // Extract the key value pairs and sort in byte order. + $signatureFields = array(); + foreach ($this->fields as $fieldName => $mandatoryField) { + if ($mandatoryField) { + $value = $this->getMandatoryField($fieldName); + } + else { + $value = $this->getField($fieldName); + } + + if (!is_null($value)) { + array_push($signatureFields, $fieldName); + array_push($signatureFields, $value); + } + } + + /* Create the signature string - key / value in byte order + * delimited by newline character + ending with a new line character + */ + $this->signatureFields = implode("\n", $signatureFields) . "\n"; + } + } + + /** + * Ensures that the URL of the certificate is one belonging to AWS. + * + * @param string $url + * Certificate URL. + * + * @throws \Exception + */ + protected function validateUrl($url) { + $parsed = parse_url($url); + if (empty($parsed['scheme']) + || empty($parsed['host']) + || $parsed['scheme'] !== 'https' + || substr($url, -4) !== '.pem' + || !preg_match($this->defaultHostPattern, $parsed['host']) + ) { + throw new \Exception( + 'The certificate is located on an invalid domain.' + ); + } + } + + /** + * Verify that the signature is correct. + * + * @throws Exception + */ + private function constructAndVerifySignature() { + $signature = base64_decode($this->getMandatoryField("Signature")); + $certificatePath = $this->getMandatoryField("SigningCertURL"); + $this->validateUrl($certificatePath); + $this->certificate = $this->getCertificate($certificatePath); + + $result = $this->verifySignatureIsCorrectFromCertificate($signature); + if (!$result) { + throw new \Exception("Unable to match signature from remote server: signature of " . $this->getCertificate($certificatePath) . " , SigningCertURL of " . $this->getMandatoryField("SigningCertURL") . " , SignatureOf " . $this->getMandatoryField("Signature")); + } + } + + /** + * Gets the certificate from the $certificatePath using Curl. + * + * @return mixed + * The response. + */ + private function getCertificate($certificatePath) { + $httpCurlRequest = new AmazonPayHttpCurl($this->ipnConfig); + $response = $httpCurlRequest->httpGet($certificatePath); + return $response; + } + + /** + * Verify that the signature is correct for the given data and public key. + * + * @param string $signature + * The decoded signature to compare against. + */ + public function verifySignatureIsCorrectFromCertificate($signature) { + $certKey = openssl_get_publickey($this->certificate); + + if ($certKey === FALSE) { + throw new \Exception("Unable to extract public key from cert"); + } + + try { + $certInfo = openssl_x509_parse($this->certificate, TRUE); + $certSubject = $certInfo["subject"]; + + if (is_null($certSubject)) { + throw new \Exception("Error with certificate - subject cannot be found"); + } + } + catch (\Exception $ex) { + throw new \Exception("Unable to verify certificate - error with the certificate subject", NULL, $ex); + } + + if (strcmp($certSubject["CN"], $this->expectedCnName)) { + throw new \Exception("Unable to verify certificate issued by Amazon - error with certificate subject"); + } + + $result = -1; + try { + $result = openssl_verify($this->signatureFields, $signature, $certKey, OPENSSL_ALGO_SHA1); + } + catch (\Exception $ex) { + throw new \Exception("Unable to verify signature - error with the verification algorithm", NULL, $ex); + } + + return ($result > 0); + } + + /** + * Extract the mandatory field from the message and return the contents. + * + * @param string $fieldName + * Name of the field to extract. + * + * @return string + * The field contents if found. + * + * @throws \Exception + */ + protected function getMandatoryField($fieldName) { + $value = $this->getField($fieldName); + if (is_null($value)) { + throw new \Exception("Error with json message - mandatory field " . $fieldName . " cannot be found"); + } + return $value; + } + + /** + * Extract the field if present, return null if not defined. + * + * @param string $fieldName + * Name of the field to extract. + * + * @return string + * The field contents if found, NULL otherwise. + */ + protected function getField($fieldName) { + if (array_key_exists($fieldName, $this->snsMessage)) { + return $this->snsMessage[$fieldName]; + } + else { + return NULL; + } + } + + /** + * JSON decode the raw [Message] portion of the IPN . + */ + public function returnMessage() { + return json_decode($this->snsMessage['Message'], TRUE); + } + + /** + * Converts IPN [Message] field to JSON. + * + * Has child elements + * ['NotificationData'] [XML] - API call XML notification data. + * + * @return string + * The response in JSON format. + */ + public function toJson() { + $response = $this->simpleXmlObject(); + + // Merging the remaining fields with the response. + $remainingFields = $this->getRemainingIpnFields(); + $responseArray = array_merge($remainingFields, (array) $response); + + // Converting to JSON format. + $response = json_encode($responseArray); + + return $response; + } + + /** + * Converts IPN [Message] field to associative array. + * + * @return array + * The response in array format + */ + public function toArray() { + $response = $this->simpleXmlObject(); + + // Converting the SimpleXMLElement Object to array() + $response = json_encode($response); + $response = json_decode($response, TRUE); + + // Merging the remaining fields with the response array. + $remainingFields = $this->getRemainingIpnFields(); + $response = array_merge($remainingFields, $response); + + return $response; + } + + /** + * Add remaining fields to the datatype. + * + * Has child elements + * ['NotificationData'] [XML] - API call XML response data + * Convert to SimpleXML element object + * Type - Notification + * MessageId - ID of the Notification + * Topic ARN - Topic of the IPN. + * + * @return array + * The response in array format. + */ + private function simpleXmlObject() { + $ipnMessage = $this->returnMessage(); + $response = simplexml_load_string((string) $ipnMessage['NotificationData']); + $response->addChild('Type', $this->snsMessage['Type']); + $response->addChild('MessageId', $this->snsMessage['MessageId']); + $response->addChild('TopicArn', $this->snsMessage['TopicArn']); + return $response; + } + + /** + * Gets the remaining fields of the IPN. + */ + private function getRemainingIpnFields() { + $ipnMessage = $this->returnMessage(); + + $remainingFields = array( + 'NotificationReferenceId' => $ipnMessage['NotificationReferenceId'], + 'NotificationType' => $ipnMessage['NotificationType'], + 'SellerId' => $ipnMessage['SellerId'], + 'ReleaseEnvironment' => $ipnMessage['ReleaseEnvironment'], + ); + + return $remainingFields; + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayResponse.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayResponse.php new file mode 100644 index 00000000..01d4663e --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/AmazonPayResponse.php @@ -0,0 +1,108 @@ +response = $response; + } + + /** + * Returns the XML portion of the response. + */ + public function toXml() { + return $this->response['ResponseBody']; + } + + /** + * Converts XML into JSON. + * + * @return string + * The response as JSON. + */ + public function toJson() { + $response = $this->simpleXmlObject(); + return drupal_json_encode($response); + } + + /** + * Converts XML into associative array. + * + * @return array + * The response as an array. + */ + public function toArray() { + $response = $this->simpleXmlObject(); + + // Converting the SimpleXMLElement Object to array() + $response = drupal_json_encode($response); + + return drupal_json_decode($response); + } + + /** + * Turns the response into an XML object. + */ + protected function simpleXmlObject() { + $response = $this->response; + + // Getting the HttpResponse Status code to the output as a string. + $status = strval($response['Status']); + + // Getting the Simple XML element object of the XML Response Body. + $response = simplexml_load_string((string) $response['ResponseBody']); + + // Adding the HttpResponse Status code to the output as a string. + $response->addChild('ResponseStatus', $status); + + return $response; + } + + /** + * Get the status of the Order Reference ID. + */ + public function getOrderReferenceDetailsStatus($response) { + $oroStatus = $this->getStatus('GetORO', '//GetORO:OrderReferenceStatus', $response); + + return $oroStatus; + } + + /** + * Get the status of the BillingAgreement. + */ + public function getBillingAgreementDetailsStatus($response) { + $baStatus = $this->getStatus('GetBA', '//GetBA:BillingAgreementStatus', $response); + + return $baStatus; + } + + /** + * Gets the request status. + */ + protected function getStatus($type, $path, $response) { + $data = new \SimpleXMLElement($response); + $namespaces = $data->getNamespaces(TRUE); + foreach ($namespaces as $key => $value) { + $namespace = $value; + } + $data->registerXPathNamespace($type, $namespace); + foreach ($data->xpath($path) as $value) { + $status = json_decode(json_encode((array) $value), TRUE); + } + + return $status; + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.admin.inc b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.admin.inc new file mode 100644 index 00000000..202e5532 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.admin.inc @@ -0,0 +1,1021 @@ + l(t('Currency settings page'), 'admin/commerce/config/currency'))); + $help_items[] = t('EUR for the German account.'); + $help_items[] = t('GBP for the UK account.'); + $help_items[] = t('USD for the United States account.'); + $content .= theme('item_list', array('items' => $help_items)); + $form['content']['#markup'] = $content; + return $form; + } + + $form['commerce_amazon_lpa_account_configuration'] = array( + '#type' => 'fieldset', + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#title' => t('Account configuration'), + ); + + // Checkout by Amazon settings form. + $form['commerce_amazon_lpa_account_configuration']['commerce_amazon_lpa_merchant_id'] = array( + '#type' => 'textfield', + '#title' => t('Merchant ID'), + '#default_value' => variable_get('commerce_amazon_lpa_merchant_id', ''), + '#required' => TRUE, + ); + $form['commerce_amazon_lpa_account_configuration']['commerce_amazon_lpa_access_key'] = array( + '#type' => 'textfield', + '#title' => t('MWS Access key'), + '#default_value' => variable_get('commerce_amazon_lpa_access_key', ''), + '#required' => TRUE, + ); + $form['commerce_amazon_lpa_account_configuration']['commerce_amazon_lpa_secret_key'] = array( + '#type' => 'password', + '#title' => t('MWS Secret key'), + '#default_value' => variable_get('commerce_amazon_lpa_secret_key', ''), + '#required' => (variable_get('commerce_amazon_lpa_secret_key') === NULL), + '#description' => variable_get('commerce_amazon_lpa_secret_key') ? t('Secret key has been set. Leave blank unless you want to change the saved key.') : NULL, + ); + $form['commerce_amazon_lpa_account_configuration']['commerce_amazon_lpa_region'] = array( + '#type' => 'radios', + '#title' => t('Region'), + '#options' => array( + 'DE' => t('Germany'), + 'UK' => t('United Kingdom'), + 'US' => t('United States'), + ), + '#default_value' => variable_get('commerce_amazon_lpa_region', 'US'), + '#required' => TRUE, + ); + $form['commerce_amazon_lpa_account_configuration']['commerce_amazon_lpa_client_id'] = array( + '#type' => 'textfield', + '#title' => t('LWA Client ID'), + '#default_value' => variable_get('commerce_amazon_lpa_client_id', ''), + '#required' => TRUE, + ); + + $form['commerce_amazon_lpa_general_settings'] = array( + '#type' => 'fieldset', + '#title' => t('General settings'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['commerce_amazon_lpa_general_settings']['commerce_amazon_lpa_operation_mode'] = array( + '#type' => 'radios', + '#title' => t('Operation mode'), + '#description' => t('Provide Amazon Pay and Login with Amazon or just Amazon Pay. Using Login with Amazon links Drupal user accounts with the Amazon account'), + '#options' => array( + AmazonLPA::OPERATION_MODE_LOGIN_AND_PAY => t('Amazon Pay and Login with Amazon'), + AmazonLPA::OPERATION_MODE_PAY_ONLY => t('Amazon Pay only'), + ), + '#default_value' => variable_get('commerce_amazon_lpa_operation_mode', 'login_pay'), + ); + $form['commerce_amazon_lpa_general_settings']['commerce_amazon_lpa_environment'] = array( + '#type' => 'radios', + '#title' => t('Environment'), + '#options' => array(AmazonLPA::ENV_SANDBOX => t('Sandbox'), AmazonLPA::ENV_LIVE => t('Live')), + '#default_value' => variable_get('commerce_amazon_lpa_environment', AmazonLPA::ENV_SANDBOX), + ); + $form['commerce_amazon_lpa_general_settings']['commerce_amazon_lpa_hidden_mode'] = array( + '#type' => 'radios', + '#title' => t('Hidden button mode'), + '#description' => t('This allows you to keep the integration active, but only available to select roles.'), + '#options' => array('' => 'Disabled') + user_roles(TRUE), + '#default_value' => variable_get('commerce_amazon_lpa_hidden_mode', ''), + ); + $form['commerce_amazon_lpa_general_settings']['commerce_amazon_lpa_langcode'] = array( + '#type' => 'radios', + '#title' => t('Checkout language'), + '#options' => array( + 'en-US' => t('US English'), + 'en-GB' => t('UK English'), + 'de-DE' => t('German'), + 'fr-FR' => t('French'), + 'it-IT' => t('Italian'), + 'es-ES' => t('Spanish (Spain)'), + ), + '#default_value' => variable_get('commerce_amazon_lpa_langcode', AmazonLPA::get_region_langcode(variable_get('commerce_amazon_lpa_region', ''))), + ); + + $form['commerce_amazon_lpa_checkout_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Checkout settings'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['commerce_amazon_lpa_checkout_settings']['commerce_amazon_lpa_checkout_strategy'] = array( + '#type' => 'radios', + '#title' => t('Checkout strategy'), + '#description' => t('If the user has logged in using Login with Amazon, which checkout options are available?'), + '#options' => array( + AmazonLPA::STRATEGY_AMAZON => t('Only Amazon checkout'), + AmazonLPA::STRATEGY_NORMAL => t('Normal checkout and Amazon checkout'), + ), + '#default_value' => variable_get('commerce_amazon_lpa_checkout_strategy', AmazonLPA::STRATEGY_NORMAL), + ); + $form['commerce_amazon_lpa_checkout_settings']['commerce_amazon_lpa_popup'] = array( + '#type' => 'radios', + '#title' => t('Use a redirect or popup for login'), + '#description' => t("Integration can either use a pop up or redirect experience. You must add the following as Allowed Return URLs in your Login with Amazon application in Seller Central:
- !redirect1
- !redirect2
' . url('checkout/amazon', array('absolute' => TRUE)) . '',
+ '!redirect2' => '' . url('user/login/amazon', array('absolute' => TRUE, 'query' => array('amzn' => 'LwA'))) . '',
+ )),
+ '#options' => array(
+ 'popup' => t('Popup'),
+ 'redirect' => t('Redirect'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_popup', 'popup'),
+ );
+
+ $form['commerce_amazon_lpa_payment_settings'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Payment settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['commerce_amazon_lpa_payment_settings']['commerce_amazon_lpa_authorization_mode'] = array(
+ '#type' => 'select',
+ '#title' => t('Authorization mode'),
+ '#options' => array(
+ AmazonLPA::AUTH_SYNC => t('Automatic synchronous authorization in frontend'),
+ AmazonLPA::AUTH_NONSYNC => t('Automatic non-synchronous after order is placed'),
+ AmazonLPA::AUTH_MANUAL => t('Manual non-synchronous authorization through order management.'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_authorization_mode', 'automatic_nonsync'),
+ );
+ $form['commerce_amazon_lpa_payment_settings']['commerce_amazon_lpa_capture_mode'] = array(
+ '#type' => 'select',
+ '#title' => t('Capture mode'),
+ '#options' => array(
+ AmazonLPA::CAPTURE_AUTH_CAPTURE => t('Immediate capture on successful authorization'),
+ AmazonLPA::CAPTURE_SHIPMENT_CAPTURE => t('Capture on shipment'),
+ AmazonLPA::CAPTURE_MANUAL_CAPTURE => t('Manual capture through order management'),
+ ),
+ '#default_value' => AmazonLPA::get_capture_mode(),
+ '#description' => t('Whitelisting with Amazon Pay is required for "Immediate capture on successful authorization"'),
+ );
+ $form['commerce_amazon_lpa_payment_settings']['commerce_amazon_lpa_capture_auth_statement'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Authorization statement'),
+ '#default_value' => variable_get('commerce_amazon_lpa_capture_auth_statement', ''),
+ '#description' => t('This will appear at the bottom of your Amazon order notifications.'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="commerce_amazon_lpa_capture_mode"]' => array('value' => AmazonLPA::CAPTURE_AUTH_CAPTURE),
+ ),
+ ),
+ );
+
+ switch (variable_get('commerce_amazon_lpa_region')) {
+ case 'UK':
+ $ipn_link = 'https://sellercentral.amazon.co.uk/gp/pyop/seller/account/settings/user-settings-view.html';
+ break;
+
+ case 'DE':
+ $ipn_link = 'https://sellercentral.amazon.de/gp/pyop/seller/account/settings/user-settings-view.html';
+ break;
+
+ case 'US':
+ default:
+ $ipn_link = 'https://sellercentral.amazon.com/gp/pyop/seller/account/settings/user-settings-view.html';
+ break;
+ }
+ $form['commerce_amazon_lpa_payment_settings']['commerce_amazon_lpa_payment_sync'] = array(
+ '#type' => 'radios',
+ '#title' => t('Method for synchronizing payment transactions'),
+ '#description' => t("You may !ipn-link or use Drupal's cron to update payment transactions. Your Merchant URL for the IPN is !ipn-destination. Note, if you use the IPN Amazon must be able to resolve your domain name.
", array( + '!ipn-destination' => '' . url('commerce-amazon-lpa/ipn', array('absolute' => TRUE)) . '',
+ '!ipn-link' => l(t('enable Instant Payment Notifications (IPN)'), $ipn_link),
+ )),
+ '#options' => array(
+ 'ipn' => t('IPN'),
+ 'cron' => t('Cron'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_payment_sync', 'ipn'),
+ );
+ $order_statuses = array();
+ foreach (commerce_order_statuses() as $status => $data) {
+ $order_statuses[$status] = $data['title'];
+ }
+ $form['commerce_amazon_lpa_payment_settings']['commerce_amazon_lpa_auth_order_status'] = array(
+ '#type' => 'select',
+ '#title' => t('Order status on successful authorization'),
+ '#description' => t('Orders with a successful authorization will be in this status.'),
+ '#options' => $order_statuses,
+ '#default_value' => variable_get('commerce_amazon_lpa_auth_order_status', 'pending'),
+ );
+ $form['commerce_amazon_lpa_payment_settings']['commerce_amazon_lpa_shipped_order_status'] = array(
+ '#type' => 'select',
+ '#title' => t('Order status on successful shipping'),
+ '#description' => t('If using the Capture on shipment capture mode, this status will trigger payment capture.'),
+ '#options' => $order_statuses,
+ '#default_value' => variable_get('commerce_amazon_lpa_shipped_order_status', 'completed'),
+ );
+
+ $form['commerce_amazon_lpa_appearance_settings'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Appearance settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_pay_button_size'] = array(
+ '#type' => 'select',
+ '#title' => t('Pay button size'),
+ '#options' => array(
+ AmazonLPA::BUTTON_SIZE_SMALL => t('Small'),
+ AmazonLPA::BUTTON_SIZE_MEDIUM => t('Medium'),
+ AmazonLPA::BUTTON_SIZE_LARGE => t('Large'),
+ AmazonLPA::BUTTON_SIZE_X_LARGE => t('Extra large'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_pay_button_size', AmazonLPA::BUTTON_SIZE_MEDIUM),
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_pay_button_style'] = array(
+ '#type' => 'select',
+ '#title' => t('Pay button style'),
+ '#options' => array(
+ AmazonLPA::BUTTON_COLOR_GOLD => t('Gold'),
+ AmazonLPA::BUTTON_COLOR_LIGHT_GRAY => t('Light gray'),
+ AmazonLPA::BUTTON_COLOR_DARK_GRAY => t('Dark gray'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_pay_button_style', AmazonLPA::BUTTON_COLOR_GOLD),
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_login_button_size'] = array(
+ '#type' => 'select',
+ '#title' => t('Login button size'),
+ '#options' => array(
+ AmazonLPA::BUTTON_SIZE_SMALL => t('Small'),
+ AmazonLPA::BUTTON_SIZE_MEDIUM => t('Medium'),
+ AmazonLPA::BUTTON_SIZE_LARGE => t('Large'),
+ AmazonLPA::BUTTON_SIZE_X_LARGE => t('Extra large'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_login_button_size', AmazonLPA::BUTTON_SIZE_MEDIUM),
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_login_button_style'] = array(
+ '#type' => 'select',
+ '#title' => t('Login button style'),
+ '#options' => array(
+ AmazonLPA::BUTTON_COLOR_GOLD => t('Gold'),
+ AmazonLPA::BUTTON_COLOR_LIGHT_GRAY => t('Light gray'),
+ AmazonLPA::BUTTON_COLOR_DARK_GRAY => t('Dark gray'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_login_button_style', AmazonLPA::BUTTON_COLOR_GOLD),
+ );
+
+ $addressbook_size = explode('x', variable_get('commerce_amazon_lpa_addressbook_size')) + array('0', '250');
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_addressbook_size'] = array(
+ '#type' => 'item',
+ '#title' => t('Addressbook widget default size'),
+ '#element_validate' => array('_commerce_amazon_lpa_widget_size_validate'),
+ '#subelement_prefix' => 'addressbook_',
+ '#field_prefix' => '',
+ '#description' => t('Set the width to 0 for full width'),
+ '#field_suffix' => '
',
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_addressbook_size']['addressbook_x'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Width'),
+ '#title_display' => 'invisible',
+ '#default_value' => $addressbook_size[0] ? $addressbook_size[0] : 0,
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#field_suffix' => ' x ',
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_addressbook_size']['addressbook_y'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Height'),
+ '#title_display' => 'invisible',
+ '#default_value' => $addressbook_size[1],
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#field_suffix' => ' ' . t('pixels'),
+ );
+
+ $wallet_size = explode('x', variable_get('commerce_amazon_lpa_wallet_size')) + array('0', '250');
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_wallet_size'] = array(
+ '#type' => 'item',
+ '#title' => t('Wallet default size'),
+ '#element_validate' => array('_commerce_amazon_lpa_widget_size_validate'),
+ '#subelement_prefix' => 'wallet_',
+ '#weight' => 4.1,
+ '#field_prefix' => '',
+ '#description' => t('Set the width to 0 for full width'),
+ '#field_suffix' => '
',
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_wallet_size']['wallet_x'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum width'),
+ '#title_display' => 'invisible',
+ '#default_value' => $wallet_size[0] ? $wallet_size[0] : 0,
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#field_suffix' => ' x ',
+ );
+ $form['commerce_amazon_lpa_appearance_settings']['commerce_amazon_lpa_wallet_size']['wallet_y'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum height'),
+ '#title_display' => 'invisible',
+ '#default_value' => $wallet_size[1],
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#field_suffix' => ' ' . t('pixels'),
+ );
+
+ $form['commerce_amazon_lpa_advanced_settings'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Advanced settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+
+ $form['commerce_amazon_lpa_advanced_settings']['commerce_amazon_lpa_digital_product_types'] = array(
+ '#type' => 'select',
+ '#title' => t('Digital product types'),
+ '#description' => t('If you have digital products that are not shippable, select them. Any order that contains only digital products will not have shipping information collected'),
+ '#options' => array('_none' => t('None')) + commerce_product_type_get_name(),
+ '#multiple' => TRUE,
+ '#default_value' => variable_get('commerce_amazon_lpa_digital_product_types', array('_none')),
+ );
+ $form['commerce_amazon_lpa_advanced_settings']['commerce_amazon_lpa_erp_mode'] = array(
+ '#type' => 'select',
+ '#title' => t('ERP Mode'),
+ '#description' => t('Disables all automated authorization and capture functionality and administrative functionality that may trigger authorizations or captures.'),
+ '#options' => array(
+ 0 => t('Disabled'),
+ 1 => t('Enabled'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_erp_mode', 0),
+ );
+
+ $simulation_options = array(
+ '_none' => t('Disabled'),
+ );
+ $simulation_options['Authorizations - Declined'] = array(
+ 'Authorizations_InvalidPaymentMethod' => t('Invalid payment method'),
+ 'Authorizations_AmazonRejected' => t('Amazon rejected'),
+ 'Authorizations_TransactionTimedOut' => t('Transaction timed out'),
+ );
+ $simulation_options['Authorizations - Closed'] = array(
+ 'Authorizations_ExpiredUnused' => t('Expired, unused'),
+ 'Authorizations_AmazonClosed' => t('Amazon closed'),
+ );
+ $simulation_options['Captures'] = array(
+ 'Captures_Pending' => t('Pending'),
+ 'Captures_AmazonRejected' => t('Declined, Amazon rejected'),
+ 'Captures_AmazonClosed' => t('Closed, Amazon closed'),
+ );
+ $simulation_options['Order Reference - Closed'] = array(
+ 'OrderReference_AmazonClosed' => t('Amazon closed'),
+ );
+ $simulation_options['Refund'] = array(
+ 'Refund_AmazonRejected' => t('Declined, Amazon rejected'),
+ );
+
+ $form['commerce_amazon_lpa_advanced_settings']['commerce_amazon_lpa_simulation'] = array(
+ '#title' => t('Sandbox simulation'),
+ '#type' => 'select',
+ '#description' => t('Simulate different scenarios for testing. See !link for more information', array(
+ '!link' => l(t('this documentation'), 'https://payments.amazon.co.uk/developer/documentation/lpwa/201750790'),
+ )),
+ '#options' => $simulation_options,
+ '#access' => AmazonLPA::is_sandbox(),
+ '#default_value' => $simulation_code = variable_get('commerce_amazon_lpa_simulation', '_none'),
+ '#tree' => TRUE,
+ );
+
+ $form['commerce_amazon_lpa_logging_settings'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Logging settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['commerce_amazon_lpa_logging_settings']['commerce_amazon_lpa_log_handling'] = array(
+ '#type' => 'radios',
+ '#title' => t('Log debugging information'),
+ '#description' => t('Errors and exceptions will still be logged.'),
+ '#options' => array(
+ 0 => t('Disabled'),
+ 1 => t('Enabled'),
+ ),
+ '#default_value' => variable_get('commerce_amazon_lpa_log_handling', 0),
+ );
+ $form['commerce_amazon_lpa_logging_settings']['commerce_amazon_lpa_log_link'] = array(
+ '#markup' => l(t('View Amazon Pay and Login with Amazon logs'), 'admin/reports/dblog'),
+ );
+
+ $form = system_settings_form($form);
+ return $form;
+}
+
+/**
+ * Element validate function for amazon widgets.
+ */
+function _commerce_amazon_lpa_widget_size_validate($element, &$form_state) {
+ $prefix = $element['#subelement_prefix'];
+ if (!empty($element[$prefix . 'x']['#value']) || !empty($element[$prefix . 'y']['#value'])) {
+ foreach (array('x', 'y') as $dimension) {
+ $value = $element[$prefix . $dimension]['#value'];
+ if (!is_numeric($value)) {
+ form_error($element[$prefix . $dimension], t('Height and width values must be numeric.'));
+ return;
+ }
+ if (intval($value) == 0 && $dimension == 'y') {
+ form_error($element[$prefix . $dimension], t('Height value must be specified in the !name field.', array('!name' => $element['#title'])));
+ return;
+ }
+ }
+ form_set_value($element, intval($element[$prefix . 'x']['#value']) . 'x' . intval($element[$prefix . 'y']['#value']), $form_state);
+ }
+ else {
+ form_set_value($element, '', $form_state);
+ }
+}
+
+/**
+ * Form validator.
+ */
+function commerce_amazon_lpa_settings_form_validate($form, &$form_state) {
+ // Temporarily set the API credentials.
+ global $conf;
+ $conf['commerce_amazon_lpa_merchant_id'] = $form_state['values']['commerce_amazon_lpa_merchant_id'];
+ $conf['commerce_amazon_lpa_access_key'] = $form_state['values']['commerce_amazon_lpa_access_key'];
+
+ // Secret key is a password field and not required, meaning it could be empty.
+ if (!empty($form_state['values']['commerce_amazon_lpa_secret_key'])) {
+ $conf['commerce_amazon_lpa_secret_key'] = $form_state['values']['commerce_amazon_lpa_secret_key'];
+ }
+ else {
+ // So we need to retain its value here.
+ $form_state['values']['commerce_amazon_lpa_secret_key'] = $conf['commerce_amazon_lpa_secret_key'];
+ }
+
+ $conf['commerce_amazon_lpa_region'] = $form_state['values']['commerce_amazon_lpa_region'];
+
+ try {
+ // Validate API credentials against order reference S00-0000000-0000000.
+ $api = AmazonLPA::instance();
+
+ $params = array(
+ 'amazon_order_reference_id' => 'S00-0000000-0000000',
+ );
+
+ $response = $api->getClient()->getOrderReferenceDetails($params)->toArray();
+ switch ($response['Error']['Code']) {
+ case 'InvalidOrderReferenceId':
+ // This is what we want, do not react.
+ break;
+
+ case 'InvalidAccessKeyId':
+ form_set_error('commerce_amazon_lpa_access_key', $response['Error']['Message']);
+ break;
+
+ case 'SignatureDoesNotMatch':
+ form_set_error('commerce_amazon_lpa_secret_key', $response['Error']['Message']);
+ break;
+
+ case 'InvalidParameterValue':
+ form_set_error('commerce_amazon_lpa_merchant_id', $response['Error']['Message']);
+ break;
+
+ default:
+ form_set_error('commerce_amazon_lpa_merchant_id', $response['Error']['Message']);
+ }
+ }
+ catch (Exception $e) {
+ form_set_error('commerce_amazon_lpa_merchant_id', t('Invalid API credentials'));
+ }
+
+ // Force the store to use a proper default currency.
+ // @see commerce_order_calculate_total()
+ $region_currency = AmazonLPA::get_region_currency_code(variable_get('commerce_amazon_lpa_region', 'US'));
+ $default_currency = commerce_default_currency();
+ if ($region_currency != $default_currency) {
+ form_set_error('commerce_amazon_lpa_region', t('Your current default currency is @default, however your Amazon seller region requires @required.', array(
+ '@default' => $default_currency,
+ '@required' => $region_currency,
+ )));
+ }
+
+ // If using hidden button mode and Amazon only checkout, display warning.
+ if ($form_state['values']['commerce_amazon_lpa_checkout_strategy'] == AmazonLPA::STRATEGY_AMAZON
+ && $form_state['values']['commerce_amazon_lpa_hidden_mode'] != '') {
+ drupal_set_message(t('You have set the checkout strategy to Amazon only, but have Hidden Button Mode enabled. Customers might not be able to complete checkout.'), 'warning');
+ }
+}
+
+/**
+ * Form callback: allows the user to authorize a transaction on an order.
+ */
+function commerce_amazon_lpa_authorize_form($form, &$form_state, $order, $transaction = NULL) {
+ $balance = commerce_payment_order_balance($order);
+
+ if (!$transaction) {
+ $transaction = commerce_payment_transaction_new('commerce_amazon_login_and_pay', $order->order_id);
+ $transaction->amount = $balance['amount'];
+ $transaction->currency_code = $balance['currency_code'];
+ }
+
+ $form_state['order'] = $order;
+ $form_state['transaction'] = $transaction;
+
+ // Load and store the payment method instance for this transaction.
+ $payment_method = commerce_payment_method_instance_load($transaction->instance_id);
+ $form_state['payment_method'] = $payment_method;
+
+ if ($balance['amount'] > 0 && $balance['amount'] < $transaction->amount) {
+ $default_amount = $balance['amount'];
+ }
+ else {
+ $default_amount = $transaction->amount;
+ }
+
+ // Convert the price amount to a user friendly decimal value.
+ $default_amount = number_format(commerce_currency_amount_to_decimal($default_amount, $transaction->currency_code), 2, '.', '');
+
+ $description = implode('', array( + t('Authorization: @amount', array('@amount' => commerce_currency_format($transaction->amount, $transaction->currency_code))), + t('Order balance: @balance', array('@balance' => commerce_currency_format($balance['amount'], $balance['currency_code']))), + t('You may capture up to the remaining order balance.'), + )); + + $form['amount'] = array( + '#type' => 'textfield', + '#title' => t('Capture amount'), + '#description' => $description, + '#default_value' => $default_amount, + '#field_suffix' => check_plain($transaction->currency_code), + '#size' => 16, + ); + + $form = confirm_form($form, + t('What amount do you want to authorize?'), + 'admin/commerce/orders/' . $order->order_id . '/payment', + '', + t('Authorize'), + t('Cancel'), + 'confirm' + ); + + return $form; +} + +/** + * Validate handler: ensure a valid amount is given. + */ +function commerce_amazon_lpa_authorize_form_validate($form, &$form_state) { + $transaction = $form_state['transaction']; + $amount = $form_state['values']['amount']; + + $balance = commerce_payment_order_balance($form_state['order']); + + if ($balance['amount'] > 0 && $balance['amount'] < $transaction->amount) { + $allowed_amount = $balance['amount']; + } + else { + $allowed_amount = $transaction->amount; + } + + // Ensure a positive numeric amount has been entered for capture. + if (!is_numeric($amount) || $amount <= 0) { + form_set_error('amount', t('You must specify a positive numeric amount to authorize.')); + } + + if ($allowed_amount < $amount) { + form_set_error('amount', t('That amount exceed the maximum allowed authorize amount.')); + } +} + +/** + * Submit handler: process a prior authorization capture. + */ +function commerce_amazon_lpa_authorize_form_submit($form, &$form_state) { + $transaction = $form_state['transaction']; + $order = $form_state['order']; + $api = AmazonLPA::instance(); + + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + + try { + $data = $api->authorize($order_wrapper, AmazonLPA::get_capture_mode() == AmazonLPA::CAPTURE_AUTH_CAPTURE ? TRUE : FALSE, array( + 'amount' => commerce_currency_decimal_to_amount($form_state['values']['amount'], $transaction->currency_code), + 'currency_code' => $transaction->currency_code, + )); + commerce_amazon_lpa_add_debug_log(t('Terminal authorize: !debug', array('!debug' => '
' . print_r($data, TRUE) . ''))); + + $api->processAuthorizeTransaction($transaction, $data); + + $authorization_details = $api->getAuthorizationDetails($data['AmazonAuthorizationId']); + if (isset($authorization_details['AuthorizationBillingAddress'])) { + $billing_address = $authorization_details['AuthorizationBillingAddress']; + try { + commerce_amazon_lpa_amazon_address_to_customer_profile($order, 'billing', $billing_address); + commerce_order_save($order); + } + catch (Exception $e) { + watchdog('commerce_amazon_lpa', 'Error processing order billing information for Amazon: !error', array('!error' => '
' . print_r($data, TRUE) . ''), WATCHDOG_ERROR); + } + } + + // Create a revision, since we have changed the remote ID. + $transaction->revision = TRUE; + $transaction->log = t('Authorization was created'); + + if ($transaction->status == COMMERCE_PAYMENT_STATUS_SUCCESS) { + drupal_set_message(t('The authorization has been completed successfully.')); + } + elseif ($transaction->status == COMMERCE_PAYMENT_STATUS_PENDING) { + drupal_set_message(t('The authorisations has been submitted successfully and may take a moment to process.')); + } + else { + $status = $data['AuthorizationStatus']; + switch ($status['ReasonCode']) { + case 'AmazonRejected': + $message = t('Your payment could not be processed. Please try to place the order again using another payment method.'); + commerce_order_status_update($order, 'cart', FALSE, TRUE, t('Order canceled because it was rejected by Amazon')); + break; + + case 'TransactionTimedOut': + $message = t('Your payment could not be processed. Please try to place the order again using another payment method.'); + commerce_order_status_update($order, 'cart', FALSE, TRUE, t('Order canceled because the transaction timed out.')); + break; + + case 'ProcessingFailure': + $message = t('Your order could not be processed due to a system error. Please try to place the order again.'); + commerce_order_status_update($order, 'cart', FALSE, TRUE, t('Order canceled because the transaction failed to process.')); + break; + + case 'InvalidPaymentMethod': + default: + $message = t('Your payment could not be processed, please follow the instructions in the payment method box..'); + break; + } + drupal_set_message($message, 'error'); + } + } + catch (Exception $e) { + drupal_set_message($e->getMessage(), 'error'); + } + + // Redirect back to the current order payment page. + $form_state['redirect'] = 'admin/commerce/orders/' . $form_state['order']->order_id . '/payment'; +} + +/** + * Form callback: allows the user to capture a prior authorization. + */ +function commerce_amazon_lpa_capture_form($form, &$form_state, $order, $transaction) { + $form_state['order'] = $order; + $form_state['transaction'] = $transaction; + + // Load and store the payment method instance for this transaction. + $payment_method = commerce_payment_method_instance_load($transaction->instance_id); + $form_state['payment_method'] = $payment_method; + + $balance = commerce_payment_order_balance($order); + + if ($balance['amount'] > 0 && $balance['amount'] < $transaction->amount) { + $default_amount = $balance['amount']; + } + else { + $default_amount = $transaction->amount; + } + + // Convert the price amount to a user friendly decimal value. + $default_amount = number_format(commerce_currency_amount_to_decimal($default_amount, $transaction->currency_code), 2, '.', ''); + + $description = implode('
', array( + t('Authorization: @amount', array('@amount' => commerce_currency_format($transaction->amount, $transaction->currency_code))), + t('Order balance: @balance', array('@balance' => commerce_currency_format($balance['amount'], $balance['currency_code']))), + t('You may capture up to the remaining order balance.'), + )); + + $form['amount'] = array( + '#type' => 'textfield', + '#title' => t('Capture amount'), + '#description' => $description, + '#default_value' => $default_amount, + '#field_suffix' => check_plain($transaction->currency_code), + '#size' => 16, + ); + + $form = confirm_form($form, + t('What amount do you want to capture?'), + 'admin/commerce/orders/' . $order->order_id . '/payment', + '', + t('Capture'), + t('Cancel'), + 'confirm' + ); + + return $form; +} + +/** + * Validate handler: ensure a valid amount is given. + */ +function commerce_amazon_lpa_capture_form_validate($form, &$form_state) { + $transaction = $form_state['transaction']; + $amount = $form_state['values']['amount']; + + $balance = commerce_payment_order_balance($form_state['order']); + + if ($balance['amount'] > 0 && $balance['amount'] < $transaction->amount) { + $allowed_amount = $balance['amount']; + } + else { + $allowed_amount = $transaction->amount; + } + + // Ensure a positive numeric amount has been entered for capture. + if (!is_numeric($amount) || $amount <= 0) { + form_set_error('amount', + t('You must specify a positive numeric amount to capture.')); + } + + if ($allowed_amount < $amount) { + form_set_error('amount', + t('That amount exceed the maximum allowed capture amount.')); + } + + // If the authorization has expired, display an error message and redirect. + if (REQUEST_TIME - $transaction->created > 86400 * 30) { + drupal_set_message(t('This authorization has passed its 30 day limit and cannot be captured.'), 'error'); + drupal_goto('admin/commerce/orders/' . $form_state['order']->order_id . '/payment'); + } +} + +/** + * Submit handler: process a prior authorization capture. + */ +function commerce_amazon_lpa_capture_form_submit($form, &$form_state) { + $transaction = $form_state['transaction']; + $order = $form_state['order']; + $api = AmazonLPA::instance(); + + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + + try { + $data = $api->capture($order_wrapper, $transaction->remote_id, array( + 'amount' => commerce_currency_decimal_to_amount($form_state['values']['amount'], $transaction->currency_code), + 'currency_code' => $transaction->currency_code, + )); + + commerce_amazon_lpa_add_debug_log(t('Terminal capture: !debug', array('!debug' => '
' . print_r($data, TRUE) . ''))); + + // Create a revision, since we have changed the remote ID. + $transaction->revision = TRUE; + $transaction->log = t('Authorization was captured'); + + // Create a transaction based on the original response we received. + $api->processCaptureTransaction($transaction, $data); + + if ($transaction->status == COMMERCE_PAYMENT_STATUS_SUCCESS) { + drupal_set_message(t('The capture has been completed successfully.')); + } + elseif ($transaction->status == COMMERCE_PAYMENT_STATUS_PENDING) { + drupal_set_message(t('The capture has been submitted successfully and may take a moment to process.')); + } + else { + drupal_set_message(t('The capture was not successful.'), 'error'); + } + } + catch (Exception $e) { + drupal_set_message($e->getMessage(), 'error'); + + // Something went wrong, try to refresh the authorization. + $data = $api->getAuthorizationDetails($transaction->remote_id); + $api->processAuthorizeTransaction($transaction, $data); + } + + // Redirect back to the current order payment page. + $form_state['redirect'] = 'admin/commerce/orders/' . $form_state['order']->order_id . '/payment'; +} + +/** + * Form callback: allows the user to issue a credit on a prior transaction. + */ +function commerce_amazon_lpa_refund_form($form, &$form_state, $order, $transaction) { + $form_state['order'] = $order; + $form_state['transaction'] = $transaction; + + // Load and store the payment method instance for this transaction. + $payment_method = commerce_payment_method_instance_load($transaction->instance_id); + $form_state['payment_method'] = $payment_method; + $balance = commerce_payment_order_balance($order); + + $default_amount = number_format(commerce_currency_amount_to_decimal($transaction->amount, $transaction->currency_code), 2, '.', ''); + $max_refund = ($transaction->amount > 50000) ? $transaction->amount + 7500 : + $transaction->amount * 1.15; + + $description = implode('
', array( + t('Max allowed refund: @amount', array('@amount' => commerce_currency_format($max_refund, $transaction->currency_code))), + t('Order balance: @balance', array('@balance' => commerce_currency_format($balance['amount'], $balance['currency_code']))), + t('Original authorized amount: @original', array('@original' => commerce_currency_format($transaction->amount, $transaction->currency_code))), + )); + + $form['amount'] = array( + '#type' => 'textfield', + '#title' => t('Refund amount'), + '#description' => $description, + '#default_value' => $default_amount, + '#field_suffix' => check_plain($transaction->currency_code), + '#size' => 16, + ); + + $form['note'] = array( + '#type' => 'textfield', + '#title' => t('Note'), + '#description' => t('You can enter a note that will accompany the refund. Notes will be sent in an email to the customer.'), + '#default_value' => '', + '#size' => 60, + '#maxlength' => 255, + ); + + $form = confirm_form($form, + t('What amount do you want to refund?'), + 'admin/commerce/orders/' . $order->order_id . '/payment', + '', + t('Refund'), + t('Cancel'), + 'confirm' + ); + + return $form; +} + +/** + * Validate handler: check the credit amount before attempting a refund request. + */ +function commerce_amazon_lpa_refund_form_validate($form, &$form_state) { + $transaction = $form_state['transaction']; + $order = $form_state['order']; + $amount = $form_state['values']['amount']; + $balance = commerce_payment_order_balance($order); + + // Ensure a positive numeric amount has been entered for refund. + if (!is_numeric($amount) || $amount <= 0) { + form_set_error('amount', t('You must specify a positive numeric amount to refund.')); + } + + // Since Amazon supports up to 10 refunds per capture, we need to ensure that + // the refund doesn't exceed their refund restrictions. For an individual + // capture, we can only refund up to 15% or $75 (which ever is smaller) of the + // original captured amount. + $transaction_amount = commerce_currency_amount_to_decimal($transaction->amount, $transaction->currency_code); + $order_balance = commerce_currency_amount_to_decimal($balance['amount'], $transaction->currency_code); + $max_refund = ($transaction->amount > 50000) ? $transaction_amount + 7500 : + $transaction->amount * 1.15; + + // Ensure the amount is less than or equal to the remaining captured amount. + // We take the maximum possible refund, subtract the balance which would + // include any additional refunds that have already been processed. + if (($max_refund - $order_balance) < commerce_currency_decimal_to_amount($amount, $transaction->currency_code)) { + form_set_error('amount', t('The maximum refund allowed is @max_refund.', array('@max_refund' => commerce_currency_format($max_refund, $transaction->currency_code)))); + } + + // If the transaction is older than 60 days, display an error message and + // redirect. + if (time() - $transaction->created > 86400 * 60) { + drupal_set_message(t('This transaction has passed its 60 day limit for issuing refunds.'), 'error'); + drupal_goto('admin/commerce/orders/' . $form_state['order']->order_id . '/payment'); + } +} + +/** + * Submit handler: process a refund. + */ +function commerce_amazon_lpa_refund_form_submit($form, &$form_state) { + $transaction = $form_state['transaction']; + $amount = $form_state['values']['amount']; + $note = $form_state['values']['note']; + $order = $form_state['order']; + $payment_method = $form_state['payment_method']; + + // Set up the refund. + $api = AmazonLPA::instance(); + $data = $api->refund(entity_metadata_wrapper('commerce_order', $order), $transaction->remote_id, $amount, $note); + + $credit_transaction = commerce_payment_transaction_new($payment_method['method_id'], $order->order_id); + $credit_transaction->instance_id = $payment_method['instance_id']; + $transaction->payload[REQUEST_TIME . '-refund'] = $data; + + $api->processRefundTransaction($credit_transaction, $data); + + if ($transaction->status == COMMERCE_PAYMENT_STATUS_SUCCESS) { + drupal_set_message(t('Refund for @amount completed successfully.', array( + '@amount' => commerce_currency_format($amount, $transaction->currency_code, NULL, FALSE), + ))); + } + elseif ($transaction->status == COMMERCE_PAYMENT_STATUS_PENDING) { + drupal_set_message(t('Refund for @amount is in progress.', array( + '@amount' => commerce_currency_format($amount, $transaction->currency_code, NULL, FALSE), + ))); + } + else { + // Display a failure message and response reason from Amazon. + drupal_set_message(t('Refund failed: @reason', array('@reason' => '
' . print_r($data, TRUE) . ''), 'error')); + } + + $form_state['redirect'] = 'admin/commerce/orders/' . $order->order_id . '/payment'; +} + +/** + * Form callback: allows the user to issue a credit on a prior transaction. + */ +function commerce_amazon_lpa_close_form($form, &$form_state, $order, $transaction) { + $form_state['order'] = $order; + $form_state['transaction'] = $transaction; + + // Load and store the payment method instance for this transaction. + $payment_method = commerce_payment_method_instance_load($transaction->instance_id); + $form_state['payment_method'] = $payment_method; + + $default_amount = number_format(commerce_currency_amount_to_decimal($transaction->amount, $transaction->currency_code), 2, '.', ''); + + $form['amount'] = array( + '#type' => 'textfield', + '#title' => t('Authorized amount'), + '#description' => t('The authorization for this amount will be released. You will not be able to process any further transactions with this authorization once it is closed.'), + '#default_value' => $default_amount, + '#field_suffix' => check_plain($transaction->currency_code), + '#disabled' => TRUE, + '#size' => 16, + ); + + $form['reason'] = array( + '#type' => 'textfield', + '#title' => t('Reason'), + '#description' => t('You can enter a reason for closing this transaction. Reasons will be sent in an email to the customer.'), + '#default_value' => '', + '#size' => 60, + '#maxlength' => 255, + ); + + $form = confirm_form($form, + t('Are you sure you want to close this authorization?'), + 'admin/commerce/orders/' . $order->order_id . '/payment', + '', + t('Close authorization'), + t('Cancel'), + 'confirm' + ); + + return $form; +} + +/** + * Validate handler: check the credit amount before attempting a refund request. + */ +function commerce_amazon_lpa_close_form_validate($form, &$form_state) { +} + +/** + * Submit handler: process a refund. + */ +function commerce_amazon_lpa_close_form_submit($form, &$form_state) { + $transaction = $form_state['transaction']; + $order = $form_state['order']; + $reason = $form_state['values']['reason']; + + $api = AmazonLPA::instance(); + $response = $api->closeAuthorization(entity_metadata_wrapper('commerce_order', $order), $transaction->remote_id, $reason); + + // Error handling. + if ($response) { + drupal_set_message(t('Authorization close request sent.')); + } + else { + // Display a failure message and response reason from Amazon. + drupal_set_message(t('Error: @reason', array('@reason' => '
' . print_r($response, TRUE) . ''), 'error')); + } + + // Add this response to the payment transaction payload. + $transaction->payload[REQUEST_TIME . '-close'] = $response; + commerce_payment_transaction_save($transaction); + + $form_state['redirect'] = 'admin/commerce/orders/' . $order->order_id . '/payment'; +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.checkout_pane.inc b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.checkout_pane.inc new file mode 100644 index 00000000..65e6dd34 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.checkout_pane.inc @@ -0,0 +1,213 @@ +data['commerce_amazon_lpa'])) { + return $pane_form; + } + + $existing_reference_id = AmazonLPA::instance()->getOrderReferenceId(entity_metadata_wrapper('commerce_order', $order)); + $pane_form['reference_id'] = array( + '#type' => 'hidden', + '#default_value' => $existing_reference_id, + '#access' => empty($existing_reference_id), + ); + $pane_form['#attached']['js'][] = array( + 'data' => array( + 'AmazonLPA' => array( + 'orderReferenceId' => $existing_reference_id, + ), + ), + 'type' => 'setting', + ); + + return $pane_form; +} + +/** + * Checkout pane callback: builds a shipping quote selection form. + */ +function commerce_amazon_lpa_contract_id_pane_checkout_form_validate($form, &$form_state, $checkout_pane, $order) { + if (empty($order->data['commerce_amazon_lpa'])) { + return TRUE; + } + + $pane_values = $form_state['values']['commerce_amazon_lpa_contract_id']; + + if (!empty($pane_values['reference_id'])) { + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + // Set the order. + $order_wrapper->{AmazonLPA::REFERENCE_ID_FIELD} = $pane_values['reference_id']; + + try { + $order->data['commerce_amazon_lpa']['order_reference'] = AmazonLPA::instance()->getOrderRef($order_wrapper); + } + catch (Exception $e) { + watchdog('commerce_amazon_lpa', 'Error processing order for Amazon: !error', array('!error' => '
' . print_r($e, TRUE) . ''), WATCHDOG_ERROR); + form_set_error('', t('There was a problem with your checkout process. Please contact the store for further information.')); + return FALSE; + } + + $order_wrapper->save(); + + $form_state['order'] = $order_wrapper->value(); + return TRUE; + } + + // If the order is shippable, we need to have a valid contract ID from the + // addressbook widget. + if (commerce_amazon_lpa_order_is_shippable($order)) { + form_set_error('', t('There was a problem with your checkout process. Please contact the store for further information.')); + return FALSE; + } + + return TRUE; +} + +/** + * Checkout pane callback: builds a shipping quote selection form. + */ +function commerce_amazon_lpa_switch_checkout_pane_checkout_form($form, &$form_state, $checkout_pane, $order) { + $pane_form = array(); + + if (!empty($order->data['commerce_amazon_lpa'])) { + return $pane_form; + } + + $pane_form['switch_button'] = array( + '#markup' => theme('commerce_amazon_payment_button', array( + 'order_id' => $form_state['order']->order_id, + 'html_id' => 'amazon_lpa_cart_pay', + )), + ); + + return $pane_form; +} + +/** + * Checkout pane callback: builds a shipping quote selection form. + */ +function commerce_amazon_lpa_addressbook_pane_checkout_form($form, &$form_state, $checkout_pane, $order) { + $pane_form = array(); + + if (!empty($order->data['commerce_amazon_lpa']) && commerce_amazon_lpa_order_is_shippable($order)) { + // Build the checkout pane form. + $pane_form['amazon_addressbook_widget'] = array( + '#markup' => theme('commerce_amazon_addressbook_widget', array( + 'html_id' => 'checkout_amazon_addressbook', + )), + ); + } + + return $pane_form; +} + +/** + * Checkout pane callback: builds review pane. + */ +function commerce_amazon_lpa_addressbook_pane_review($form, &$form_state, $checkout_pane, $order) { + if (!empty($order->data['commerce_amazon_lpa']) && commerce_amazon_lpa_order_is_shippable($order)) { + return theme('commerce_amazon_addressbook_widget', array( + 'html_id' => 'customer_profile_shipping', + 'display_mode' => 'read', + )); + } + + return NULL; +} + +/** + * Checkout pane callback: validates a customer profile edit form. + */ +function commerce_amazon_lpa_addressbook_pane_checkout_form_validate($form, &$form_state, $checkout_pane, $order) { + if (empty($order->data['commerce_amazon_lpa']) || !commerce_amazon_lpa_order_is_shippable($order)) { + return TRUE; + } + + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $data = AmazonLPA::instance()->getOrderRef($order_wrapper); + // Strip off GetOrderReferenceDetailsResult. + if (isset($data['Destination']['PhysicalDestination'])) { + // Store the Amazon shipping address in form state for submit handler. + $form_state['amazon_shipping_address'] = $data['Destination']['PhysicalDestination']; + return TRUE; + } + + // There was no physical destination set on the order. + form_set_error(NULL, t('You must provide a shipping address')); + return FALSE; +} + +/** + * Checkout pane callback: submit the Amazon address checkout pane. + * + * Mimic commerce_customer_profile_pane_checkout_form_submit() and build the + * proper profile so we can calculate shipping properly. + * + * @see commerce_customer_profile_pane_checkout_form_submit() + */ +function commerce_amazon_lpa_addressbook_pane_checkout_form_submit(&$form, &$form_state, $checkout_pane, $order) { + // Save the Amazon delivery address to shipping customer profile address. + if (!empty($order->data['commerce_amazon_lpa']) && commerce_amazon_lpa_order_is_shippable($order)) { + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $amazon_shipping_address = $form_state['amazon_shipping_address']; + + $pane_id = 'customer_profile_shipping'; + + // If the shipping profile pane is present, inject our values. + if (isset($form[$pane_id]['commerce_customer_address'])) { + // Don't require address form elements. + unset($form[$pane_id]['commerce_customer_address']['#required']); + $customer_profile = $form[$pane_id]['customer_profile']['#value']; + + $form_state['values'][$pane_id]['commerce_customer_address'][LANGUAGE_NONE][0] = array( + 'country' => $amazon_shipping_address['CountryCode'], + 'name_line' => isset($amazon_shipping_address['Name']) ? $amazon_shipping_address['Name'] : '', + 'postal_code' => isset($amazon_shipping_address['PostalCode']) ? $amazon_shipping_address['PostalCode'] : '', + 'locality' => isset($amazon_shipping_address['City']) ? $amazon_shipping_address['City'] : '', + 'administrative_area' => isset($amazon_shipping_address['StateOrRegion']) ? $amazon_shipping_address['StateOrRegion'] : '', + 'data' => serialize($amazon_shipping_address), + ); + commerce_unrequire_form_elements($form[$pane_id]); + field_attach_submit('commerce_customer_profile', $customer_profile, $form[$pane_id], $form_state); + $customer_profile->commerce_customer_address = $form_state['values'][$pane_id]['commerce_customer_address']; + // Save the customer profile. + commerce_customer_profile_save($customer_profile); + + // If Addressbook is enabled, make sure this is the default. + // This really only matters on instances like CK2 that display the + // information directly to the user and they may see the original + // partial profile before the order is confirmed. + if (module_exists('commerce_addressbook')) { + commerce_addressbook_set_default_profile($customer_profile); + } + } + // Write the profile ourself. + else { + $customer_profile = commerce_amazon_lpa_amazon_address_to_customer_profile($order, 'shipping', $amazon_shipping_address); + } + + if ($field_name = variable_get('commerce_' . $pane_id . '_field', '')) { + $order_wrapper->{$field_name} = $customer_profile; + } + else { + // Make the association in the order's data array if no field was found. + $order->data['profiles'][$pane_id] = $customer_profile->profile_id; + } + + // Save the order with address data. + commerce_order_save($order); + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.pages.inc b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.pages.inc new file mode 100644 index 00000000..eb7a6b6d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.pages.inc @@ -0,0 +1,296 @@ + array( + 'library' => array(array('commerce_amazon_lpa', 'amazon_widgets')), + 'js' => array( + drupal_get_path('module', 'commerce_amazon_lpa') . '/js/commerce-amazon-lpa-redirect.js', + ), + ), + ); + } + + $api = AmazonLPA::instance(); + $order = commerce_cart_order_load($GLOBALS['user']->uid); + // If the user does not have access to checkout the order, return a 404. We + // could return a 403, but then the user would know they've identified a + // potentially valid checkout URL. + $user_info = $api->getUserInfo(); + if (empty($order) || !commerce_checkout_access($order) || empty($user_info)) { + drupal_goto('cart'); + } + + // Ensure user is logged in. If not, do so on their behalf. + if (AmazonLPA::get_operation_mode() == AmazonLPA::OPERATION_MODE_LOGIN_AND_PAY && !user_is_logged_in()) { + commerce_amazon_lpa_external_login(); + } + + // If an order is being saved without a contract ID, assume it has just left + // the cart and beginning life in checkout. + // Set the account info for the order. + $order->data['commerce_amazon_lpa']['user_info'] = $user_info; + if (empty($order->mail)) { + $order->mail = $user_info['email']; + } + + // Check if the order is re-entering Amazon checkout, and that is has + // a valid state. + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + if ($api->getOrderReferenceId($order_wrapper)) { + $order_reference = $api->getOrderRef($order_wrapper); + $amazon_order_state = $order_reference['OrderReferenceStatus']['State']; + if ($amazon_order_state != 'Draft') { + $order_wrapper->{AmazonLPA::REFERENCE_ID_FIELD} = ''; + } + } + + if (commerce_order_save($order)) { + drupal_goto('checkout'); + } + else { + drupal_set_message(t('There was an error initiating the Amazon checkout, please try again'), 'error'); + drupal_goto('cart'); + } +} + +/** + * Page callback for handling IPN notifications. + * + * @throws \Exception + * Amazon Exception. + */ +function commerce_amazon_lpa_process_ipn() { + $api = AmazonLPA::instance(); + + $headers = array(); + + foreach ($_SERVER as $name => $value) { + if (substr($name, 0, 5) == 'HTTP_') { + $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; + } + } + + try { + $ipn_handler = new AmazonPayIpnHandler($headers, file_get_contents('php://input')); + } + catch (\Exception $e) { + return MENU_ACCESS_DENIED; + } + $ipn_message = $ipn_handler->toArray(); + + commerce_amazon_lpa_add_debug_log(t('Amazon IPN debug: !debug', array('!debug' => '
' . print_r($ipn_message, TRUE) . ''))); + + // Decide what to do based on the notification type. Amazon defines several + // types of notifications. See link below. However, the notification types + // they define don't appear in the actual responses. e.g. + // AuthorizationNotification is defined in the docs, but PaymentAuthorize is + // what actually gets sent with the IPN notification. + // @see https://payments.amazon.com/documentation/apireference/201757720 + switch ($ipn_message['NotificationType']) { + case 'OrderReferenceNotification': + $data = $ipn_message['OrderReference']; + $order = commerce_amazon_lpa_order_from_amazon_reference_id($data['AmazonOrderReferenceId']); + + if (empty($order)) { + watchdog('commerce_amazon_lpa', 'Unable to find matching order for reference @id.', array('@id' => $data['AmazonOrderReferenceId']), WATCHDOG_ERROR); + break; + } + + $order->data['commerce_amazon_lpa']['order_reference'] = $data; + + switch ($data['OrderReferenceStatus']['State']) { + case 'Open': + if (AmazonLPA::AUTH_SYNC != AmazonLPA::get_authorization_mode()) { + $balance = commerce_payment_order_balance($order); + + if ($balance['amount'] <= 0) { + break; + } + + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $data = $api->authorize($order_wrapper, AmazonLPA::get_capture_mode() == AmazonLPA::CAPTURE_AUTH_CAPTURE ? TRUE : FALSE, array( + 'amount' => $balance['amount'], + 'currency_code' => $balance['currency_code'], + )); + commerce_amazon_lpa_add_debug_log(t('IPN authorize: !debug', array('!debug' => '
' . print_r($data, TRUE) . ''))); + + $transaction = commerce_payment_transaction_new('commerce_amazon_login_and_pay', $order->order_id); + $transaction->amount = $balance['amount']; + $transaction->currency_code = $balance['currency_code']; + $api->processAuthorizeTransaction($transaction, $data); + + $authorization_details = $api->getAuthorizationDetails($data['AmazonAuthorizationId']); + if (isset($authorization_details['AuthorizationBillingAddress'])) { + $billing_address = $authorization_details['AuthorizationBillingAddress']; + try { + commerce_amazon_lpa_amazon_address_to_customer_profile($order, 'billing', $billing_address); + commerce_order_save($order); + } + catch (Exception $e) { + watchdog('commerce_amazon_lpa', 'Error processing order billing information for Amazon: !error', array('!error' => '
' . print_r($data, TRUE) . ''), WATCHDOG_ERROR); + } + } + } + break; + + case 'Canceled': + if ('canceled' != $order->status) { + commerce_order_status_update($order, 'cart', TRUE, TRUE, t('Order reference canceled by Amazon. Reason code: @code', array( + '@code' => $data['OrderReferenceStatus']['ReasonCode'], + ))); + } + break; + + case 'Suspended': + commerce_order_status_update($order, $order->status, TRUE, TRUE, t('Suspended by Amazon. Reason code: @code', array( + '@code' => $data['OrderReferenceStatus']['ReasonCode'], + ))); + break; + + case 'Closed': + if (AmazonLPA::AUTH_SYNC != AmazonLPA::get_authorization_mode()) { + $reason_code = $data['OrderReferenceStatus']['ReasonCode']; + if ($reason_code == 'Expired' || $reason_code == 'AmazonClosed') { + $order_status = 'cart'; + } + else { + $order_status = 'completed'; + } + + if ($order_status != $order->status) { + commerce_order_status_update($order, $order_status, TRUE, TRUE, t('Closed notification by Amazon. Reason code: @code', array( + '@code' => $data['OrderReferenceStatus']['ReasonCode'], + ))); + } + } + break; + } + + commerce_order_save($order); + break; + + case 'PaymentAuthorize': + case 'AuthorizationNotification': + $data = $ipn_message['AuthorizationDetails']; + + $transaction = commerce_amazon_lpa_remote_payment_transaction_load($data['AmazonAuthorizationId']); + // If we have no transaction, we must look up the matching authorization + // remote ID. This lets us know the authorization has been closed because + // it has met its maximum amount of captures. + if (!$transaction && !empty($data['IdList']['Id'])) { + $capture_id = $data['IdList']['Id']; + $capture_transaction = commerce_amazon_lpa_remote_payment_transaction_load($capture_id); + if ($capture_transaction) { + commerce_amazon_lpa_transaction_message_update_data($capture_transaction, 'Authorization', $data['AuthorizationStatus']); + $capture_transaction->payload[REQUEST_TIME . '-authorization'] = $data; + commerce_payment_transaction_save($capture_transaction); + } + } + elseif ($transaction) { + $data = $api->getAuthorizationDetails($transaction->remote_id); + $api->processAuthorizeTransaction($transaction, $data); + + // If working in manual or non-sync, check if we should change the + // order status to the Authorized status configured. + if (AmazonLPA::get_authorization_mode() != AmazonLPA::AUTH_SYNC) { + $order = commerce_order_load($transaction->order_id); + if (!empty($order->data['commerce_amazon_lpa_set_as_auth'])) { + $authorized_order_status = variable_get('commerce_amazon_lpa_auth_order_status', 'pending'); + unset($order->data['commerce_amazon_lpa_set_as_auth']); + commerce_order_status_update($order, $authorized_order_status, FALSE, TRUE, t('Payment with Amazon was authorized, moving to proper status.')); + } + } + } + else { + watchdog('commerce_amazon_lpa', 'Unable to find matching payment transaction authorization for @id', array('@id' => $data['AmazonAuthorizationId']), WATCHDOG_ERROR); + } + break; + + case 'PaymentCapture': + case 'CaptureNotification': + $data = $ipn_message['CaptureDetails']; + + // Try to load the transaction first, the ID will have been updated if it + // was captured / triggered in the UI. + $transaction = commerce_amazon_lpa_remote_payment_transaction_load($data['AmazonCaptureId']); + + // If we have no transaction, we must look up the matching authorization + // remote ID. + if (!$transaction) { + $id_components = explode('-', $data['AmazonCaptureId']); + $id_components[3] = str_replace('C', 'A', $id_components[3]); + $authorization_id = implode('-', $id_components); + $transaction = commerce_amazon_lpa_remote_payment_transaction_load($authorization_id); + } + + if ($transaction) { + $api->processCaptureTransaction($transaction, $data); + } + else { + watchdog('commerce_amazon_lpa', 'Unable to find matching payment transaction capture for @id', array('@id' => $data['AmazonCaptureId']), WATCHDOG_ERROR); + } + + break; + + case 'PaymentRefund': + case 'RefundNotification': + $data = $ipn_message['RefundDetails']; + $transaction = commerce_amazon_lpa_remote_payment_transaction_load($data['AmazonRefundId']); + if ($transaction) { + $api->processRefundTransaction($transaction, $data); + } + else { + watchdog('commerce_amazon_lpa', 'Unable to find matching payment transaction refund for @id', array('@id' => $data['AmazonRefundId']), WATCHDOG_ERROR); + } + break; + + default: + commerce_amazon_lpa_add_debug_log('Amazon IPN debug: IPN case did not match for @type', array( + '@type' => $ipn_message['NotificationType'], + )); + break; + } + +} + +/** + * Page callback for Amazon Login. + * + * Verifies the access token and logs the user in as an external user. + */ +function commerce_amazon_lpa_login_callback() { + if (variable_get('commerce_amazon_lpa_popup', 'popup') != 'popup' && !isset($_COOKIE['amazon_Login_accessToken'])) { + return array( + '#attached' => array( + 'library' => array(array('commerce_amazon_lpa', 'amazon_widgets')), + 'js' => array( + drupal_get_path('module', 'commerce_amazon_lpa') . '/js/commerce-amazon-lpa-redirect.js', + ), + ), + ); + } + else { + commerce_amazon_lpa_external_login(); + $cookie = $_COOKIE['amazon_Login_accessToken']; + setrawcookie('amazon_Login_accessToken', $cookie, 0, '/', '', TRUE); + drupal_goto('user'); + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.payment_method.inc b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.payment_method.inc new file mode 100644 index 00000000..8b20d054 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/includes/commerce_amazon_lpa.payment_method.inc @@ -0,0 +1,202 @@ + t('Complete the payment using Amazon Pay with the address and wallet selected in previous steps.'), + ); + + $wrapper = entity_metadata_wrapper('commerce_order', $order); + $form['amazon_order_reference_id'] = array( + '#type' => 'hidden', + '#default_value' => $wrapper->{AmazonLPA::REFERENCE_ID_FIELD}->value(), + ); + $form['wallet_widget'] = array( + '#theme' => 'commerce_amazon_wallet_widget', + '#display_mode' => path_is_admin(current_path()) ? 'read' : '', + '#order_reference_id' => $wrapper->{AmazonLPA::REFERENCE_ID_FIELD}->value(), + ); + return $form; +} + +/** + * Payment method callback: submit form validation. + * + * @see commerce_checkout_by_amazon_submit_form_validate() + */ +function commerce_amazon_login_and_pay_submit_form_validate($payment_method, $pane_form, $pane_values, $order, $form_parents = array()) { + if (!isset($order->data['commerce_amazon_lpa'])) { + form_set_error('commerce_payment', t('Please select a payment method to continue.')); + drupal_set_message(t('Some information for proceeding with the payment might be missing, please review previous steps in order to complete at least address and wallet information.'), 'error'); + return FALSE; + } + + // There should be no more validation error before purchasing with Amazon. + if (form_get_errors()) { + return FALSE; + } +} + +/** + * Payment method callback: submit form submission. + * + * If an order is digital, the order reference will have been generated in the + * submit form, we save it here. + */ +function commerce_amazon_login_and_pay_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge) { + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + + if (!commerce_amazon_lpa_order_is_shippable($order)) { + try { + $order_wrapper->{AmazonLPA::REFERENCE_ID_FIELD} = $pane_values['amazon_order_reference_id']; + $order->data['commerce_amazon_lpa']['order_reference'] = AmazonLPA::instance()->getOrderRef($order_wrapper); + $order_wrapper->save(); + } + catch (Exception $e) { + drupal_set_message(t('There was an error setting the Amazon order reference'), 'error'); + return FALSE; + } + } +} + +/** + * Payment method callback; generation callback for the payment redirect form. + * + * This actually processes the order and transaction with Amazon Payments and + * then moves forward with the checkout. + */ +function commerce_amazon_login_and_pay_redirect_form($form, &$form_state, $order, $payment_method) { + // We're in ERP mode and aren't doing any processing. + if (AmazonLPA::is_erp_mode()) { + commerce_payment_redirect_pane_next_page($order, t('Amazon Login and Pay operating in ERP mode, skipped payment.')); + drupal_goto(commerce_checkout_order_uri($order)); + } + $api = AmazonLPA::instance(); + /** @var EntityDrupalWrapper $order_wrapper */ + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $order_reference = $api->getOrderRef($order_wrapper); + + // On error we will redirect user's back to the checkout page with the + // commerce_payment pane. We load it here to. + $checkout_panes = commerce_checkout_panes(); + $commerce_payment_pane = $checkout_panes['commerce_payment']; + + // Process the transaction. + try { + $amazon_order_state = $order_reference['OrderReferenceStatus']['State']; + + if ($amazon_order_state == 'Draft') { + $response = $api->setOrderRef($order_wrapper); + if (!empty($response['Constraints'])) { + $constraint = $response['Constraints']['Constraint']; + throw new AmazonApiException( + 'ConstraintsExist', + $response, + t('Unable to set the order reference for @order_id: @reason', array( + '@order_id' => $order_wrapper->getIdentifier(), + '@reason' => t('@code - @message', array( + '@code' => $constraint['ConstraintID'], + '@message' => $constraint['Description'], + )), + ))); + } + } + + $api->confirmOrderRef($order_wrapper); + + // Create a transaction. + $transaction = commerce_payment_transaction_new($payment_method['method_id'], $order->order_id); + $transaction->instance_id = $payment_method['instance_id']; + + // If the authorization mode is manual, create a placeholder transaction. + if (AmazonLPA::get_authorization_mode() == AmazonLPA::AUTH_MANUAL) { + $transaction->status = COMMERCE_PAYMENT_STATUS_PENDING; + $transaction->data['commerce_amazon_lpa']['environment'] = variable_get('commerce_amazon_lpa_environment', AmazonLPA::ENV_SANDBOX); + $transaction->data['commerce_amazon_lpa']['transaction_type'] = 'authorization'; + $transaction->amount = $order_wrapper->commerce_order_total->amount->value(); + $transaction->currency_code = $order_wrapper->commerce_order_total->currency_code->value(); + commerce_payment_transaction_save($transaction); + } + // Otherwise run an authorization to be done async or sync. + else { + // Authorize so we can manually capture or automatically when shipped. + // If set to CAPTURE_AUTH_CAPTURE, then do capture with the authorization. + $data = $api->authorize($order_wrapper, AmazonLPA::get_capture_mode() == AmazonLPA::CAPTURE_AUTH_CAPTURE ? TRUE : FALSE); + $api->processAuthorizeTransaction($transaction, $data); + + // Mark the payment as a failure. + if ($transaction->status == COMMERCE_PAYMENT_STATUS_FAILURE) { + throw new AmazonApiException('AuthorizationStatus', $data, 'Payment failed'); + } + } + } + catch (AmazonApiException $e) { + $order_reference = $api->getOrderRef($order_wrapper); + $order->data['commerce_amazon_lpa']['order_reference'] = $order_reference; + + $error_message = $e->getMessage(); + $order_next_status = 'checkout_' . $commerce_payment_pane['page']; + if ($e->getErrorCode() == 'ConstraintsExist') { + foreach ($order_reference['Constraints'] as $constraint) { + switch ($constraint['ConstraintID']) { + case 'PaymentMethodNotAllowed': + $error_message = t('The selected payment method is not available for this transaction. Please select another one or add a new payment method to the wallet widget.'); + break; + + case 'PaymentPlanNotSet': + $error_message = t('No payment instrument has been selected for this order, please try to refresh the page or add a new payment instrument in the wallet widget.'); + break; + } + } + } + elseif ($e->getErrorCode() == 'AuthorizationStatus') { + $data = $e->getResponse(); + switch ($data['AuthorizationStatus']['ReasonCode']) { + case 'AmazonRejected': + // Amazon already closed the transaction. + $error_message = t('Your payment could not be processed. Please try to place the order again using another payment method.'); + $order_next_status = 'cart'; + break; + + case 'TransactionTimedOut': + $api->cancel($order_wrapper); + $error_message = t('Your payment could not be processed. Please try to place the order again using another payment method.'); + $order_next_status = 'cart'; + break; + + case 'ProcessingFailure': + $api->cancel($order_wrapper); + $error_message = t('Your order could not be processed due to a system error. Please try to place the order again.'); + $order_next_status = 'cart'; + break; + + case 'InvalidPaymentMethod': + default: + $error_message = t('Your payment could not be processed, please follow the instructions in the payment method box.'); + } + } + + if ($order_next_status == 'cart') { + commerce_amazon_lpa_user_logout($order_wrapper->owner->value()); + $destination = 'cart'; + } + else { + $destination = commerce_checkout_order_uri($order); + } + + drupal_set_message($error_message, 'error'); + commerce_order_status_update($order, $order_next_status, FALSE, TRUE, $e->getMessage()); + drupal_goto($destination); + } + + commerce_payment_redirect_pane_next_page($order, t('Order paid with Amazon Payments')); + drupal_goto(commerce_checkout_order_uri($order)); +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/js/commerce-amazon-lpa-redirect.js b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/js/commerce-amazon-lpa-redirect.js new file mode 100644 index 00000000..1fdf6c9d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/js/commerce-amazon-lpa-redirect.js @@ -0,0 +1,21 @@ +(function (Drupal, $, document) { + "use strict"; + + function getURLParameter(name, source) { + return decodeURIComponent((new RegExp('[?|&|#]' + name + '=' + '([^&]+?)(&|#|;|$)').exec(source) || [,""])[1].replace(/\+/g, '%20')) || null; + } + + var accessToken = getURLParameter("access_token", location.hash); + + if (typeof accessToken === 'string' && accessToken.match(/^Atza/)) { + document.cookie = "amazon_Login_accessToken=" + accessToken + ";secure"; + } + + $(function () { + window.onAmazonLoginReady = function () { + amazon.Login.setClientId(Drupal.AmazonLPA.clientId); + amazon.Login.setUseCookie(true); + window.location.reload(); + }; + }); +})(Drupal, jQuery, document); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/js/commerce-amazon-lpa.js b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/js/commerce-amazon-lpa.js new file mode 100644 index 00000000..72faf6a5 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/js/commerce-amazon-lpa.js @@ -0,0 +1,201 @@ +/* global amazon */ +(function($, Drupal) { + 'use strict'; + + Drupal.AmazonLPA = { + merchantId: '', + authRequest: '', + clientId: '', + checkoutUrl: '', + langcode: '', + orderReferenceId: '', + isShippable: true, + loginButtonOptions: { + style: 'Gold', + size: 'medium', + type: 'LwA' + }, + loginOptions: { + scope: 'profile postal_code payments:widget payments:shipping_address', + popup: true + }, + payButtonOptions: { + style: 'Gold', + size: 'medium', + type: 'PwA' + }, + addressBookOptions: { + displayMode: 'edit' + }, + walletOptions: { + displayMode: 'edit' + }, + + errorHandler: function (f) { + console.log(f.getErrorCode()+f.getErrorMessage()) + }, + + initialize: function (settings) { + if (typeof settings.AmazonLPA.callbacks === 'object') { + for (var item in settings.AmazonLPA.callbacks) { + if (settings.AmazonLPA.callbacks.hasOwnProperty(item) && typeof eval(settings.AmazonLPA.callbacks[item].callback) === 'function') { + eval(settings.AmazonLPA.callbacks[item].callback)(settings.AmazonLPA.callbacks[item].param); + } + } + } + }, + + LoginButton: function (elId) { + if (document.getElementById(elId) !== null) { + var $el = $('#' + elId); + OffAmazonPayments.Button(elId, Drupal.AmazonLPA.merchantId, { + type: $el.data('pay-type'), + color: Drupal.AmazonLPA.loginButtonOptions.style, + size: $el.data('pay-size'), + language: Drupal.AmazonLPA.langcode, + useAmazonAddressBook: true, + authorization: function () { + var loginOptions = Drupal.AmazonLPA.loginOptions; + Drupal.AmazonLPA.authRequest = amazon.Login.authorize(loginOptions, $el.data('url')); + }, + onError: function (error) { + Drupal.AmazonLPA.errorHandler(error); + } + }); + } + }, + + PaymentButton: function (elId) { + if (document.getElementById(elId) !== null) { + var $el = $('#' + elId); + OffAmazonPayments.Button(elId, Drupal.AmazonLPA.merchantId, { + type: $el.data('pay-type'), + color: Drupal.AmazonLPA.payButtonOptions.style, + size: $el.data('pay-size'), + language: Drupal.AmazonLPA.langcode, + useAmazonAddressBook: true, + authorization: function () { + var loginOptions = Drupal.AmazonLPA.loginOptions; + Drupal.AmazonLPA.authRequest = amazon.Login.authorize(loginOptions, $el.data('checkout-url')); + }, + onError: function (error) { + Drupal.AmazonLPA.errorHandler(error); + } + }); + } + }, + + AddressBookWidget: function (elId) { + if (Drupal.AmazonLPA.addressBookOptions.displayMode === 'edit') { + $('input.checkout-continue').once('amazon-pay', function () { + $(this).attr('disabled', true); + }); + } + + new OffAmazonPayments.Widgets.AddressBook({ + sellerId: Drupal.AmazonLPA.merchantId, + amazonOrderReferenceId: Drupal.AmazonLPA.orderReferenceId || null, + displayMode: Drupal.AmazonLPA.addressBookOptions.displayMode, + design: { + designMode: 'responsive' + }, + /** + * Provide a way to return the current order's contract ID. + * + * @see c.Widgets.AddressBook.prototype.renderAddressBook + * + * @returns string|null + */ + getContractId: function () { + if (Drupal.AmazonLPA.orderReferenceId) { + return Drupal.AmazonLPA.orderReferenceId; + } + + return null; + }, + onOrderReferenceCreate: function (orderReference) { + if (!Drupal.AmazonLPA.orderReferenceId) { + Drupal.AmazonLPA.orderReferenceId = orderReference.getAmazonOrderReferenceId(); + var $referenceIdField = $('input[name="commerce_amazon_lpa_contract_id[reference_id]"]', document); + if ($referenceIdField.length > 0) { + $referenceIdField.val(orderReference.getAmazonOrderReferenceId()); + this.amazonOrderReferenceId = orderReference.getAmazonOrderReferenceId(); + } + } + }, + onAddressSelect: function (orderReference) { + // Support check forms with shipping pane inline and AJAX. + if (typeof $.fn.commerceCheckShippingRecalculation === 'function') { + $.fn.commerceCheckShippingRecalculation(); + } + if (Drupal.AmazonLPA.addressBookOptions.displayMode === 'edit') { + $('input.checkout-continue').attr('disabled', false); + } + }, + onError: function (error) { + Drupal.AmazonLPA.errorHandler(error); + console.log(error); + } + }).bind(elId); + }, + + WalletWidget: function (elId) { + $('input.checkout-continue').once('amazon-pay', function () { + $(this).attr('disabled', true); + }); + + var onOrderReferenceCreate = null; + if (!Drupal.AmazonLPA.isShippable) { + onOrderReferenceCreate = function(orderReference) { + // Use the following cod to get the generated Order Reference ID. + var $referenceIdField = $('input[name="commerce_payment[payment_details][amazon_order_reference_id]"]', document); + if ($referenceIdField.length > 0 && $referenceIdField.val() === "") { + $referenceIdField.val(orderReference.getAmazonOrderReferenceId()); + } + }; + } + + new OffAmazonPayments.Widgets.Wallet({ + sellerId: Drupal.AmazonLPA.merchantId, + amazonOrderReferenceId: Drupal.AmazonLPA.orderReferenceId || null, + onPaymentSelect: function () { + $('input.checkout-continue').attr('disabled', false); + }, + onOrderReferenceCreate: onOrderReferenceCreate, + design: { + designMode: 'responsive' + }, + onError: function (error) { + Drupal.AmazonLPA.errorHandler(error); + } + }).bind(elId); + } + }; + + $(function () { + var settings = Drupal.settings; + // Inject Widget.js + var ws = document.createElement('script'); + $.extend(true, Drupal.AmazonLPA, settings.AmazonLPA); + ws.type = 'text/javascript'; + ws.src = settings.AmazonLPA.widgetsJsUrl; + ws.id = 'AmazonLPAWidgets'; + ws.async = true; + document.getElementsByTagName('head')[0].appendChild(ws); + + window.onAmazonLoginReady = function () { + amazon.Login.setClientId(settings.AmazonLPA.clientId); + amazon.Login.setUseCookie(true); + Drupal.AmazonLPA.initialize(settings); + }; + }); + + Drupal.behaviors.commerceAmazonLPA = { + attach: function (context, settings) { + if (typeof amazon !== 'undefined' && context !== document) { + Drupal.AmazonLPA.initialize(settings); + } + } + }; + +})(jQuery, Drupal); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/.gitignore b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/.gitignore new file mode 100644 index 00000000..5a8c4564 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/.gitignore @@ -0,0 +1,4 @@ +vendor +bin +behat.yml +failures diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/behat.common.yml b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/behat.common.yml new file mode 100644 index 00000000..09e9ea81 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/behat.common.yml @@ -0,0 +1,24 @@ + +default: + suites: + default: + paths: + features: 'features' + contexts: + - FeatureContext + - FailureContext + - Drupal\DrupalExtension\Context\DrupalContext + - Drupal\DrupalExtension\Context\MinkContext + failure_path: '%paths.base%/failures' + extensions: + Behat\MinkExtension: + goutte: ~ + selenium2: + capabilities: + acceptSslCerts: true + files_path: ../../ + Drupal\DrupalExtension: + blackbox: ~ + region_map: + Tabs: ".tabs.primary" + Navbar: "#toolbar" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/behat.example.yml b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/behat.example.yml new file mode 100644 index 00000000..023fdde5 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/behat.example.yml @@ -0,0 +1,10 @@ +imports: + - behat.common.yml + +default: + extensions: + Behat\MinkExtension: + base_url: URL + Drupal\DrupalExtension: + drush: + alias: ALIAS diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/composer.json b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/composer.json new file mode 100644 index 00000000..d272640e --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/composer.json @@ -0,0 +1,8 @@ +{ + "config": { + "bin-dir": "bin/" + }, + "require": { + "drupal/drupal-extension": "3.*" + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/composer.lock b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/composer.lock new file mode 100644 index 00000000..73ffbe9d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/composer.lock @@ -0,0 +1,1660 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "c0ff48cddc203dd4385bfe6bdcf4b60a", + "content-hash": "61e0c8500485eb7081a78211745c4a08", + "packages": [ + { + "name": "behat/behat", + "version": "v3.1.0", + "source": { + "type": "git", + "url": "https://github.com/Behat/Behat.git", + "reference": "359d987b3064d78f2d3a6ba3a355277f3b09b47f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Behat/zipball/359d987b3064d78f2d3a6ba3a355277f3b09b47f", + "reference": "359d987b3064d78f2d3a6ba3a355277f3b09b47f", + "shasum": "" + }, + "require": { + "behat/gherkin": "~4.4", + "behat/transliterator": "~1.0", + "ext-mbstring": "*", + "php": ">=5.3.3", + "symfony/class-loader": "~2.1|~3.0", + "symfony/config": "~2.3|~3.0", + "symfony/console": "~2.1|~3.0", + "symfony/dependency-injection": "~2.1|~3.0", + "symfony/event-dispatcher": "~2.1|~3.0", + "symfony/translation": "~2.3|~3.0", + "symfony/yaml": "~2.1|~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.5", + "symfony/process": "~2.1|~3.0" + }, + "suggest": { + "behat/mink-extension": "for integration with Mink testing framework", + "behat/symfony2-extension": "for integration with Symfony2 web framework", + "behat/yii-extension": "for integration with Yii web framework" + }, + "bin": [ + "bin/behat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Behat": "src/", + "Behat\\Testwork": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Scenario-oriented BDD framework for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "Agile", + "BDD", + "ScenarioBDD", + "Scrum", + "StoryBDD", + "User story", + "business", + "development", + "documentation", + "examples", + "symfony", + "testing" + ], + "time": "2016-03-28 07:04:45" + }, + { + "name": "behat/gherkin", + "version": "v4.4.1", + "source": { + "type": "git", + "url": "https://github.com/Behat/Gherkin.git", + "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/1576b485c0f92ef6d27da9c4bbfc57ee30cf6911", + "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.1" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Gherkin": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], + "time": "2015-12-30 14:47:00" + }, + { + "name": "behat/mink", + "version": "v1.7.1", + "source": { + "type": "git", + "url": "https://github.com/minkphp/Mink.git", + "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9", + "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/css-selector": "~2.1|~3.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0" + }, + "suggest": { + "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", + "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation", + "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)", + "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev" + } + }, + "autoload": { + "psr-4": { + "Behat\\Mink\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Browser controller/emulator abstraction for PHP", + "homepage": "http://mink.behat.org/", + "keywords": [ + "browser", + "testing", + "web" + ], + "time": "2016-03-05 08:26:18" + }, + { + "name": "behat/mink-browserkit-driver", + "version": "v1.3.2", + "source": { + "type": "git", + "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", + "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb", + "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb", + "shasum": "" + }, + "require": { + "behat/mink": "^1.7.1@dev", + "php": ">=5.3.6", + "symfony/browser-kit": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0" + }, + "require-dev": { + "silex/silex": "~1.2", + "symfony/phpunit-bridge": "~2.7|~3.0" + }, + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Behat\\Mink\\Driver\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Symfony2 BrowserKit driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "Mink", + "Symfony2", + "browser", + "testing" + ], + "time": "2016-03-05 08:59:47" + }, + { + "name": "behat/mink-extension", + "version": "v2.2", + "source": { + "type": "git", + "url": "https://github.com/Behat/MinkExtension.git", + "reference": "5b4bda64ff456104564317e212c823e45cad9d59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/5b4bda64ff456104564317e212c823e45cad9d59", + "reference": "5b4bda64ff456104564317e212c823e45cad9d59", + "shasum": "" + }, + "require": { + "behat/behat": "~3.0,>=3.0.5", + "behat/mink": "~1.5", + "php": ">=5.3.2", + "symfony/config": "~2.2|~3.0" + }, + "require-dev": { + "behat/mink-goutte-driver": "~1.1", + "phpspec/phpspec": "~2.0" + }, + "type": "behat-extension", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\MinkExtension": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + }, + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com" + } + ], + "description": "Mink extension for Behat", + "homepage": "http://extensions.behat.org/mink", + "keywords": [ + "browser", + "gui", + "test", + "web" + ], + "time": "2016-02-15 07:55:18" + }, + { + "name": "behat/mink-goutte-driver", + "version": "v1.2.1", + "source": { + "type": "git", + "url": "https://github.com/minkphp/MinkGoutteDriver.git", + "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", + "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", + "shasum": "" + }, + "require": { + "behat/mink": "~1.6@dev", + "behat/mink-browserkit-driver": "~1.2@dev", + "fabpot/goutte": "~1.0.4|~2.0|~3.1", + "php": ">=5.3.1" + }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0" + }, + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Behat\\Mink\\Driver\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Goutte driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "browser", + "goutte", + "headless", + "testing" + ], + "time": "2016-03-05 09:04:22" + }, + { + "name": "behat/mink-selenium2-driver", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/minkphp/MinkSelenium2Driver.git", + "reference": "473a9f3ebe0c134ee1e623ce8a9c852832020288" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/473a9f3ebe0c134ee1e623ce8a9c852832020288", + "reference": "473a9f3ebe0c134ee1e623ce8a9c852832020288", + "shasum": "" + }, + "require": { + "behat/mink": "~1.7@dev", + "instaclick/php-webdriver": "~1.1", + "php": ">=5.3.1" + }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Behat\\Mink\\Driver\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Pete Otaqui", + "email": "pete@otaqui.com", + "homepage": "https://github.com/pete-otaqui" + } + ], + "description": "Selenium2 (WebDriver) driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "ajax", + "browser", + "javascript", + "selenium", + "testing", + "webdriver" + ], + "time": "2016-03-05 09:10:18" + }, + { + "name": "behat/transliterator", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/Behat/Transliterator.git", + "reference": "868e05be3a9f25ba6424c2dd4849567f50715003" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Transliterator/zipball/868e05be3a9f25ba6424c2dd4849567f50715003", + "reference": "868e05be3a9f25ba6424c2dd4849567f50715003", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Transliterator": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Artistic-1.0" + ], + "description": "String transliterator", + "keywords": [ + "i18n", + "slug", + "transliterator" + ], + "time": "2015-09-28 16:26:35" + }, + { + "name": "drupal/drupal-driver", + "version": "v1.2.1", + "source": { + "type": "git", + "url": "https://github.com/jhedstrom/DrupalDriver.git", + "reference": "125d39918c97f7a08e3110d456a0a1db864dae46" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jhedstrom/DrupalDriver/zipball/125d39918c97f7a08e3110d456a0a1db864dae46", + "reference": "125d39918c97f7a08e3110d456a0a1db864dae46", + "shasum": "" + }, + "require": { + "symfony/dependency-injection": "~2.6|~3.0", + "symfony/process": "~2.5|~3.0" + }, + "require-dev": { + "drupal/coder": "~8.2.0", + "drush-ops/behat-drush-endpoint": "*", + "mockery/mockery": "0.9.4", + "phpspec/phpspec": "~2.0", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Drupal\\Component": "src/", + "Drupal\\Driver": "src/", + "Drupal\\Tests\\Driver": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jonathan Hedstrom", + "email": "jhedstrom@gmail.com" + } + ], + "description": "A collection of reusable Drupal drivers", + "homepage": "http://github.com/jhedstrom/DrupalDriver", + "keywords": [ + "drupal", + "test", + "web" + ], + "time": "2016-06-20 16:29:51" + }, + { + "name": "drupal/drupal-extension", + "version": "v3.2.2", + "source": { + "type": "git", + "url": "https://github.com/jhedstrom/drupalextension.git", + "reference": "abe3a33abd94382ab62423dd972fa820c63962e3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jhedstrom/drupalextension/zipball/abe3a33abd94382ab62423dd972fa820c63962e3", + "reference": "abe3a33abd94382ab62423dd972fa820c63962e3", + "shasum": "" + }, + "require": { + "behat/behat": "~3.1.0-rc2", + "behat/mink": "~1.5", + "behat/mink-extension": "~2.0", + "behat/mink-goutte-driver": "~1.0", + "behat/mink-selenium2-driver": "~1.1", + "drupal/drupal-driver": "~1.2", + "symfony/dependency-injection": "~2.7", + "symfony/event-dispatcher": "~2.7" + }, + "require-dev": { + "behat/mink-zombie-driver": "^1.2", + "phpspec/phpspec": "~2.0", + "phpunit/phpunit": "3.7.*" + }, + "type": "behat-extension", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Drupal\\Drupal": "src/", + "Drupal\\Exception": "src/", + "Drupal\\DrupalExtension": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jonathan Hedstrom", + "email": "jhedstrom@gmail.com" + } + ], + "description": "Drupal extension for Behat", + "homepage": "http://drupal.org/project/drupalextension", + "keywords": [ + "drupal", + "test", + "web" + ], + "time": "2016-06-30 21:12:18" + }, + { + "name": "fabpot/goutte", + "version": "v3.1.2", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/Goutte.git", + "reference": "3cbc6ed222422a28400e470050f14928a153207e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3cbc6ed222422a28400e470050f14928a153207e", + "reference": "3cbc6ed222422a28400e470050f14928a153207e", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5.0", + "symfony/browser-kit": "~2.1|~3.0", + "symfony/css-selector": "~2.1|~3.0", + "symfony/dom-crawler": "~2.1|~3.0" + }, + "type": "application", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Goutte\\": "Goutte" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A simple PHP Web Scraper", + "homepage": "https://github.com/FriendsOfPHP/Goutte", + "keywords": [ + "scraper" + ], + "time": "2015-11-05 12:58:44" + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.2.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427", + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.3.1", + "php": ">=5.5" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "^4.0", + "psr/log": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.2-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2016-07-15 17:22:37" + }, + { + "name": "guzzlehttp/promises", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579", + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2016-05-18 16:56:05" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ], + "time": "2016-06-24 23:00:38" + }, + { + "name": "instaclick/php-webdriver", + "version": "1.4.3", + "source": { + "type": "git", + "url": "https://github.com/instaclick/php-webdriver.git", + "reference": "0c20707dcf30a32728fd6bdeeab996c887fdb2fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/0c20707dcf30a32728fd6bdeeab996c887fdb2fb", + "reference": "0c20707dcf30a32728fd6bdeeab996c887fdb2fb", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.2" + }, + "require-dev": { + "satooshi/php-coveralls": "dev-master" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "WebDriver": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Justin Bishop", + "email": "jubishop@gmail.com", + "role": "Developer" + }, + { + "name": "Anthon Pang", + "email": "apang@softwaredevelopment.ca", + "role": "Fork Maintainer" + } + ], + "description": "PHP WebDriver for Selenium 2", + "homepage": "http://instaclick.com/", + "keywords": [ + "browser", + "selenium", + "webdriver", + "webtest" + ], + "time": "2015-06-15 20:19:33" + }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06 14:39:51" + }, + { + "name": "symfony/browser-kit", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d2a07cc11c5fa94820240b1e67592ffb18e347b9", + "reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/dom-crawler": "~2.8|~3.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" + }, + "suggest": { + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "https://symfony.com", + "time": "2016-07-26 08:04:17" + }, + { + "name": "symfony/class-loader", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/class-loader.git", + "reference": "817f09b4c37b7688fa4342cb4642d8f2d81c1097" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/817f09b4c37b7688fa4342cb4642d8f2d81c1097", + "reference": "817f09b4c37b7688fa4342cb4642d8f2d81c1097", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/finder": "~2.8|~3.0", + "symfony/polyfill-apcu": "~1.1" + }, + "suggest": { + "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\ClassLoader\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "https://symfony.com", + "time": "2016-07-10 08:05:47" + }, + { + "name": "symfony/config", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "a7630397b91be09cdd2fe57fd13612e258700598" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/a7630397b91be09cdd2fe57fd13612e258700598", + "reference": "a7630397b91be09cdd2fe57fd13612e258700598", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2016-07-26 08:04:17" + }, + { + "name": "symfony/console", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "f9e638e8149e9e41b570ff092f8007c477ef0ce5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/f9e638e8149e9e41b570ff092f8007c477ef0ce5", + "reference": "f9e638e8149e9e41b570ff092f8007c477ef0ce5", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2016-07-26 08:04:17" + }, + { + "name": "symfony/css-selector", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "2851e1932d77ce727776154d659b232d061e816a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a", + "reference": "2851e1932d77ce727776154d659b232d061e816a", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2016-06-29 05:41:56" + }, + { + "name": "symfony/dependency-injection", + "version": "v2.8.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "f2b5a00d176f6a201dc430375c0ef37706ea3d12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f2b5a00d176f6a201dc430375c0ef37706ea3d12", + "reference": "f2b5a00d176f6a201dc430375c0ef37706ea3d12", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "conflict": { + "symfony/expression-language": "<2.6" + }, + "require-dev": { + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7" + }, + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "https://symfony.com", + "time": "2016-07-30 07:20:35" + }, + { + "name": "symfony/dom-crawler", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9", + "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "https://symfony.com", + "time": "2016-07-26 08:04:17" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.8.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8", + "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2016-07-28 16:56:28" + }, + { + "name": "symfony/filesystem", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "bb29adceb552d202b6416ede373529338136e84f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/bb29adceb552d202b6416ede373529338136e84f", + "reference": "bb29adceb552d202b6416ede373529338136e84f", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2016-07-20 05:44:26" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "dff51f72b0706335131b00a7f49606168c582594" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-05-18 14:26:46" + }, + { + "name": "symfony/process", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/04c2dfaae4ec56a5c677b0c69fac34637d815758", + "reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "time": "2016-07-28 11:13:48" + }, + { + "name": "symfony/translation", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "7713ddf81518d0823b027fe74ec390b80f6b6536" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/7713ddf81518d0823b027fe74ec390b80f6b6536", + "reference": "7713ddf81518d0823b027fe74ec390b80f6b6536", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/config": "<2.8" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.8|~3.0", + "symfony/intl": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" + }, + "suggest": { + "psr/log": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "https://symfony.com", + "time": "2016-07-26 08:04:17" + }, + { + "name": "symfony/yaml", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "1819adf2066880c7967df7180f4f662b6f0567ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac", + "reference": "1819adf2066880c7967df7180f4f662b6f0567ac", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2016-07-17 14:02:08" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/admin/closed_on_shipped.feature b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/admin/closed_on_shipped.feature new file mode 100644 index 00000000..9f9ce677 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/admin/closed_on_shipped.feature @@ -0,0 +1,15 @@ +@api @javascript +Feature: Orders are closed on shipped + As a store owner + I can mark the order as shipped + With Amazon then closing the order + + Scenario: Marking order complete closes order + When I am logged in as a user with the "administrator" role + And an Amazon order has been created + And I go to "/admin/commerce/orders" + When I click on Quick Edit link + Then I select "completed" from "status" + And I press "edit-save" + And I wait for AJAX loading to finish + And I take an awesome screenshot diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/amazon_checkout.feature b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/amazon_checkout.feature new file mode 100644 index 00000000..faa43cbb --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/amazon_checkout.feature @@ -0,0 +1,70 @@ +@api @javascript +Feature: Checkout with Amazon + As a customer + I can add items to my cart + With my cart I can checkout with Amazon + + Scenario: Checkout with Amazon (Physical) + When I set the Amazon setting "commerce_amazon_lpa_popup" to "redirect" + When I set the Amazon setting "commerce_amazon_lpa_authorization_mode" to "automatic_sync" + And I set the Amazon setting "commerce_amazon_lpa_capture_mode" to "shipment_capture" + When I go to "/storage-devices/commerce-guys-usb-key" + And I press "Add to cart" + When I go to "/bags-cases/commerce-guys-laptop-bag" + And I press "Add to cart" + When I go to "/cart" + And I wait for Amazon to load + Then I click the Pay with Amazon button + And I switch to popup + Then I fill in the following: + | email | matt+1@commerceguys.com | + | password | password | + And I press the "Sign in using our secure server" button + When I switch back to original window + Then I am on the checkout form + And I wait for Amazon to load + And I wait for the Amazon order reference + Then the Amazon address book exists + Then I press "Continue to next step" + And I should see "Shipping service" + Then I press "Continue to next step" + And I wait for Amazon to load + # Find better way to see if this is loaded. + And I wait for 3 seconds + Then I should see "Review order" + And the Amazon wallet exists + And the Amazon address book review exists + Then I press "Continue to next step" + Then I should see "Checkout complete" + + Scenario: Checkout with Amazon (Digital) + When I set the Amazon setting "commerce_amazon_lpa_popup" to "redirect" + When I set the Amazon setting array "commerce_amazon_lpa_digital_product_types" to '["storage_devices"]' + When I set the Amazon setting "commerce_amazon_lpa_authorization_mode" to "automatic_sync" + And I set the Amazon setting "commerce_amazon_lpa_capture_mode" to "shipment_capture" + When I go to "/storage-devices/commerce-guys-usb-key" + And I press "Add to cart" + When I go to "/cart" + And I wait for Amazon to load + Then I click the Pay with Amazon button + And I switch to popup + Then I fill in the following: + | email | matt+1@commerceguys.com | + | password | password | + And I press the "Sign in using our secure server" button + When I switch back to original window + Then I am on the checkout form + And I wait for Amazon to load + And I wait for the Amazon order reference + Then the Amazon address book does not exist + Then I press "Continue to next step" + And I wait for Amazon to load + # Find better way to see if this is loaded. + And I wait for 3 seconds + Then I should see "Review order" + And the Amazon wallet exists + And the Amazon address book review does not exist + Then I press "Continue to next step" + Then I should see "Checkout complete" + # Fkx up + When I set the Amazon setting "commerce_amazon_lpa_digital_product_types" to '["_none"]' diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/bootstrap/FailureContext.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/bootstrap/FailureContext.php new file mode 100644 index 00000000..d92acbd6 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/bootstrap/FailureContext.php @@ -0,0 +1,88 @@ +minkContext = $scope->getEnvironment()->getContext('Drupal\DrupalExtension\Context\MinkContext'); + $this->failurePath = $scope->getEnvironment()->getSuite()->getSetting('failure_path'); + } + + /** + * @AfterStep + */ + public function handleFailure(AfterStepScope $scope) { + + if ($scope->getTestResult()->isPassed()) { + return; + } + + $fileName = $this->fileName($scope); + $this->dumpMarkup($fileName); + $this->screenShot($fileName); + } + + /** + * @Then /^I take an awesome screenshot$/ + */ + public function takeScreenShot() { + $fileName = $this->fileName(); + $this->dumpMarkup($fileName); + $this->screenShot($fileName); + } + + /** + * Compute a file name for the output. + */ + protected function fileName($scope = NULL) { + if ($scope) { + $baseName = pathinfo($scope->getFeature()->getFile()); + $baseName = substr($baseName['basename'], 0 , strlen($baseName['basename']) - strlen($baseName['extension']) - 1); + $baseName .= '-' . $scope->getStep()->getLine(); + } + else { + $baseName = 'screenshot'; + } + + $baseName .= '-' . date('YmdHis'); + $baseName = $this->failurePath . '/' . $baseName; + return $baseName; + } + + /** + * Save the markup from the failed step. + */ + protected function dumpMarkup($fileName) { + $fileName .= '.html'; + $html = $this->minkContext->getSession()->getPage()->getHtml(); + file_put_contents($fileName, $html); + sprintf("HTML available at: %s\n", $fileName); + } + + /** + * Save a screen shot from the failed step. + */ + protected function screenShot($fileName) { + $fileName .= '.png'; + $driver = $this->minkContext->getSession()->getDriver(); + + if ($driver instanceof Selenium2Driver) { + file_put_contents($fileName, $this->minkContext->getSession()->getDriver()->getScreenshot()); + sprintf("Screen shot available at: %s\n", $fileName); + return; + } + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/bootstrap/FeatureContext.php b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/bootstrap/FeatureContext.php new file mode 100644 index 00000000..3b471f95 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/bootstrap/FeatureContext.php @@ -0,0 +1,304 @@ +getSession()->getPage()->clickLink('Quick edit'); + $this->getSession()->wait(5000, 'jQuery(".entity-commerce-order").length > 0'); + } + + /** + * @Given /^(?:|I )wait(?:| for) (\d+) seconds?$/ + * + * Wait for the given number of seconds. ONLY USE FOR DEBUGGING! + */ + public function iWaitForSeconds($arg1) { + sleep($arg1); + } + + /** + * @Given /^(?:|I )wait for AJAX loading to finish$/ + * + * Wait for the jQuery AJAX loading to finish. ONLY USE FOR DEBUGGING! + */ + public function iWaitForAJAX() { + $this->getSession()->wait(5000, 'jQuery.active === 0'); + } + + /** + * @When I resize the browser to mobile + */ + public function iResizeTheBrowserToMobile() { + $this->getSession()->resizeWindow(200, 600, 'current'); + } + + /** + * @BeforeScenario + */ + public function beforeScenario() { + if (!$this->runningJavascript()) { + return; + } + + $current_driver = $this->getSession()->getDriver(); + if ($current_driver instanceof \Behat\Mink\Driver\Selenium2Driver) { + } + + $this->getSession()->executeScript('window.name = "main_window"'); + $this->getSession()->resizeWindow(1440, 900, 'current'); + + $originalWindowName = $this->getSession()->getWindowName(); //Get the original name + + if (empty($this->originalWindowName)) { + $this->originalWindowName = $originalWindowName; + } + print $this->originalWindowName; + } + + /** + * Returns whether the scenario is running in a browser that can run Javascript or not. + * + * @return boolean + */ + protected function runningJavascript() { + return get_class($this->getSession() + ->getDriver()) !== 'Behat\Mink\Driver\GoutteDriver'; + } + + /** + * @Given I wait for Amazon to load + */ + public function amazonIsLoaded() { + $this->getSession()->wait(5000, 'typeof window.amazon !== "undefined"'); + } + + /** + * @Given I wait for the Amazon order reference + */ + public function amazonOrderReference() { + $this->getSession()->wait(5000, "document.getElementsByName('commerce_amazon_lpa_contract_id[reference_id]')[0].value !== ''"); + } + + /** + * @Then /^I switch to popup$/ + */ + public function iSwitchToPopup() { + $popupName = $this->getNewPopup($this->originalWindowName); + + //Switch to the popup Window + $this->getSession()->switchToWindow($popupName); + } + + /** + * @Then /^I switch back to original window$/ + */ + public function iSwitchBackToOriginalWindow() { + //Switch to the original window + $this->getSession()->switchToWindow($this->originalWindowName); + } + + /** + * This gets the window name of the new popup. + */ + private function getNewPopup($originalWindowName = NULL) { + //Get all of the window names first + $names = $this->getSession()->getWindowNames(); + + //Now it should be the last window name + $last = array_pop($names); + + if (!empty($originalWindowName)) { + while ($last == $originalWindowName && !empty($names)) { + $last = array_pop($names); + } + } + + return $last; + } + + /** + * @When I click the Login with Amazon button + */ + function clickLwAButton() { + $div = $this->getSession()->getPage()->find('xpath', '//div[@id="amazonloginbutton"]//img'); + if ($div === null) { + throw new ElementNotFoundException($this->getSession(), 'amazonloginbutton', 'xpath', '//div[@id="amazonloginbutton"]'); + } + $div->click(); + } + + /** + * @When I click the cart summary Pay with Amazon button + */ + function clickCartSummaryPwAButton() { + $div = $this->getSession()->getPage()->find('xpath', '//div[starts-with(@id, \'amazon-checkout-summary-link\')]//img'); + if ($div === null) { + throw new ElementNotFoundException($this->getSession(), 'amazonloginbutton', 'xpath', '//div[starts-with(@id, \'amazon-checkout-summary-link\')]//img'); + } + $div->click(); + } + + /** + * @When I click the Pay with Amazon button + */ + function clickPwAButton() { + $div = $this->getSession()->getPage()->find('xpath', '//div[starts-with(@id, "amazon_lpa_cart_pay")]//img'); + if ($div === null) { + throw new ElementNotFoundException($this->getSession(), 'amazonloginbutton', 'xpath', '//div[starts-with(@id, \'amazon-checkout-summary-link\')]//img'); + } + $div->click(); + } + + /** + * @Then I am on the checkout form + */ + function thenIAmOnTheCheckoutForm() { + $form = $this->getSession()->getPage()->find('xpath', '//form[@id="commerce-checkout-form-checkout"]'); + if ($form === null) { + throw new ElementNotFoundException($this->getSession(), 'amazonloginbutton', 'xpath', '//div[starts-with(@id, \'amazon-checkout-summary-link\')]//img'); + } + } + + /** + * @When the Amazon address book exists + */ + function amazonAddressBookExists() { + $addressbook_pane = $this->getSession()->getPage()->find('xpath', '//div[@id="checkout-amazon-addressbook"]'); + if ($addressbook_pane === null) { + throw new ElementNotFoundException($this->getSession()); + } + $addressbook_iframe = $this->getSession()->getPage()->find('xpath', '//div[@id="checkout-amazon-addressbook"]//iframe'); + if ($addressbook_iframe === null) { + throw new ElementNotFoundException($this->getSession()); + } + } + + /** + * @When the Amazon address book does not exist + */ + function amazonAddressBookNotExists() { + $addressbook_pane = $this->getSession()->getPage()->find('xpath', '//div[@id="checkout-amazon-addressbook"]'); + if ($addressbook_pane !== null) { + throw new ElementNotFoundException($this->getSession()); + } + } + + /** + * @When the Amazon address book review exists + */ + function amazonAddressBookReviewExists() { + $addressbook_pane = $this->getSession()->getPage()->find('xpath', '//div[@id="customer-profile-shipping"]'); + if ($addressbook_pane === null) { + throw new ElementNotFoundException($this->getSession()); + } + $addressbook_iframe = $this->getSession()->getPage()->find('xpath', '//div[@id="customer-profile-shipping"]//iframe'); + if ($addressbook_iframe === null) { + throw new ElementNotFoundException($this->getSession()); + } + } + + /** + * @When the Amazon address book review does not exist + */ + function amazonAddressBookReviewNotExists() { + $addressbook_pane = $this->getSession()->getPage()->find('xpath', '//div[@id="customer-profile-shipping"]'); + if ($addressbook_pane !== null) { + throw new ElementNotFoundException($this->getSession()); + } + } + + /** + * @When the Amazon wallet exists + */ + function amazonWalletExists() { + $addressbook_pane = $this->getSession()->getPage()->find('xpath', '//div[@id="walletwidgetdiv"]'); + if ($addressbook_pane === null) { + throw new ElementNotFoundException($this->getSession()); + } + $addressbook_iframe = $this->getSession()->getPage()->find('xpath', '//div[@id="walletwidgetdiv"]//iframe'); + if ($addressbook_iframe === null) { + throw new ElementNotFoundException($this->getSession()); + } + } + + /** + * @Then I set the Amazon setting :name to :value + */ + function setAmazonCheckoutSetting($name, $value) { + /** @var \Drupal\Driver\DrushDriver $drush */ + $drush = $this->getDriver('drush'); + + if (is_bool($value)) { + $value = (bool) $value; + } + + $drush->drush("variable-set $name $value"); + } + + /** + * @Then I set the Amazon setting array :name to :value + */ + function setAmazonCheckoutArraySetting($name, $value) { + /** @var \Drupal\Driver\DrushDriver $drush */ + $drush = $this->getDriver('drush'); + $output = $drush->drush("variable-set", array($name, sprintf("'%s'", $value)), array('format' => 'json')); + } + + /** + * @When an Amazon order has been created + */ + public function createAmazonOrder() { + $this->setAmazonCheckoutArraySetting('commerce_amazon_lpa_popup', 'redirect'); + $this->setAmazonCheckoutArraySetting('commerce_amazon_lpa_authorization_mode', 'automatic_sync'); + $this->setAmazonCheckoutArraySetting('commerce_amazon_lpa_capture_mode', 'shipment_capture'); + + $this->visitPath('/storage-devices/commerce-guys-usb-key'); + $this->getSession()->getPage()->pressButton('Add to cart'); + + $this->visitPath('/cart'); + $this->amazonIsLoaded(); + $this->clickPwAButton(); + $this->iSwitchToPopup(); + $this->getSession()->getPage()->fillField('email', 'matt+1@commerceguys.com'); + $this->getSession()->getPage()->fillField('password', 'password'); + $this->getSession()->getPage()->pressButton('Sign in using our secure server'); + $this->iSwitchBackToOriginalWindow(); + + $this->thenIAmOnTheCheckoutForm(); + $this->amazonIsLoaded(); + $this->amazonOrderReference(); + $this->amazonAddressBookExists(); + $this->getSession()->getPage()->pressButton('Continue to next step'); + $this->getSession()->getPage()->pressButton('Continue to next step'); + $this->amazonIsLoaded(); + $this->iWaitForSeconds(3); + $this->amazonWalletExists(); + $this->amazonAddressBookReviewExists(); + $this->getSession()->getPage()->pressButton('Continue to next step'); + $this->assertSession()->pageTextContains('Checkout complete'); + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/cart_summary_link.feature b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/cart_summary_link.feature new file mode 100644 index 00000000..109e2062 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/cart_summary_link.feature @@ -0,0 +1,19 @@ +@api @javascript +Feature: Cart summary link for Amazon + As a customer + I can click Pay with Amazon + From my cart widget + + Scenario: I can click the pay with Amazon button in cart widget + When I go to "/storage-devices/commerce-guys-usb-key" + And I press "Add to cart" + Then I click the cart summary Pay with Amazon button + And I switch to popup + Then I fill in the following: + | email | matt+1@commerceguys.com | + | password | password | + And I press the "Sign in using our secure server" button + When I switch back to original window + And I wait for AJAX loading to finish + Then I am on the checkout form + And I should see "Storage 1" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/login.feature b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/login.feature new file mode 100644 index 00000000..3d2b8071 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/login.feature @@ -0,0 +1,37 @@ +@api @javascript +Feature: Login with Amazon + As an anonymous user + I should be able to Login + + Scenario: Log in with Amazon + When I go to "/user/login" + And I wait for Amazon to load + When I click the Login with Amazon button + And I switch to popup + Then I fill in the following: + | email | matt+1@commerceguys.com | + | password | password | + And I press the "Sign in using our secure server" button + When I switch back to original window + Then I should see "Account information" + + Scenario: As a user, I can create an order, log in, and my cart persists. + When I go to "/bags-cases/commerce-guys-laptop-bag" + And I press "Add to cart" + When I go to "/user/login" + And I wait for Amazon to load + When I click the Login with Amazon button + And I switch to popup + Then I fill in the following: + | email | matt+1@commerceguys.com | + | password | password | + And I press the "Sign in using our secure server" button + When I switch back to original window + Then I should see "Account information" + When I go to "/cart" + Then I should see "LAP1-BLK-13" + And I should see "£50.40" + # Clean up. + Then I press "Remove" + And I should see "Laptop Bag 1 removed from your cart." + diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/sandbox/auth_amazon_rejected.feature b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/sandbox/auth_amazon_rejected.feature new file mode 100644 index 00000000..b57662f0 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_amazon_lpa/tests/behat/features/sandbox/auth_amazon_rejected.feature @@ -0,0 +1,41 @@ +@api @javascript +Feature: Sandbox: Testing rejected authorizations + As store owner + Amazon module should handle rejected authorizations + + Background: + When I set the Amazon setting "commerce_amazon_lpa_popup" to "redirect" + When I set the Amazon setting "commerce_amazon_lpa_authorization_mode" to "automatic_sync" + And I set the Amazon setting "commerce_amazon_lpa_capture_mode" to "shipment_capture" + And I set the Amazon setting "commerce_amazon_lpa_simulation" to "Authorizations_AmazonRejected" + + Scenario: Sync auth with Amazon Rejected + When I go to "/bags-cases/commerce-guys-laptop-bag" + And I press "Add to cart" + When I go to "/cart" + And I wait for Amazon to load + Then I click the Pay with Amazon button + And I switch to popup + Then I fill in the following: + | email | matt+1@commerceguys.com | + | password | password | + And I press the "Sign in using our secure server" button + When I switch back to original window + Then I am on the checkout form + And I wait for Amazon to load + And I wait for the Amazon order reference + Then the Amazon address book exists + Then I press "Continue to next step" + And I should see "Shipping service" + Then I press "Continue to next step" + And I wait for Amazon to load + # Find better way to see if this is loaded. + And I wait for 3 seconds + Then I should see "Review order" + And the Amazon wallet exists + And the Amazon address book review exists + Then I press "Continue to next step" + Then I should see "Shopping cart" + And I should see "Your order could not be completed, please select a different payment method." + And I should see "Your shopping cart is empty." + And I set the Amazon setting "commerce_amazon_lpa_simulation" to "_none" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.api.php b/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.api.php new file mode 100644 index 00000000..ed8d9c96 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.api.php @@ -0,0 +1,41 @@ +=')) { + if (isset($info['version']) && version_compare($info['version'], '7.x-2', '<')) { $requirements['commerce_authnet_cardonfile'] = array( 'title' => $t('Card on File'), 'value' => $t('Less than 2.x'), diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.module b/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.module index d54d1e26..24051b12 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_authnet/commerce_authnet.module @@ -108,7 +108,7 @@ function commerce_authnet_aim_void_access($order, $transaction) { // Return FALSE if it is more than 24 hours since the last update to the // transaction, as it will already have been settled. - if (time() - $transaction->changed > 2600 * 24) { + if (time() - $transaction->changed > 3600 * 24) { return FALSE; } @@ -157,6 +157,7 @@ function commerce_authnet_commerce_payment_method_info() { 'display_title' => t('Credit card'), 'description' => t('Integrates Authorize.Net Advanced Integration Method for card not present CC transactions.'), 'cardonfile' => array( + 'create callback' => 'commerce_authnet_cim_cardonfile_create', 'charge callback' => 'commerce_authnet_cim_cardonfile_charge', 'update callback' => 'commerce_authnet_cim_cardonfile_update', 'delete callback' => 'commerce_authnet_cim_cardonfile_delete', @@ -329,11 +330,19 @@ function commerce_authnet_aim_submit_form_validate($payment_method, $pane_form, * Payment method callback: checkout form submission. */ function commerce_authnet_aim_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge) { - // If the customer specified payment using a card on file, attempt that now - // and simply return the result. - if (module_exists('commerce_cardonfile') && $payment_method['settings']['cardonfile'] && - !empty($pane_values['cardonfile']) && $pane_values['cardonfile'] !== 'new') { - return commerce_authnet_cim_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge); + // If Card on File is enabled and active for this payment method, then we need + // to figure out what to do. + if (module_exists('commerce_cardonfile') && $payment_method['settings']['cardonfile'] && !empty($pane_values['cardonfile'])) { + if (!empty($pane_values['cardonfile']) && $pane_values['cardonfile'] !== 'new') { + // We're using a stored payment profile. Pass it along to CIM. + return commerce_authnet_cim_submit_form_submit($payment_method, $pane_form, $pane_values, $order, $charge); + } + else { + if (!empty($pane_values['credit_card']['cardonfile_store']) && $pane_values['credit_card']['cardonfile_store']) { + // We've got a request to store a new card. + return commerce_authnet_cim_submit_new_card_form_submit($payment_method, $pane_form, $pane_values, $order, $charge); + } + } } // Determine the credit card type if possible for use in later code. @@ -363,7 +372,7 @@ function commerce_authnet_aim_submit_form_submit($payment_method, $pane_form, $p $transaction->message = t('Invalid @amount transaction not attempted.', array('@amount' => commerce_currency_format($charge['amount'], $charge['currency_code']))); commerce_payment_transaction_save($transaction); - drupal_set_message('We encountered an error processing your transaction. Please contact us to resolve the issue.', 'error'); + drupal_set_message(t('We encountered an error processing your transaction. Please contact us to resolve the issue.'), 'error'); return FALSE; } } @@ -418,7 +427,7 @@ function commerce_authnet_aim_submit_form_submit($payment_method, $pane_form, $p ); // Prepare the billing address for use in the request. - if ($order_wrapper->commerce_customer_billing->value()){ + if (isset($order->commerce_customer_billing) && $order_wrapper->commerce_customer_billing->value()) { $billing_address = $order_wrapper->commerce_customer_billing->commerce_customer_address->value(); if (empty($billing_address['first_name'])) { @@ -439,8 +448,28 @@ function commerce_authnet_aim_submit_form_submit($payment_method, $pane_form, $p 'x_country' => $billing_address['country'], ); } - else { - $billing_address = array(); + + // Prepare the shipping address for use in the request. + if (isset($order->commerce_customer_shipping) && $order_wrapper->commerce_customer_shipping->value()) { + $shipping_address = $order_wrapper->commerce_customer_shipping->commerce_customer_address->value(); + + if (empty($shipping_address['first_name'])) { + $name_parts = explode(' ', $shipping_address['name_line']); + $shipping_address['first_name'] = array_shift($name_parts); + $shipping_address['last_name'] = implode(' ', $name_parts); + } + + $nvp += array( + // Customer shipping Address + 'x_ship_to_first_name' => substr($shipping_address['first_name'], 0, 50), + 'x_ship_to_last_name' => substr($shipping_address['last_name'], 0, 50), + 'x_ship_to_company' => substr($shipping_address['organisation_name'], 0, 50), + 'x_ship_to_address' => substr($shipping_address['thoroughfare'], 0, 60), + 'x_ship_to_city' => substr($shipping_address['locality'], 0, 40), + 'x_ship_to_state' => substr($shipping_address['administrative_area'], 0, 40), + 'x_ship_to_zip' => substr($shipping_address['postal_code'], 0, 20), + 'x_ship_to_country' => $shipping_address['country'], + ); } // Submit the request to Authorize.Net. @@ -502,151 +531,182 @@ function commerce_authnet_aim_submit_form_submit($payment_method, $pane_form, $p drupal_set_message(check_plain($response[3]), 'error'); return FALSE; } +} - // If Card on File storage is enabled via CIM and the form says to store data... - if (module_exists('commerce_cardonfile') && !empty($payment_method['settings']['cardonfile']) && - !empty($pane_values['credit_card']['cardonfile_store']) && $pane_values['credit_card']['cardonfile_store']) { - // Build a payment details array for the credit card. - $payment_details = array( - 'cardNumber' => $pane_values['credit_card']['number'], - 'expirationDate' => $pane_values['credit_card']['exp_year'] . '-' . $pane_values['credit_card']['exp_month'], +/** + * Implements hook_form_FORM_ID_alter(). + */ +function commerce_authnet_form_commerce_payment_order_transaction_add_form_alter(&$form, &$form_state) { + // If the payment terminal is displayed for an authnet_aim transaction... + if (!empty($form['payment_terminal']) && $form_state['payment_method']['method_id'] == 'authnet_aim') { + // Add a select list to let the administrator choose a different transaction + // type than the payment method's default. + $form['payment_terminal']['payment_details']['txn_type'] = array( + '#type' => 'select', + '#title' => t('Transaction type'), + '#options' => array( + COMMERCE_CREDIT_AUTH_ONLY => t('Authorization only'), + COMMERCE_CREDIT_AUTH_CAPTURE => t('Authorization and capture'), + ), + '#default_value' => $form_state['payment_method']['settings']['txn_type'], ); + } +} - if (isset($pane_values['credit_card']['code'])) { - $payment_details['cardCode'] = $pane_values['credit_card']['code']; - } +/** + * Handles advanced logic relating to creating CIM orders with new card data. + * + * @see commerce_authnet_aim_submit_form_submit() + */ +function commerce_authnet_cim_submit_new_card_form_submit($payment_method, $pane_form, $pane_values, $order, $charge) { + // At this point, we have a few choices to make. We know the user is logged in + // and so we know if they have any existing card on file profiles. If they do + // not, then we can assume that they need a new profile. If they do have one, + // then we need take appropriate steps to add the CC info to the existing + // profile and process the payment based on their profile. + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); - // First look to see if we already have cards on file for the user. - $stored_cards = commerce_cardonfile_load_multiple_by_uid($order->uid, $payment_method['instance_id']); - $add_to_profile = NULL; + $payment_details = array( + 'cardNumber' => $pane_values['credit_card']['number'], + 'expirationDate' => $pane_values['credit_card']['exp_year'] . '-' . $pane_values['credit_card']['exp_month'], + ); - // If we didn't find any, attempt to make a new Customer Profile now. - if (empty($stored_cards)) { - // Submit a CIM request to create the Customer Profile. - if ($response = commerce_authnet_cim_create_customer_profile_request($payment_method, $order, $payment_details)) { - // If the Customer Profile creation was a success, store the new card on - // file data locally. - if ((string) $response->messages->resultCode == 'Ok') { - // Build a remote ID that includes the Customer Profile ID and the - // Payment Profile ID. - $remote_id = (string) $response->customerProfileId . '|' . (string) $response->customerPaymentProfileIdList->numericString; + if (isset($pane_values['credit_card']['code'])) { + $payment_details['cardCode'] = $pane_values['credit_card']['code']; + } - $card_data = commerce_cardonfile_new(); - $card_data->uid = $order->uid; - $card_data->payment_method = $payment_method['method_id']; - $card_data->instance_id = $payment_method['instance_id']; - $card_data->remote_id = $remote_id; - $card_data->card_type = !empty($card_type) ? $card_type : 'card'; - $card_data->card_name = !empty($billing_address['name_line']) ? $billing_address['name_line'] : ''; - $card_data->card_number = substr($pane_values['credit_card']['number'], -4); - $card_data->card_exp_month = $pane_values['credit_card']['exp_month']; - $card_data->card_exp_year = $pane_values['credit_card']['exp_year']; - $card_data->status = 1; - - // Save and log the creation of the new card on file. - commerce_cardonfile_save($card_data); - watchdog('commerce_authnet', 'CIM Customer Profile @profile_id created and saved to user @uid.', array('@profile_id' => (string) $response->customerProfileId, '@uid' => $order->uid)); - } - elseif ((string) $response->messages->message->code == 'E00039') { - // But if a Customer Profile already existed for this user, attempt - // instead to add this card as a new Payment Profile to it. - $result = array_filter(explode(' ', (string) $response->messages->message->text), 'is_numeric'); - $add_to_profile = reset($result); - } - } - } - else { - // Extract the user's Customer Profile ID from the first card's remote ID. - $card_data = reset($stored_cards); - list($cim_customer_profile_id, $cim_payment_profile_id) = explode('|', $card_data->remote_id); + // Prepare the billing address for use in the request. + if (isset($order->commerce_customer_billing) && $order_wrapper->commerce_customer_billing->value()) { + $billing_address = $order_wrapper->commerce_customer_billing->commerce_customer_address->value(); - // Attempt to add the card as a new payment profile to this Customer Profile. - $add_to_profile = $cim_customer_profile_id; + if (empty($billing_address['first_name'])) { + $name_parts = explode(' ', $billing_address['name_line']); + $billing_address['first_name'] = array_shift($name_parts); + $billing_address['last_name'] = implode(' ', $name_parts); } + } + + $remote_id = FALSE; - // Attempt to add the card to an existing Customer Profile if specified. - if (!empty($add_to_profile)) { - $response = commerce_authnet_cim_create_customer_payment_profile_request($payment_method, $add_to_profile, $order, $payment_details); + // First look to see if we already have cards on file for the user. + $stored_cards = array(); + if (!user_is_anonymous()) { + $stored_cards = commerce_cardonfile_load_multiple_by_uid($order->uid, $payment_method['instance_id']); + } + $add_to_profile = NULL; - // If the Payment Profile creation was a success, store the new card on + if (empty($stored_cards)) { + // We do not, create the profile (which includes the payment details). + if ($response = commerce_authnet_cim_create_customer_profile_request($payment_method, $order, $payment_details)) { + // If the Customer Profile creation was a success, store the new card on // file data locally. if ((string) $response->messages->resultCode == 'Ok') { - // Build a remote ID that includes the Customer Profile ID and the new + // Build a remote ID that includes the Customer Profile ID and the // Payment Profile ID. - $remote_id = $add_to_profile . '|' . (string) $response->customerPaymentProfileId; - - $card_data = commerce_cardonfile_new(); - $card_data->uid = $order->uid; - $card_data->payment_method = $payment_method['method_id']; - $card_data->instance_id = $payment_method['instance_id']; - $card_data->remote_id = $remote_id; - $card_data->card_type = !empty($card_type) ? $card_type : 'card'; - $card_data->card_name = !empty($billing_address['name_line']) ? $billing_address['name_line'] : ''; - $card_data->card_number = substr($pane_values['credit_card']['number'], -4); - $card_data->card_exp_month = $pane_values['credit_card']['exp_month']; - $card_data->card_exp_year = $pane_values['credit_card']['exp_year']; - $card_data->status = 1; - - // Save and log the creation of the new card on file. - commerce_cardonfile_save($card_data); - watchdog('commerce_authnet', 'CIM Payment Profile added to Customer Profile @profile_id for user @uid.', array('@profile_id' => $add_to_profile, '@uid' => $order->uid)); + $remote_id = (string) $response->customerProfileId . '|' . (string) $response->customerPaymentProfileIdList->numericString; + } + elseif ((string) $response->messages->message->code == 'E00039') { + // But if a Customer Profile already existed for this user, attempt + // instead to add this card as a new Payment Profile to it. + $result = array_filter(explode(' ', (string) $response->messages->message->text), 'is_numeric'); + $add_to_profile = reset($result); } - elseif (!empty($card_data) && (string) $response->messages->message->code == 'E00040') { - // But if we could not find a customer profile, assume the existing - // customer profile ID we had is no longer valid and deactivate the card - // data that resulted in the error. - $card_data->status = 0; - commerce_cardonfile_save($card_data); - - // Submit a CIM request to create the Customer Profile. - if ($response = commerce_authnet_cim_create_customer_profile_request($payment_method, $order, $payment_details)) { - // If the Customer Profile creation was a success, store the new card on - // file data locally. - if ((string) $response->messages->resultCode == 'Ok') { - // Build a remote ID that includes the Customer Profile ID and the - // Payment Profile ID. - $remote_id = (string) $response->customerProfileId . '|' . (string) $response->customerPaymentProfileIdList->numericString; - - $card_data = commerce_cardonfile_new(); - $card_data->uid = $order->uid; - $card_data->payment_method = $payment_method['method_id']; - $card_data->instance_id = $payment_method['instance_id']; - $card_data->remote_id = $remote_id; - $card_data->card_type = !empty($card_type) ? $card_type : 'card'; - $card_data->card_name = !empty($billing_address['name_line']) ? $billing_address['name_line'] : ''; - $card_data->card_number = substr($pane_values['credit_card']['number'], -4); - $card_data->card_exp_month = $pane_values['credit_card']['exp_month']; - $card_data->card_exp_year = $pane_values['credit_card']['exp_year']; - $card_data->status = 1; - - // Save and log the creation of the new card on file. - commerce_cardonfile_save($card_data); - watchdog('commerce_authnet', 'CIM Customer Profile @profile_id created and saved to user @uid.', array('@profile_id' => (string) $response->customerProfileId, '@uid' => $order->uid)); + } + } + else { + // Extract the user's Customer Profile ID from the first card's remote ID. + $card_data = reset($stored_cards); + list($cim_customer_profile_id, ) = explode('|', $card_data->remote_id); + + // Attempt to add the card as a new payment profile to this Customer Profile. + $add_to_profile = $cim_customer_profile_id; + } + + // Attempt to add the card to an existing Customer Profile if specified. + if (!empty($add_to_profile)) { + $response = commerce_authnet_cim_create_customer_payment_profile_request($payment_method, $add_to_profile, $order, $payment_details); + // If the Payment Profile creation was a success, store the new card on + // file data locally. + if ((string) $response->messages->resultCode == 'Ok' || (string) $response->messages->message->code == 'E00039') { + // If we got a duplicate code, then the payment profile + // at Authorize.Net and needs to be represented locally. + if ((string) $response->messages->message->code == 'E00039') { + $cim_profile_response = commerce_authnet_cim_get_customer_profile_request($payment_method, $add_to_profile); + if ((string) $cim_profile_response->messages->resultCode == 'Ok') { + // Inspect the returned payment profiles to find the one that + // generated the duplicate error code. + $cim_payment_profiles = $cim_profile_response->profile->paymentProfiles; + if (!is_array($cim_payment_profiles)) { + $cim_payment_profiles = array($cim_payment_profiles); + } + + foreach ($cim_payment_profiles as $key => $payment_profile) { + // We match the submitted values against the existing payment + // profiles using the last 4 digits of the card number. This could + // potentially create a conflict if the same customer has two + // different cards that end in the same four digits, but that is + // highly unlikely. + if (substr($pane_values['credit_card']['number'], -4) == substr($payment_profile->payment->creditCard->cardNumber, -4)) { + $payment_profile_id = (string) $payment_profile->customerPaymentProfileId; + break; + } } } } + else { + $payment_profile_id = (string) $response->customerPaymentProfileId; + } + + // Build a remote ID that includes the customer profile ID and the new + // or existing payment profile ID. We don't do any check here to ensure + // we found a payment profile ID, as we shouldn't have got a duplicate + // error if it didn't actually exist. + $remote_id = $add_to_profile . '|' . $payment_profile_id; + } + elseif ($response->messages->message->code == 'E00040') { + // But if we could not find a customer profile, create a new one. + if ($response = commerce_authnet_cim_create_customer_profile_request($payment_method, $order, $payment_details)) { + // If the Customer Profile creation was a success, store the new card on + // file data locally. + if ((string) $response->messages->resultCode == 'Ok') { + // Build a remote ID that includes the Customer Profile ID and the + // Payment Profile ID. + $remote_id = (string) $response->customerProfileId . '|' . (string) $response->customerPaymentProfileIdList->numericString; + } + } } } -} -/** - * Implements hook_form_FORM_ID_alter(). - */ -function commerce_authnet_form_commerce_payment_order_transaction_add_form_alter(&$form, &$form_state) { - // If the payment terminal is displayed for an authnet_aim transaction... - if (!empty($form['payment_terminal']) && $form_state['payment_method']['method_id'] == 'authnet_aim') { - // Add a select list to let the administrator choose a different transaction - // type than the payment method's default. - $form['payment_terminal']['payment_details']['txn_type'] = array( - '#type' => 'select', - '#title' => t('Transaction type'), - '#options' => array( - COMMERCE_CREDIT_AUTH_ONLY => t('Authorization only'), - COMMERCE_CREDIT_AUTH_CAPTURE => t('Authorization and capture'), - ), - '#default_value' => $form_state['payment_method']['settings']['txn_type'], - ); + // We couldn't store a profile. Abandon ship! + if (!$remote_id) { + return FALSE; } + + // Build our card for storing with card on file. + $card_data = commerce_cardonfile_new(); + $card_data->uid = $order->uid; + $card_data->payment_method = $payment_method['method_id']; + $card_data->instance_id = $payment_method['instance_id']; + $card_data->remote_id = $remote_id; + $card_data->card_type = !empty($card_type) ? $card_type : 'card'; + $card_data->card_name = !empty($billing_address['name_line']) ? $billing_address['name_line'] : ''; + $card_data->card_number = substr($pane_values['credit_card']['number'], -4); + $card_data->card_exp_month = $pane_values['credit_card']['exp_month']; + $card_data->card_exp_year = $pane_values['credit_card']['exp_year']; + $card_data->status = 1; + + // Save and log the creation of the new card on file. + commerce_cardonfile_save($card_data); + + if ($add_to_profile) { + watchdog('commerce_authnet', 'CIM Payment Profile added to Customer Profile @profile_id for user @uid.', array('@profile_id' => $add_to_profile, '@uid' => $order->uid)); + } + else { + watchdog('commerce_authnet', 'CIM Customer Profile @profile_id created and saved to user @uid.', array('@profile_id' => (string) $response->customerProfileId, '@uid' => $order->uid)); + } + + // Process the payment + return commerce_authnet_cim_cardonfile_charge($payment_method, $card_data, $order, $charge); } /** @@ -708,6 +768,235 @@ function commerce_authnet_form_commerce_cardonfile_update_form_alter(&$form, &$f } } +/** + * Implements hook_form_FORM_ID_alter(). + * + * Adds a commerce customer billing address field to the cardonfile form. + */ +function commerce_authnet_form_commerce_cardonfile_card_form_alter(&$form, &$form_state) { + // Make sure this is the right payment method and the cardonfile create form. + if ($form_state['card']->payment_method == 'authnet_aim' && $form_state['op'] == 'create') { + + // Hide the existing name field. + $form['credit_card']['owner']['#access'] = FALSE; + + // Create a billing profile object and add the address form. + $profile = commerce_customer_profile_new('billing', $form_state['card']->uid); + $form_state['commerce_customer_profile'] = $profile; + $form['commerce_customer_profile'] = array(); + field_attach_form('commerce_customer_profile', $profile, $form['commerce_customer_profile'], $form_state); + + $form['commerce_customer_profile']['#weight'] = -1; + + // Add a validation callback so that we can call field_attach functions. + $form['#validate'][] = 'commerce_authnet_cim_cardonfile_create_validate'; + } +} + +/** + * Validation callback for card on file create. + */ +function commerce_authnet_cim_cardonfile_create_validate($form, &$form_state) { + $profile = $form_state['commerce_customer_profile']; + field_attach_form_validate('commerce_customer_profile', $profile, $form['commerce_customer_profile'], $form_state); +} + +/** + * Commerce Card on File create callback. + * + * @param array $form + * The card on file create form. + * @param array $form_state + * The card on file create form state. + * @param array $payment_method + * The payment method for the card on file request. + * @param object $card_data + * The commerce_cardonfile entity. + * + * @return object|bool + * A new commerce_cardonfile entity or FALSE if there was an error. + */ +function commerce_authnet_cim_cardonfile_create($form, &$form_state, $payment_method, $card_data) { + $account = user_load($card_data->uid); + + // Submit the profile to the field attach handlers. + $profile = $form_state['commerce_customer_profile']; + field_attach_submit('commerce_customer_profile', $profile, $form['commerce_customer_profile'], $form_state); + commerce_customer_profile_save($profile); + + // Format the address into the Auth.net schema. + $profile_wrapper = entity_metadata_wrapper('commerce_customer_profile', $profile); + $billto = commerce_authnet_cim_billto_array(NULL, $profile_wrapper->commerce_customer_address->value()); + + // Build the card data to submit to Auth.net. + $number = $form_state['values']['credit_card']['number']; + $card_data->card_exp_month = $form_state['values']['credit_card']['exp_month']; + $card_data->card_exp_year = $form_state['values']['credit_card']['exp_year']; + $card_expire = $card_data->card_exp_year . '-' . $card_data->card_exp_month; + $card_code = $form_state['values']['credit_card']['code']; + $card_type = $form_state['values']['credit_card']['type']; + + // Attempt to load and existing profile id from the customers card data. + $existing_cards = commerce_cardonfile_load_multiple_by_uid($account->uid, $payment_method['instance_id']); + + // Check for a remote ID. + $remote_id = NULL; + if (!empty($existing_cards)) { + $existing_card = reset($existing_cards); + $remote_id = $existing_card->remote_id; + } + + if ($remote_id) { + // Extract the profile id from the remote id. + list($cim_customer_profile_id, $cim_customer_payment_id) = explode('|', $remote_id); + + // Build a request to add a new payment method to an existing profile. + $api_request_data = array( + 'customerProfileId' => $cim_customer_profile_id, + 'paymentProfile' => array( + 'billTo' => $billto, + 'payment' => array( + 'creditCard' => array( + 'cardNumber' => $number, + 'expirationDate' => $card_expire, + 'cardCode' => $card_code, + ), + ), + ), + ); + + $xml_response = commerce_authnet_cim_request($payment_method, 'createCustomerPaymentProfileRequest', $api_request_data); + + } + else { + // There isn't a profile ID to extract + $cim_customer_profile_id = NULL; + + // Build a request to create a profile and add payment method to it. + $api_request_data = array( + 'profile' => array( + 'merchantCustomerId' => $account->uid, + 'description' => $billto['firstName'] . ' ' . $billto['lastName'], + 'email' => $account->mail, + 'paymentProfiles' => array( + 'billTo' => $billto, + 'payment' => array( + 'creditCard' => array( + 'cardNumber' => $number, + 'expirationDate' => $card_expire, + 'cardCode' => $card_code, + ), + ), + ), + ), + ); + + $xml_response = commerce_authnet_cim_request($payment_method, 'createCustomerProfileRequest', $api_request_data); + } + + if ((string) $xml_response->messages->resultCode == 'Ok') { + // Build a remote ID that includes the Customer Profile ID and the + // Payment Profile ID. + if ($cim_customer_profile_id) { + $remote_id = $cim_customer_profile_id . '|' . (string) $xml_response->customerPaymentProfileId; + } + else { + $remote_id = (string) $xml_response->customerProfileId . '|' . (string) $xml_response->customerPaymentProfileIdList->numericString; + } + + $card_data_wrapper = entity_metadata_wrapper('commerce_cardonfile', $card_data); + $card_data->uid = $account->uid; + $card_data->remote_id = $remote_id; + $card_data->card_type = $card_type; + $card_data->card_name = $billto['firstName'] . ' ' . $billto['lastName']; + $card_data->card_number = substr($number, -4); + $card_data->status = 1; + $card_data_wrapper->commerce_cardonfile_profile = $profile; + + return $card_data; + + } + elseif ((string) $xml_response->messages->message->code == 'E00039') { + // But if a Customer Profile already existed for this user, attempt + // instead to add this card as a new Payment Profile to it. + $result = array_filter(explode(' ', (string) $xml_response->messages->message->text), 'is_numeric'); + $add_to_profile = reset($result); + + // Build a request to add a new payment method to an existing profile. + $api_request_data = array( + 'customerProfileId' => $add_to_profile, + 'paymentProfile' => array( + 'billTo' => $billto, + 'payment' => array( + 'creditCard' => array( + 'cardNumber' => $number, + 'expirationDate' => $card_expire, + 'cardCode' => $card_code, + ), + ), + ), + ); + + $xml_response = commerce_authnet_cim_request($payment_method, 'createCustomerPaymentProfileRequest', $api_request_data); + + if ((string) $xml_response->messages->resultCode == 'Ok' || (string) $xml_response->messages->message->code == 'E00039') { + // If we got a duplicate code, then the payment profile already exists + // at Authorize.Net and needs to be represented locally. + if ((string) $xml_response->messages->message->code == 'E00039') { + $cim_profile_response = commerce_authnet_cim_get_customer_profile_request($payment_method, $add_to_profile); + if ((string) $cim_profile_response->messages->resultCode == 'Ok') { + // Inspect the returned payment profiles to find the one that + // generated the duplicate error code. + $cim_payment_profiles = $cim_profile_response->profile->paymentProfiles; + if (!is_array($cim_payment_profiles)) { + $cim_payment_profiles = array($cim_payment_profiles); + } + + foreach ($cim_payment_profiles as $key => $payment_profile) { + // We match the submitted values against the existing payment + // profiles using the last 4 digits of the card number. This could + // potentially create a conflict if the same customer has two + // different cards that end in the same four digits, but that is + // highly unlikely. + if (substr($number, -4) == substr($payment_profile->payment->creditCard->cardNumber, -4)) { + $payment_profile_id = (string) $payment_profile->customerPaymentProfileId; + break; + } + } + } + } + else { + $payment_profile_id = (string) $xml_response->customerPaymentProfileId; + } + + // Build a remote ID that includes the customer profile ID and the new + // or existing payment profile ID. We don't do any check here to ensure + // we found a payment profile ID, as we shouldn't have got a duplicate + // error if it didn't actually exist. + $remote_id = $add_to_profile . '|' . $payment_profile_id; + + $card_data_wrapper = entity_metadata_wrapper('commerce_cardonfile', $card_data); + $card_data->uid = $account->uid; + $card_data->remote_id = $remote_id; + $card_data->card_type = $card_type; + $card_data->card_name = $billto['firstName'] . ' ' . $billto['lastName']; + $card_data->card_number = substr($number, -4); + $card_data->status = 1; + $card_data_wrapper->commerce_cardonfile_profile = $profile; + + return $card_data; + } + else { + // Provide the user with information on the failure if it exists. + if (!empty($xml_response->messages->message->text)) { + drupal_set_message(t('Error: @error', array('@error' => (string) $xml_response->messages->message->text)), 'error'); + } + } + } + + return FALSE; +} + /** * Card on file callback: background charge payment * @@ -749,7 +1038,7 @@ function commerce_authnet_cim_cardonfile_charge($payment_method, $card_data, $or ), ), ), - 'extraOptions' => '', + 'extraOptions' => '', ); // If we get a response from the API server... @@ -811,7 +1100,7 @@ function commerce_authnet_cim_cardonfile_charge($payment_method, $card_data, $or return FALSE; } - return; + return (isset($transaction->status)) ? $transaction->status : TRUE; } elseif ((string) $xml_response->messages->message->code == 'E00040') { // If the response indicated a non-existent profile, deactive it now. @@ -834,7 +1123,8 @@ function commerce_authnet_cim_cardonfile_update($form, &$form_state, $payment_me // Extract the Customer Profile and Payment Profile IDs from the remote_id. list($cim_customer_profile_id, $cim_payment_profile_id) = explode('|', $card_data->remote_id); - if ($form_state['values']['credit_card']['number'] != $form['credit_card']['number']['#default_value']) { + if (!empty($form_state['values']['credit_card']['number']) && + $form_state['values']['credit_card']['number'] != $form['credit_card']['number']['#default_value']) { $number = $form_state['values']['credit_card']['number']; } else { @@ -904,14 +1194,20 @@ function commerce_authnet_cim_cardonfile_delete($form, &$form_state, $payment_me * * @param $order * The order object containing the billing information used for the billTo. + * @param $billing_address + * Optional. A commerce_customer_address field value array to use when the + * order object is empty; useful for generating an API request when you do not + * have an order object. * * @return * An array used to generate the billTo XML in CIM API requests. */ -function commerce_authnet_cim_billto_array($order) { - // Prepare the billing address for use in the request. - $order_wrapper = entity_metadata_wrapper('commerce_order', $order); - $billing_address = $order_wrapper->commerce_customer_billing->commerce_customer_address->value(); +function commerce_authnet_cim_billto_array($order, $billing_address = NULL) { + // If an order was given, prepare the billing address for use in this request. + if (!empty($order)) { + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $billing_address = $order_wrapper->commerce_customer_billing->commerce_customer_address->value(); + } // Ensure we have a first and last name in the address. if (empty($billing_address['first_name'])) { @@ -925,6 +1221,11 @@ function commerce_authnet_cim_billto_array($order) { $billing_address['administrative_area'] = $billing_address['locality']; } + // Ensure organisation name is keyed. + if (!isset($billing_address['organisation_name'])) { + $billing_address['organisation_name'] = ''; + } + // Return the billTo array. return array( 'firstName' => substr($billing_address['first_name'], 0, 50), @@ -938,6 +1239,39 @@ function commerce_authnet_cim_billto_array($order) { ); } +/** + * Generates a shipTo array for CIM API requests. + * + * @param $order + * The order object containing the shipping information used for the billTo. + * + * @return + * An array used to generate the shipTo XML in CIM API requests. + */ +function commerce_authnet_cim_shipto_array($order) { + // Prepare the shipping address for use in the request. + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $shipping_address = $order_wrapper->commerce_customer_shipping->commerce_customer_address->value(); + + // Ensure we have a first and last name in the address. + if (empty($shipping_address['first_name'])) { + $name_parts = explode(' ', $shipping_address['name_line']); + $shipping_address['first_name'] = array_shift($name_parts); + $shipping_address['last_name'] = implode(' ', $name_parts); + } + + // Return the shipTo array. + return array( + 'firstName' => substr($shipping_address['first_name'], 0, 50), + 'lastName' => substr($shipping_address['last_name'], 0, 50), + 'company' => substr($shipping_address['organisation_name'], 0, 50), + 'address' => substr($shipping_address['thoroughfare'], 0, 60), + 'city' => substr($shipping_address['locality'], 0, 40), + 'state' => substr($shipping_address['administrative_area'], 0, 40), + 'zip' => substr($shipping_address['postal_code'], 0, 20), + 'country' => $shipping_address['country'], + ); +} /** * Generates a creditCard array for CIM API requests. * @@ -997,6 +1331,15 @@ function commerce_authnet_cim_create_customer_profile_request($payment_method, $ ), ); + // Add the shipping address if available. + if (isset($order->commerce_customer_shipping)) { + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + + if ($order_wrapper->commerce_customer_shipping->value()) { + $api_request_data['profile']['shipToList'] = commerce_authnet_cim_shipto_array($order); + } + } + // If the order is anonymous, unset the merchantCustomerId from the request. if (empty($api_request_data['profile']['merchantCustomerId'])) { unset($api_request_data['profile']['merchantCustomerId']); @@ -1054,6 +1397,27 @@ function commerce_authnet_cim_create_customer_payment_profile_request($payment_m return commerce_authnet_cim_request($payment_method, 'createCustomerPaymentProfileRequest', $api_request_data); } +/** + * Submits a request to retrieve a Customer profile's payment profiles + * + * This is useful when Authorize.net returns an error code of E00039, duplicate. + * + * @param $payment_method + * @param $cim_customer_profile_id + * @param $number + * + * @return bool|string + * Returns FALSE if not payment profile found, or the matching profile ID. + */ +function commerce_authnet_cim_get_customer_profile_request($payment_method, $cim_customer_profile_id) { + // Query for the profile's payment profiles. + $api_request_data = array( + 'customerProfileId' => $cim_customer_profile_id, + ); + + return commerce_authnet_cim_request($payment_method, 'getCustomerProfileRequest', $api_request_data); +} + /** * Submits a getCustomerPaymentProfileRequest XML CIM API request to Authorize.Net. * @@ -1132,7 +1496,7 @@ function commerce_authnet_aim_request($payment_method, $nvp = array()) { ); // Allow modules to alter parameters of the API request. - drupal_alter('commerce_authnet_aim_request', $nvp); + drupal_alter('commerce_authnet_aim_request', $nvp, $payment_method); // Log the request if specified. if ($payment_method['settings']['log']['request'] == 'request') { @@ -1206,9 +1570,9 @@ function commerce_authnet_aim_server_url($txn_mode) { switch ($txn_mode) { case AUTHNET_TXN_MODE_LIVE: case AUTHNET_TXN_MODE_LIVE_TEST: - return 'https://secure.authorize.net/gateway/transact.dll'; + return variable_get('commerce_authnet_aim_server_url_live', 'https://secure2.authorize.net/gateway/transact.dll'); case AUTHNET_TXN_MODE_DEVELOPER: - return 'https://test.authorize.net/gateway/transact.dll'; + return variable_get('commerce_authnet_aim_server_url_dev', 'https://test.authorize.net/gateway/transact.dll'); } } @@ -1270,7 +1634,7 @@ function commerce_authnet_cim_request($payment_method, $request_type, $api_reque commerce_simplexml_add_children($api_request_element, $api_request_data); // Allow modules an opportunity to alter the request before it is sent. - drupal_alter('commerce_authnet_cim_request', $api_request_element); + drupal_alter('commerce_authnet_cim_request', $api_request_element, $payment_method, $request_type); // Generate an XML string. $xml = $api_request_element->asXML(); @@ -1306,7 +1670,6 @@ function commerce_authnet_cim_request($payment_method, $request_type, $api_reque // Build the array of header information for the request. $header = array(); $header[] = 'Content-type: text/xml; charset=utf-8'; - $header[] = 'Content-length: ' . strlen($api_request_element->asXML()); // Setup the cURL request. $ch = curl_init(); @@ -1361,9 +1724,9 @@ function commerce_authnet_cim_server_url($txn_mode) { switch ($txn_mode) { case AUTHNET_TXN_MODE_LIVE: case AUTHNET_TXN_MODE_LIVE_TEST: - return 'https://api.authorize.net/xml/v1/request.api'; + return variable_get('commerce_authnet_cim_server_url_live', 'https://api2.authorize.net/xml/v1/request.api'); case AUTHNET_TXN_MODE_DEVELOPER: - return 'https://apitest.authorize.net/xml/v1/request.api'; + return variable_get('commerce_authnet_cim_server_url_dev', 'https://apitest.authorize.net/xml/v1/request.api'); } } @@ -1413,7 +1776,7 @@ function commerce_authnet_cim_transaction_element_name($txn_type) { return 'profileTransCaptureOnly'; case COMMERCE_CREDIT_PRIOR_AUTH_CAPTURE: return 'profileTransPriorAuthCapture'; - case COMMERCE_CREDIT_CREDT: + case COMMERCE_CREDIT_CREDIT: return 'profileTransRefund'; case COMMERCE_CREDIT_VOID: return 'profileTransVoid'; diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_authnet/includes/commerce_authnet.admin.inc b/profiles/commerce_kickstart/modules/contrib/commerce_authnet/includes/commerce_authnet.admin.inc index 14fcca99..ae2955ce 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_authnet/includes/commerce_authnet.admin.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_authnet/includes/commerce_authnet.admin.inc @@ -179,6 +179,11 @@ function commerce_authnet_aim_void_form_submit($form, &$form_state) { // Update the transaction message to show that it has been voided. $transaction->message .= '
' . t('Voided: @date', array('@date' => format_date(REQUEST_TIME, 'short'))); + + // Zero out transaction amount before saving, + // so original amount is not saved as a positive revenue transaction. + // Authorize.Net settles these as "0.00" (see the payload on a void response). + $transaction->amount = '000'; } else { drupal_set_message(t('Void failed: @reason', array('@reason' => check_plain($response[3]))), 'error'); @@ -258,6 +263,24 @@ function commerce_authnet_aim_credit_form_submit($form, &$form_state) { // Determine the last 4 credit card digits from the previous transaction. $transaction_payload = end($transaction->payload); + + // If this payment transaction does not have credit card digits, we will check + // for a previous transaction that has the information. + if (empty($transaction_payload[50])) { + + // We reverse the array because Voids do not contain credit card digits, + // and we will have to cycle through fewer transactions this way. + $transaction_payloads = array_reverse($transaction->payload); + foreach ($transaction_payloads as $transaction_id => $payload) { + if ($payload[0] == 1 && !empty($payload[50])) { + + // This payload has the last four digits. + $transaction_payload = $payload; + break; + } + } + } + $credit_card = !empty($transaction_payload[50]) ? substr($transaction_payload[50], 4, 8) : ''; // Make sure that the last 4 digits are available and valid. diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_autosku/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/commerce_autosku/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_autosku/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + +
' . $checkout_redirect_reset_password_message . '
'; + // Reset password form. + // E-mail verification when a visitor creates an account. + elseif ($form_id == 'user_pass_reset' && !empty($form['actions'])) { + // Provide the checkout as an alternative to the new account + // reset password process. + // Message (help text) for the "Continue with checkout" button. + $checkout_redirect_reset_password_message = variable_get('commerce_checkout_redirect_reset_password_message', t('You can also continue with the checkout process.')); + if (!empty($checkout_redirect_reset_password_message)) { + $form['actions']['checkout_message']['#markup'] = '' . $checkout_redirect_reset_password_message . '
'; + } + // "Continue with checkout" submit button. + $form['actions']['checkout'] = array( + '#type' => 'submit', + '#value' => t('Continue with checkout'), + ); + // Append the checkout redirect function on user's forms. + $form['#submit'][] = 'commerce_checkout_redirect_redirect_anonymous_submit'; + // Unset the action, use submit form function(s) instead. + unset($form['#action']); } - // "Continue with checkout" submit button. - $form['actions']['checkout'] = array( - '#type' => 'submit', - '#value' => t('Continue with checkout'), - ); - // Append the checkout redirect function on user's forms. - $form['#submit'][] = 'commerce_checkout_redirect_redirect_anonymous_submit'; - // Unset the action, use submit form function(s) instead. - unset($form['#action']); } } } @@ -346,7 +355,7 @@ function commerce_checkout_redirect_anonymous_continue_checkout($form, &$form_st $order->mail = $form_state['values']['name']; commerce_order_save($order); } - $form_state['redirect'] = 'checkout/'; + $form_state['redirect'] = 'checkout'; } /** diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/.gitignore b/profiles/commerce_kickstart/modules/contrib/commerce_discount/.gitignore new file mode 100644 index 00000000..39fe1c20 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/.gitignore @@ -0,0 +1,3 @@ +# Sass cache and mapping are not needed in production. +.sass-cache +*.map diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/commerce_discount/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + +' . t(
- 'The discount is active only if the order total matches the above condition.
-
(the other order discounts are not taken into the comparison process)' - ) . '
',
+ '#suffix' => '(the other order discounts are not taken into the comparison process)' - ) . '
' . t('The discount is active only if the total of the selected line items on the order passes the comparison condition.
(Other order / product discount line items are not taken into account in the comparison process.)') . '
',
);
$form['total']['amount'] = array(
@@ -264,13 +287,13 @@ function commerce_product_has_owner_configure($settings) {
$form['data:select'] = array(
'#type' => 'textfield',
'#access' => FALSE,
- '#default_value' => 'site:current-user:uid'
+ '#default_value' => 'site:current-user:uid',
);
$form['op'] = array(
'#type' => 'textfield',
'#access' => FALSE,
- '#default_value' => '=='
+ '#default_value' => '==',
);
$form['value'] = array(
@@ -330,6 +353,19 @@ function commerce_order_contains_products_configure($settings) {
$form = array();
+ $form['operator'] = array(
+ '#type' => 'select',
+ '#title' => t('Operator'),
+ '#title_display' => 'invisible',
+ '#options' => array(
+ 'any' => t('any of'),
+ 'all' => t('all of'),
+ 'exactly' => t('exactly'),
+ 'only' => t('only any of'),
+ ),
+ '#default_value' => !empty($settings['operator']) ? $settings['operator'] : 'only',
+ );
+
$form['products'] = array(
'#type' => 'textfield',
'#title' => t('SKUs'),
@@ -339,7 +375,7 @@ function commerce_order_contains_products_configure($settings) {
'#maxlength' => 4096,
'#autocomplete_path' => 'commerce_product/autocomplete/commerce_product/0/0',
'#element_validate' => array('commerce_product_reference_autocomplete_validate'),
- '#suffix' => '(Other order / product discount line items are not taken into account in the comparison process.)') . '
' . t('Select products when ordered make discount active.') . '
',
+ '#suffix' => '' . t('Select products when ordered make discount active. Conditions:
Any of the products are in the order (can include other products).
All of the products listed are in the order (can include other products).
Exactly the products listed are in the order (cannot contain other products).
Only any of the products are in the order (cannot include other products).') . '
',
'#attributes' => array('placeholder' => array(t('enter product name'))),
);
@@ -373,8 +409,6 @@ function commerce_order_has_specific_quantity_products_configure($settings) {
}
}
- $form = array();
-
$form['products'] = array(
'#type' => 'textfield',
'#title' => t('Products'),
@@ -387,15 +421,12 @@ function commerce_order_has_specific_quantity_products_configure($settings) {
'#attributes' => array('placeholder' => array(t('enter product name'))),
);
+ module_load_include('inc', 'commerce_discount', 'commerce_discount.rules');
$form['operator'] = array(
'#type' => 'select',
- '#title' => t('Operator'),
- '#title_display' => 'invisible',
- '#options' => array(
- '<' => t('quantity lower than'),
- '==' => t('quantity equals'),
- '>' => t('quantity greater than'),
- ),
+ '#title' => t('Quantity'),
+ '#title_display' => 'before',
+ '#options' => _commerce_discount_operator_options(),
'#default_value' => !empty($settings['operator']) ? $settings['operator'] : '==',
);
@@ -403,7 +434,7 @@ function commerce_order_has_specific_quantity_products_configure($settings) {
'#type' => 'textfield',
'#title' => t('Quantity'),
'#title_display' => 'invisible',
- '#default_value' => !empty($settings['quantity']) ? $settings['quantity'] : '',
+ '#default_value' => !empty($settings['quantity']) ? $settings['quantity'] : '1',
'#size' => 5,
'#required' => TRUE,
'#element_validate' => array('element_validate_integer'),
@@ -413,6 +444,63 @@ function commerce_order_has_specific_quantity_products_configure($settings) {
return $form;
}
+/**
+ * Configuration callback for commerce_order_compare_address_configure.
+ *
+ * @param array $settings
+ * An array of rules condition settings.
+ *
+ * @return array;
+ * A form element array.
+ */
+function commerce_order_compare_address_configure($settings) {
+ module_load_include('inc', 'commerce_order', 'commerce_order.rules');
+
+ // Need a list of all address fields on customer profile bundles.
+ $form['address_field'] = array(
+ '#type' => 'select',
+ '#multiple' => FALSE,
+ '#options' => commerce_order_address_field_options_list(),
+ '#title' => t('Address field'),
+ '#title_display' => 'invisible',
+ '#default_value' => !empty($settings['address_field']) ? $settings['address_field'] : FALSE,
+ '#require' => TRUE,
+ );
+
+ // Need a list of address component options to compare.
+ $form['address_component'] = array(
+ '#type' => 'select',
+ '#multiple' => FALSE,
+ '#options' => commerce_order_address_component_options_list(),
+ '#title' => t('Address component'),
+ '#title_display' => 'invisible',
+ '#default_value' => !empty($settings['address_component']) ? $settings['address_component'] : FALSE,
+ '#require' => TRUE,
+ );
+
+ $form['operator'] = array(
+ '#type' => 'select',
+ '#multiple' => FALSE,
+ '#options' => commerce_order_address_comparison_operator_options_list(),
+ '#title' => t('Operator'),
+ '#title_display' => 'invisible',
+ '#default_value' => !empty($settings['operator']) ? $settings['operator'] : FALSE,
+ '#require' => TRUE,
+ );
+
+ $form['value'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Value'),
+ '#title_display' => 'invisible',
+ '#rows' => 3,
+ '#default_value' => !empty($settings['value']) ? $settings['value'] : FALSE,
+ '#require' => TRUE,
+ '#suffix' => 'Any of the products are in the order (can include other products).
All of the products listed are in the order (can include other products).
Exactly the products listed are in the order (cannot contain other products).
Only any of the products are in the order (cannot include other products).') . '
' . t('The discount is active if the order address component selected matches the entered value. For the entered value bear in mind that addresses using select lists for various components may use a value different from the option you select. For example, countries are selected by name, but the value is the two letter abbreviation. For comparisons with multiple possible values, place separate values on new lines.') . '
',
+ );
+
+ return $form;
+}
+
/**
* Configuration callback for commerce_shipping_compare_shipping_service.
*
diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.install b/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.install
index 311dad3b..84cf0e70 100644
--- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.install
+++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.install
@@ -6,7 +6,14 @@
*/
/**
- * Implements hook_schema()
+ * Implements hook_install().
+ */
+function commerce_discount_install() {
+ commerce_discount_install_helper();
+}
+
+/**
+ * Implements hook_schema().
*/
function commerce_discount_schema() {
$schema['commerce_discount'] = array(
@@ -66,6 +73,13 @@ function commerce_discount_schema() {
'length' => 255,
'not null' => FALSE,
),
+ 'sort_order' => array(
+ 'description' => 'The discount sort order.',
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 10,
+ 'size' => 'tiny',
+ ),
),
'primary key' => array('discount_id'),
'unique keys' => array(
@@ -92,6 +106,51 @@ function commerce_discount_schema() {
'primary key' => array('discount_offer_id'),
);
+ $schema['commerce_discount_usage'] = array(
+ 'fields' => array(
+ 'discount' => array(
+ 'type' => 'varchar',
+ 'length' => 64,
+ 'not null' => TRUE,
+ 'description' => 'Discount name.',
+ ),
+ 'mail' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => '',
+ 'description' => 'The email of the customer that used this discount.',
+ ),
+ 'order_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => 'The order id that this discount was used with.',
+ ),
+ ),
+ 'unique keys' => array(
+ 'discount_mail_order_id' => array('discount', 'mail', 'order_id'),
+ ),
+ 'foreign keys' => array(
+ 'discount' => array(
+ 'table' => 'commerce_discount',
+ 'columns' => array('discount' => 'name'),
+ ),
+ 'order_id' => array(
+ 'table' => 'commerce_order',
+ 'columns' => array('order_id' => 'order_id'),
+ ),
+ 'mail' => array(
+ 'table' => 'users',
+ 'columns' => array('mail' => 'mail'),
+ ),
+ ),
+ 'indexes' => array(
+ 'mail' => array('mail'),
+ 'discount' => array('discount'),
+ 'order_id' => array('order_id'),
+ ),
+ );
+
return $schema;
}
@@ -119,31 +178,27 @@ function commerce_discount_requirements($phase) {
}
/**
- * Helper function to define and create the required fields & instances in case
- * they don't exist already.
+ * Helper function to define and create the required fields & instances.
*
- * Create the entityreference field on commerce discount, referencing
+ * Ensure creation of an entityreference field on commerce discount, referencing
* commerce discount offer.
* The instance will be added for every newly created bundle.
*/
function commerce_discount_install_helper() {
$fields = field_read_fields(array(), array('include_inactive' => TRUE));
$field_types = field_info_field_types();
-
// Clear field info cache, so entity reference, inline_conditions and
// commerce_product_reference field types can be used.
- if (
- !isset($field_types['entityreference'])
- ||
- !isset($field_types['inline_conditions'])
- ||
- !isset($field_types['commerce_product_reference'])
- ) {
+ if (!isset($field_types['entityreference'], $field_types['inline_conditions'], $field_types['commerce_product_reference'], $field_types['datestamp'])) {
field_info_cache_clear();
+ // Overwrites variable, because during installation module after clears the
+ // field info cache the field type 'entityreference' not containing
+ // in variables. Under this the field, use this field type is not created.
+ $field_types = field_info_field_types();
}
+ // Create the discount offer entity reference field for use on all discounts.
if (empty($fields['commerce_discount_offer']) && isset($field_types['entityreference'])) {
- // Create entity reference field.
$field = array(
'entity_types' => array('commerce_discount'),
'settings' => array(
@@ -161,6 +216,43 @@ function commerce_discount_install_helper() {
);
field_create_field($field);
}
+
+ // Create the discount compatibility strategy field for use on all discounts.
+ if (empty($fields['commerce_compatibility_strategy'])) {
+ $field = array(
+ 'type' => 'list_text',
+ 'field_name' => 'commerce_compatibility_strategy',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_discount_compatibility_strategies',
+ ),
+ );
+ field_create_field($field);
+ }
+
+ // Create the selected discounts field for use on all discounts.
+ if (empty($fields['commerce_compatibility_selection'])) {
+ $field = array(
+ 'type' => 'entityreference',
+ 'field_name' => 'commerce_compatibility_selection',
+ 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'target_type' => 'commerce_discount',
+ 'handler' => 'base',
+ 'handler_settings' => array(
+ 'sort' => array(
+ 'type' => 'property',
+ 'property' => 'label',
+ 'direction' => 'ASC',
+ ),
+ ),
+ ),
+ );
+ field_create_field($field);
+ }
+
if (empty($fields['commerce_fixed_amount'])) {
// Add price field to the commerce discount offer "fixed_amount" bundle.
$field = array(
@@ -208,38 +300,130 @@ function commerce_discount_install_helper() {
);
field_create_field($field);
}
- // Creating field for free shipping offer type.
- if (module_exists('commerce_shipping') && empty($fields['commerce_free_shipping'])) {
+ if (empty($fields['commerce_discount_date'])) {
$field = array(
- 'entity_types' => array('commerce_discount_offer'),
- 'field_name' => 'commerce_free_shipping',
- 'type' => 'text',
+ 'entity_types' => array('commerce_discount'),
+ 'settings' => array(
+ 'granularity' => array(
+ 'month' => 'month',
+ 'day' => 'day',
+ 'year' => 'year',
+ ),
+ 'tz_handling' => 'none',
+ 'timezone_db' => '',
+ 'todate' => 'optional',
+ 'handler' => 'base',
+ 'target_type' => 'commerce_discount',
+ 'handler_settings' => array(
+ 'target_bundles' => array(),
+ ),
+ ),
+ 'field_name' => 'commerce_discount_date',
+ 'type' => 'datestamp',
'locked' => TRUE,
);
field_create_field($field);
}
- // Creating field for percent off of shipping
- if (module_exists('commerce_shipping') && empty($fields['commerce_percent_off_shipping'])) {
+ if (empty($fields['discount_usage_per_person'])) {
+ // Create entity reference field.
$field = array(
- 'entity_types' => array('commerce_discount_offer'),
- 'field_name' => 'commerce_percent_off_shipping',
- 'type' => 'number_decimal',
+ 'entity_types' => array('commerce_discount'),
+ 'field_name' => 'discount_usage_per_person',
+ 'type' => 'number_integer',
'locked' => TRUE,
);
field_create_field($field);
}
- // Creating field for percent off of shipping
- if (module_exists('commerce_shipping') && empty($fields['commerce_percent_off_ship_serv'])) {
+ // Discount usage.
+ if (empty($fields['discount_usage_limit'])) {
+ // Create entity reference field.
$field = array(
- 'entity_types' => array('commerce_discount_offer'),
- 'field_name' => 'commerce_percent_off_ship_serv',
- 'type' => 'text',
+ 'entity_types' => array('commerce_discount'),
+ 'field_name' => 'discount_usage_limit',
+ 'type' => 'number_integer',
'locked' => TRUE,
);
field_create_field($field);
}
- // Creating field for free products offer type.
+ // Create fields for the shipping related offer types.
+ if (module_exists('commerce_shipping')) {
+ // Creating the shipping service text field and checkbox for the "Free
+ // shipping" offer.
+ if (empty($fields['commerce_free_shipping'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_free_shipping',
+ 'type' => 'text',
+ 'locked' => TRUE,
+ );
+ field_create_field($field);
+ }
+ if (empty($fields['commerce_free_shipping_strategy'])) {
+ $field = array(
+ 'type' => 'list_text',
+ 'field_name' => 'commerce_free_shipping_strategy',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_discount_free_shipping_strategies',
+ ),
+ );
+ field_create_field($field);
+ }
+
+ // Create the percentage off and shipping service text fields for the "% off
+ // of shipping" offer.
+ if (empty($fields['commerce_percent_off_shipping'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_percent_off_shipping',
+ 'type' => 'number_decimal',
+ 'locked' => TRUE,
+ );
+ field_create_field($field);
+ }
+ if (empty($fields['commerce_percent_off_ship_serv'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_percent_off_ship_serv',
+ 'type' => 'text',
+ 'locked' => TRUE,
+ );
+ field_create_field($field);
+ }
+
+ // Create the target and source shipping service text fields for the
+ // "Shipping service upgrade" offer.
+ if (empty($fields['commerce_shipping_upgrade_target'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_shipping_upgrade_target',
+ 'type' => 'list_text',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_shipping_service_options_list',
+ ),
+ );
+ field_create_field($field);
+ }
+ if (empty($fields['commerce_shipping_upgrade_source'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_shipping_upgrade_source',
+ 'type' => 'list_text',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_shipping_service_options_list',
+ ),
+ );
+ field_create_field($field);
+ }
+ }
+
+ // Creating field for free bonus products offer type.
if (empty($fields['commerce_free_products']) && isset($field_types['commerce_product_reference'])) {
$field = array(
'entity_types' => array('commerce_discount_offer'),
@@ -275,7 +459,62 @@ function commerce_discount_install_helper() {
);
field_create_instance($instance);
}
+ if (empty($instances['commerce_discount'][$type]['commerce_compatibility_strategy'])) {
+ $instance = array(
+ 'field_name' => 'commerce_compatibility_strategy',
+ 'label' => t('Compatibility with other discounts'),
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'required' => TRUE,
+ 'widget' => array(
+ 'weight' => -10,
+ 'type' => 'options_buttons',
+ 'module' => 'options',
+ ),
+ 'default_value' => array(
+ 0 => array('value' => 'any'),
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount'][$type]['commerce_compatibility_selection'])) {
+ $instance = array(
+ 'field_name' => 'commerce_compatibility_selection',
+ 'label' => t('Selected discounts'),
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'required' => FALSE,
+ 'widget' => array(
+ 'weight' => -9,
+ 'type' => 'entityreference_autocomplete',
+ 'module' => 'entityreference',
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount'][$type]['commerce_discount_date'])) {
+ $instance = array(
+ 'field_name' => 'commerce_discount_date',
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'label' => t('Discount dates'),
+ 'widget' => array(
+ 'module' => 'date',
+ 'type' => 'date_popup',
+ 'weight' => -11,
+ 'settings' => array(
+ 'no_fieldset' => TRUE,
+ ),
+ ),
+ 'settings' => array(
+ 'default_value' => 'blank',
+ 'default_value2' => 'blank',
+ ),
+ );
+ field_create_instance($instance);
+ }
}
+
if (empty($instances['commerce_discount_offer']['fixed_amount']['commerce_fixed_amount'])) {
$instance = array(
'field_name' => 'commerce_fixed_amount',
@@ -299,14 +538,18 @@ function commerce_discount_install_helper() {
);
field_create_instance($instance);
}
- if (empty($instances['commerce_order']['commerce_order']['commerce_discounts'])) {
- $instance = array(
- 'field_name' => 'commerce_discounts',
- 'entity_type' => 'commerce_order',
- 'bundle' => 'commerce_order',
- 'label' => t('Discount reference'),
- );
- field_create_instance($instance);
+ // Add discount field to all commerce_order bundles.
+ $order_entity_info = entity_get_info('commerce_order');
+ foreach (array_keys($order_entity_info['bundles']) as $bundle) {
+ if (empty($instances['commerce_order'][$bundle]['commerce_discounts'])) {
+ $instance = array(
+ 'field_name' => 'commerce_discounts',
+ 'entity_type' => 'commerce_order',
+ 'bundle' => $bundle,
+ 'label' => t('Discount reference'),
+ );
+ field_create_instance($instance);
+ }
}
foreach (commerce_discount_types() as $type => $value) {
if (empty($instances['commerce_discount'][$type]['inline_conditions']) && isset($field_types['inline_conditions'])) {
@@ -327,45 +570,134 @@ function commerce_discount_install_helper() {
field_create_instance($instance);
}
}
- if (module_exists('commerce_shipping') && empty($instances['commerce_discount_offer']['free_shipping']['commerce_free_shipping'])) {
- $instance = array(
- 'field_name' => 'commerce_free_shipping',
- 'entity_type' => 'commerce_discount_offer',
- 'bundle' => 'free_shipping',
- 'label' => t('Shipping service'),
- 'required' => TRUE,
- 'widget' => array(
- 'type' => 'options_select',
- ),
- );
- field_create_instance($instance);
+
+ foreach (commerce_discount_types() as $type => $info) {
+ if (empty($instances['commerce_discount'][$type]['discount_usage_per_person'])) {
+ $instance = array(
+ 'field_name' => 'discount_usage_per_person',
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'label' => t('Maximum usage per customer'),
+ 'description' => t('Enter the maximum number of times a specific person (as identified by email) may use this discount. Leave blank for unlimited.'),
+ 'required' => FALSE,
+ 'widget' => array(
+ 'weight' => 100,
+ ),
+ 'settings' => array(
+ 'min' => 0,
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount'][$type]['discount_usage_limit'])) {
+ $instance = array(
+ 'field_name' => 'discount_usage_limit',
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'label' => t('Maximum overall usage'),
+ 'description' => t('Enter the maximum number of times this discount may be used on the site, by anyone. Leave blank for unlimited.'),
+ 'required' => FALSE,
+ 'widget' => array(
+ 'weight' => 100,
+ ),
+ 'settings' => array(
+ 'min' => 0,
+ ),
+ );
+ field_create_instance($instance);
+ }
}
- if (module_exists('commerce_shipping') && empty($instances['commerce_discount_offer']['percent_off_shipping']['commerce_percent_off_shipping'])) {
- // Add decimal selection
- $instance = array(
- 'field_name' => 'commerce_percent_off_shipping',
- 'entity_type' => 'commerce_discount_offer',
- 'bundle' => 'percent_off_shipping',
- 'label' => t('Percentage off of shipping'),
- 'settings' => array(
- 'suffix' => '%',
- ),
- 'required' => TRUE,
- );
- field_create_instance($instance);
+ // Create field instances for the shipping related offer types.
+ if (module_exists('commerce_shipping')) {
+ // Add the shipping service text field to the "Free shipping" offer.
+ if (empty($instances['commerce_discount_offer']['free_shipping']['commerce_free_shipping'])) {
+ $instance = array(
+ 'field_name' => 'commerce_free_shipping',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'free_shipping',
+ 'label' => t('Shipping service'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount_offer']['free_shipping']['commerce_free_shipping_strategy'])) {
+ $instance = array(
+ 'field_name' => 'commerce_free_shipping_strategy',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'free_shipping',
+ 'label' => t('Free shipping discount strategy'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_buttons',
+ 'module' => 'options',
+ ),
+ 'default_value' => array(
+ 0 => array('value' => 'only_selected'),
+ ),
+ );
+ field_create_instance($instance);
+ }
- // Add service selection
- $instance = array(
- 'field_name' => 'commerce_percent_off_ship_serv',
- 'entity_type' => 'commerce_discount_offer',
- 'bundle' => 'percent_off_shipping',
- 'label' => t('Shipping service to take % off shipping'),
- 'widget' => array(
- 'type' => 'options_select',
- ),
- );
- field_create_instance($instance);
+ // Add the percentage off and shipping service text fields to the "% off of
+ // shipping" offer.
+ if (empty($instances['commerce_discount_offer']['percent_off_shipping']['commerce_percent_off_shipping'])) {
+ $instance = array(
+ 'field_name' => 'commerce_percent_off_shipping',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'percent_off_shipping',
+ 'label' => t('Percentage off of shipping'),
+ 'settings' => array(
+ 'suffix' => '%',
+ ),
+ 'required' => TRUE,
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount_offer']['percent_off_shipping']['commerce_percent_off_ship_serv'])) {
+ $instance = array(
+ 'field_name' => 'commerce_percent_off_ship_serv',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'percent_off_shipping',
+ 'label' => t('Shipping service to take % off shipping'),
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ );
+ field_create_instance($instance);
+ }
+
+ // Add the target and source shipping service text fields to the "Shipping
+ // service upgrade" offer.
+ if (empty($instances['commerce_discount_offer']['shipping_upgrade']['commerce_shipping_upgrade_target'])) {
+ $instance = array(
+ 'field_name' => 'commerce_shipping_upgrade_target',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'shipping_upgrade',
+ 'label' => t('Let customers select this service'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount_offer']['shipping_upgrade']['commerce_shipping_upgrade_source'])) {
+ $instance = array(
+ 'field_name' => 'commerce_shipping_upgrade_source',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'shipping_upgrade',
+ 'label' => t('For the same price as this service'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ );
+ field_create_instance($instance);
+ }
}
if (empty($instances['commerce_discount_offer']['free_products']['commerce_free_products'])) {
@@ -373,7 +705,7 @@ function commerce_discount_install_helper() {
'field_name' => 'commerce_free_products',
'entity_type' => 'commerce_discount_offer',
'bundle' => 'free_products',
- 'label' => t('Select free products'),
+ 'label' => t('Select bonus products'),
'description' => t('Enter a comma-separated list of SKUs. Each product is added to customer order with a quantity of 1.'),
'required' => TRUE,
'widget' => array(
@@ -394,6 +726,7 @@ function commerce_discount_install_helper() {
* @see commerce_discount_offer_type_info()
*/
function commerce_discount_uninstall() {
+ module_load_include('module', 'commerce');
// Drop all bundles attached on commerce_discount and commerce_discount_offer
// entity types.
field_attach_delete_bundle('commerce_discount', 'order_discount');
@@ -405,7 +738,11 @@ function commerce_discount_uninstall() {
field_attach_delete_bundle('commerce_discount_offer', 'commerce_percent_off_ship_serv');
field_attach_delete_bundle('commerce_discount_offer', 'free_products');
- // Then delete the related fields
+ // Delete custom line items types.
+ field_attach_delete_bundle('commerce_line_item', 'commerce_discount');
+ field_attach_delete_bundle('commerce_line_item', 'product_discount');
+
+ // Then delete the related fields.
commerce_delete_field('commerce_discount_offer');
commerce_delete_field('commerce_fixed_amount');
commerce_delete_field('commerce_percentage');
@@ -415,6 +752,9 @@ function commerce_discount_uninstall() {
commerce_delete_field('commerce_percent_off_shipping');
commerce_delete_field('commerce_percent_off_ship_serv');
commerce_delete_field('commerce_free_products');
+ commerce_delete_field('commerce_discount_date');
+ commerce_delete_field('discount_usage_per_person');
+ commerce_delete_field('discount_usage_limit');
// Delete all rules added by commerce_discount module.
$query = new EntityFieldQuery();
@@ -432,13 +772,15 @@ function commerce_discount_uninstall() {
}
/**
- * #1875524 Update the widget type of field commerce_discount_offer
+ * Update the widget type of field commerce_discount_offer.
+ *
+ * @see https://drupal.org/node/1875524
*/
-function commerce_discount_update_7101(){
+function commerce_discount_update_7101() {
$instances = field_info_instances('commerce_discount');
- foreach($instances as $bundle => $bundle_instances ){
- foreach($bundle_instances as $field_name => $instance){
- if( $field_name == 'commerce_discount_offer'){
+ foreach ($instances as $bundle => $bundle_instances) {
+ foreach ($bundle_instances as $field_name => $instance) {
+ if ($field_name == 'commerce_discount_offer') {
$instance['widget']['type'] = 'inline_entity_form_single';
field_update_instance($instance);
}
@@ -447,13 +789,21 @@ function commerce_discount_update_7101(){
}
/**
- * #2034685 Discount component price names.
+ * Discount component price names.
+ *
+ * @link https://drupal.org/node/2034685
*
* Add a new column in commerce_discount table in order to display customized
* component price title for a discount.
*/
function commerce_discount_update_7102() {
- db_add_field('commerce_discount', 'component_title', array('description' => 'The component price title', 'type' => 'varchar', 'length' => 255, 'not null' => FALSE));
+ $field_schema = array(
+ 'description' => 'The component price title',
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => FALSE,
+ );
+ db_add_field('commerce_discount', 'component_title', $field_schema);
}
/**
@@ -464,12 +814,313 @@ function commerce_discount_update_7103() {
}
/**
- * #1854108 Changes to commerce_discount schema.
+ * Changes to commerce_discount schema.
+ *
+ * @see http://drupal.org/node/1854108
*/
function commerce_discount_update_7104() {
// Rename "enabled" to "status" and "status" to "export_status".
- db_change_field('commerce_discount', 'status', 'export_status', array('type' => 'int', 'not null' => TRUE, 'default' => 0x01, 'size' => 'tiny', 'description' => 'The exportable status of the entity.'));
- db_change_field('commerce_discount', 'enabled', 'status', array('type' => 'int', 'not null' => TRUE, 'default' => 1, 'size' => 'tiny', 'description' => 'Whether the discount is active.'));
+ db_change_field('commerce_discount', 'status', 'export_status', array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0x01,
+ 'size' => 'tiny',
+ 'description' => 'The exportable status of the entity.',
+ ));
+ db_change_field('commerce_discount', 'enabled', 'status', array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 1,
+ 'size' => 'tiny',
+ 'description' => 'Whether the discount is active.',
+ ));
// Rebuild the schema.
drupal_get_complete_schema(TRUE);
}
+
+/**
+ * Add a sort order column to the Commerce Discount table.
+ */
+function commerce_discount_update_7105() {
+ $field_schema = array(
+ 'description' => 'The discount sort order.',
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 10,
+ 'size' => 'tiny',
+ );
+ db_add_field('commerce_discount', 'sort_order', $field_schema);
+
+ return t('Sort order added to the Commerce Discount table.');
+}
+
+/**
+ * Add discount compatibility fields to all discount types.
+ */
+function commerce_discount_update_7106() {
+ $fields = field_read_fields(array(), array('include_inactive' => TRUE));
+
+ // Create the discount compatibility strategy field for use on all discounts.
+ if (empty($fields['commerce_compatibility_strategy'])) {
+ $field = array(
+ 'type' => 'list_text',
+ 'field_name' => 'commerce_compatibility_strategy',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_discount_compatibility_strategies',
+ ),
+ );
+ field_create_field($field);
+ }
+
+ // Create the selected discounts field for use on all discounts.
+ if (empty($fields['commerce_compatibility_selection'])) {
+ $field = array(
+ 'type' => 'entityreference',
+ 'field_name' => 'commerce_compatibility_selection',
+ 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'target_type' => 'commerce_discount',
+ 'handler' => 'base',
+ 'handler_settings' => array(
+ 'sort' => array(
+ 'type' => 'property',
+ 'property' => 'label',
+ 'direction' => 'ASC',
+ ),
+ ),
+ ),
+ );
+ field_create_field($field);
+ }
+
+ field_sync_field_status();
+ field_info_cache_clear();
+ $instances = field_info_instances();
+
+ foreach (commerce_discount_types() as $type => $value) {
+ if (empty($instances['commerce_discount'][$type]['commerce_compatibility_strategy'])) {
+ $instance = array(
+ 'field_name' => 'commerce_compatibility_strategy',
+ 'label' => t('Compatibility with other discounts'),
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'required' => TRUE,
+ 'widget' => array(
+ 'weight' => -10,
+ 'type' => 'options_buttons',
+ 'module' => 'options',
+ ),
+ 'default_value' => array(
+ 0 => array('value' => 'any'),
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount'][$type]['commerce_compatibility_selection'])) {
+ $instance = array(
+ 'field_name' => 'commerce_compatibility_selection',
+ 'label' => t('Selected discounts'),
+ 'entity_type' => 'commerce_discount',
+ 'bundle' => $type,
+ 'required' => FALSE,
+ 'widget' => array(
+ 'weight' => -9,
+ 'type' => 'entityreference_autocomplete',
+ 'module' => 'entityreference',
+ ),
+ );
+ field_create_instance($instance);
+ }
+ }
+
+ return t('Discount compatibility fields added to all discount types.');
+}
+
+/**
+ * Add fields to support a new "Shipping service upgrade" offer type.
+ */
+function commerce_discount_update_7107() {
+ if (module_exists('commerce_shipping')) {
+ $fields = field_read_fields(array(), array('include_inactive' => TRUE));
+
+ if (empty($fields['commerce_shipping_upgrade_target'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_shipping_upgrade_target',
+ 'type' => 'list_text',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_shipping_service_options_list',
+ ),
+ );
+ field_create_field($field);
+ }
+ if (empty($fields['commerce_shipping_upgrade_source'])) {
+ $field = array(
+ 'entity_types' => array('commerce_discount_offer'),
+ 'field_name' => 'commerce_shipping_upgrade_source',
+ 'type' => 'list_text',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_shipping_service_options_list',
+ ),
+ );
+ field_create_field($field);
+ }
+
+ field_sync_field_status();
+ field_info_cache_clear();
+ $instances = field_info_instances();
+
+ if (empty($instances['commerce_discount_offer']['shipping_upgrade']['commerce_shipping_upgrade_target'])) {
+ $instance = array(
+ 'field_name' => 'commerce_shipping_upgrade_target',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'shipping_upgrade',
+ 'label' => t('Let customers select this service'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ );
+ field_create_instance($instance);
+ }
+ if (empty($instances['commerce_discount_offer']['shipping_upgrade']['commerce_shipping_upgrade_source'])) {
+ $instance = array(
+ 'field_name' => 'commerce_shipping_upgrade_source',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'shipping_upgrade',
+ 'label' => t('For the same price as this service'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ );
+ field_create_instance($instance);
+ }
+ }
+
+ return t('Fields added to support the new "Shipping service upgrade" offer type.');
+}
+
+/**
+ * Add a field to support the concept of "Free or reduced shipping" offers.
+ */
+function commerce_discount_update_7108() {
+ if (module_exists('commerce_shipping')) {
+ $fields = field_read_fields(array(), array('include_inactive' => TRUE));
+
+ if (empty($fields['commerce_free_shipping_strategy'])) {
+ $field = array(
+ 'type' => 'list_text',
+ 'field_name' => 'commerce_free_shipping_strategy',
+ 'locked' => TRUE,
+ 'settings' => array(
+ 'allowed_values' => array(),
+ 'allowed_values_function' => 'commerce_discount_free_shipping_strategies',
+ ),
+ );
+ field_create_field($field);
+ }
+
+ field_sync_field_status();
+ field_info_cache_clear();
+ $instances = field_info_instances();
+
+ if (empty($instances['commerce_discount_offer']['free_shipping']['commerce_free_shipping_strategy'])) {
+ $instance = array(
+ 'field_name' => 'commerce_free_shipping_strategy',
+ 'entity_type' => 'commerce_discount_offer',
+ 'bundle' => 'free_shipping',
+ 'label' => t('Free shipping discount strategy'),
+ 'required' => TRUE,
+ 'widget' => array(
+ 'type' => 'options_buttons',
+ 'module' => 'options',
+ ),
+ 'default_value' => array(
+ 0 => array('value' => 'only_selected'),
+ ),
+ );
+ field_create_instance($instance);
+ }
+ }
+
+ return t('Field added to support the concept of "Free or reduced shipping" offers.');
+}
+
+/**
+ * Check for wrong discount values, before form validation was introduced.
+ *
+ * @see https://www.drupal.org/node/2468159#comment-10100064
+ */
+function commerce_discount_update_7109() {
+ // Every value below and including '1' should be recalculated.
+ $query = db_select('field_data_commerce_percentage', 'percent');
+ $query->condition('percent.commerce_percentage_value', 1, '<=')
+ ->fields('percent', array('commerce_percentage_value', 'entity_id'));
+ $result = $query->execute();
+
+ if ($result) {
+ foreach ($result as $record) {
+ // We got results, perform the updates.
+ db_update('field_data_commerce_percentage')
+ ->fields(array('commerce_percentage_value' => abs($record->commerce_percentage_value * 100)))
+ ->condition('entity_id', $record->entity_id, '=')
+ ->execute();
+ }
+ }
+
+ $text = t('Update 7109 finished. Please check all your percentage based discount settings for correct values after this update!');
+ $text .= t('Number of percentage values in table "field_data_commerce_percentage" who were updated as a result: @count', array(
+ '@count' => $result->rowCount(),
+ ));
+
+ return $text;
+}
+
+/**
+ * Enable and update usage and date sub-modules into discount core.
+ */
+function commerce_discount_update_7110() {
+ // Fail early if the Date module is not present.
+ if (!module_exists('date')) {
+ throw new DrupalUpdateException('The Date module is required.');
+ }
+
+ commerce_discount_install_helper();
+ $fields = field_read_fields(array(), array('include_inactive' => TRUE));
+
+ if (!db_table_exists('commerce_discount_usage')) {
+ db_create_table('commerce_discount_usage', drupal_get_schema_unprocessed('commerce_discount', 'commerce_discount_usage'));
+ }
+
+ // Migrate from commerce_discount_max_uses to discount_usage_limit.
+ foreach (entity_load('commerce_discount') as $discount) {
+ $wrapper = entity_metadata_wrapper('commerce_discount', $discount);
+ if ((!isset($wrapper->discount_usage_limit) || $wrapper->discount_usage_limit->value() == FALSE)
+ && isset($wrapper->commerce_discount_max_uses) && $wrapper->commerce_discount_max_uses->value()) {
+ $wrapper->discount_usage_limit = $wrapper->commerce_discount_max_uses->value();
+ entity_save('commerce_discount', $discount);
+ }
+ }
+ if (!empty($fields['commerce_discount_max_uses'])) {
+ field_delete_field('commerce_discount_max_uses');
+ }
+
+ $disable_modules = array('commerce_discount_usage', 'commerce_discount_date');
+ db_update('system')
+ ->fields(array('status' => 0))
+ ->condition('name', $disable_modules)
+ ->condition('type', 'module')
+ ->execute();
+
+ field_info_cache_clear();
+
+ return t('Discount date and usage sub-modules are now in core.');
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.module b/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.module
index c5e82bfc..335cf5d5 100644
--- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.module
+++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.module
@@ -2,90 +2,112 @@
/**
* @file
- * Defines the discount and discount offer entities (always managed together),
+ * Defines the discount and discount offer entities, bundles and functionality.
+ *
+ * Discount and offer entities are always managed together,
* their bundles, and all surrounding functionality (API, UI).
*/
/**
* Implements hook_commerce_cart_order_refresh().
- *
- * Remove any existing commerce discount line item.
*/
-function commerce_discount_commerce_cart_order_refresh($wrapper) {
- $line_items_to_delete = array();
- $cloned_line_items = array();
+function commerce_discount_commerce_cart_order_refresh($order_wrapper) {
// Remove all discount references from the order.
// (If there are none, setting array() would modify the order, so test first.)
- if ($wrapper->__isset('commerce_discounts') && $wrapper->commerce_discounts->value()) {
- $wrapper->commerce_discounts->set(array());
+ if (isset($order_wrapper->commerce_discounts) && $order_wrapper->commerce_discounts->value()) {
+ $order_wrapper->commerce_discounts = array();
}
+ if (!isset($order_wrapper->commerce_line_items) || $order_wrapper->commerce_line_items->count() <= 0) {
+ return;
+ }
+ $line_items_to_delete = array();
- // Remove discount components from the order total price.
- commerce_discount_remove_discount_components($wrapper->commerce_order_total);
+ $currency_code = commerce_default_currency();
+ if (!is_null($order_wrapper->commerce_order_total->value())) {
+ $currency_code = $order_wrapper->commerce_order_total->currency_code->value();
+ }
+ // We create an empty price structure to be used by discount line items,
+ // we want to remove all price components present on discount line items such
+ // as VAT, the discount price component itself etc.
+ $empty_price = commerce_discount_empty_price($currency_code);
- foreach ($wrapper->commerce_line_items as $delta => $wrapper_line_item) {
- if ($wrapper_line_item->getBundle() == 'product_discount') {
- // Delete the line item, and remove it from the order.
- $line_items_to_delete[] = $wrapper_line_item->line_item_id->value();
- $wrapper->commerce_line_items->offsetUnset($delta);
+ foreach ($order_wrapper->commerce_line_items as $delta => $line_item_wrapper) {
+ if (!$line_item_wrapper->value()) {
+ continue;
}
- elseif (is_object($wrapper_line_item) && $line_item = $wrapper_line_item->value()) {
- $cloned_line_items[$wrapper_line_item->getIdentifier()] = clone $line_item;
-
- // Remove discount components from the line item price fields; the line
- // item may be a discount (so the price will become 0) or another line
- // item like a product (so the price will become the 'original' price).
- commerce_discount_remove_discount_components($wrapper_line_item->commerce_unit_price);
- commerce_discount_remove_discount_components($wrapper_line_item->commerce_total);
+ // Remove all the price components on discount line items, if the unit price
+ // is still == 0 after evaluating order discount rules, the discount line
+ // item will be deleted.
+ if ($line_item_wrapper->getBundle() == 'commerce_discount') {
+ $line_item_wrapper->commerce_unit_price = $empty_price;
+ $line_item_wrapper->commerce_total = $empty_price;
+ continue;
+ }
+ // Remove product_discount line items each time we refresh the order,
+ // we don't know in advance if "free bonus product" rules are still
+ // applicable, if they're, a new line item is going to be recreated when
+ // the "commerce_discount_order" rules event is fired.
+ elseif ($line_item_wrapper->getBundle() == 'product_discount') {
+ $line_items_to_delete[] = $line_item_wrapper->getIdentifier();
+ $order_wrapper->commerce_line_items->offsetUnset($delta);
+ continue;
+ }
+ elseif ($line_item_wrapper->getBundle() == 'shipping') {
+ $changed = commerce_discount_remove_discount_components($line_item_wrapper->commerce_unit_price);
+ if ($changed) {
+ // Since we're saving the line item, there's no need to manually
+ // update the line item's total since that'll be done in the controller.
+ $line_item_wrapper->save();
+ }
}
}
- // Save the line items which have changes after removing/re-adding discounts;
- // except if one of our discount type line items still has price 0, delete it.
- foreach ($wrapper->commerce_line_items as $delta => $wrapper_line_item) {
- if ($wrapper_line_item->getBundle() != 'product_discount') {
- $id = $wrapper_line_item->getIdentifier();
+ // We need to make sure the order total is correct before evaluating discount
+ // rules, order total may not be correct when our refresh implementation is
+ // invoked.
+ commerce_discount_calculate_order_total($order_wrapper);
+ // Re-add all applicable discount price components and/or line items.
+ rules_invoke_event('commerce_discount_order', $order_wrapper);
- // Only check non-new line items; new ones have already been saved.
- if (isset($cloned_line_items[$id])) {
- if ($wrapper_line_item->getBundle() == 'commerce_discount' && $wrapper_line_item->commerce_unit_price->amount->value() == 0) {
- $line_items_to_delete[] = $id;
- $wrapper->commerce_line_items->offsetUnset($delta);
- }
- else {
- // Check for changes, in commerce_unit_price (in the same way as
- // commerce_cart_order_refresh() does) and quantity.
- // (Don't check e.g. commerce_total; it may not be updated yet.)
- $old_line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $cloned_line_items[$id]);
- $old_data = $old_line_item_wrapper->commerce_unit_price->data->value() + array('components' => array());
- $data = (array) $wrapper_line_item->commerce_unit_price->data->value() + array('components' => array());
-
- if ($wrapper_line_item->commerce_unit_price->amount->value() != $old_line_item_wrapper->commerce_unit_price->amount->value() ||
- $wrapper_line_item->commerce_unit_price->currency_code->value() != $old_line_item_wrapper->commerce_unit_price->currency_code->value() ||
- $data['components'] != $old_data['components']) {
- // Save changed line item (which will correctly set commerce_total).
- $wrapper_line_item->save();
- }
- }
- }
+ // After the discount rules were evaluated, we need to check if we have
+ // some discount line items with empty prices (we need to delete them).
+ foreach ($order_wrapper->commerce_line_items as $delta => $line_item_wrapper) {
+ if (!$line_item_wrapper->value() || $line_item_wrapper->getBundle() != 'commerce_discount') {
+ continue;
+ }
+ $unit_price = commerce_price_wrapper_value($line_item_wrapper, 'commerce_unit_price', TRUE);
+ if (empty($unit_price['amount'])) {
+ $line_items_to_delete[] = $line_item_wrapper->getIdentifier();
+ $order_wrapper->commerce_line_items->offsetUnset($delta);
}
}
- // Delete line items.
- commerce_line_item_delete_multiple($line_items_to_delete);
-
- // Re-add all applicable discount price components and/or line items.
- rules_invoke_event('commerce_discount_order', $wrapper->value());
+ // Delete discount line item if necessary.
+ if ($line_items_to_delete) {
+ commerce_line_item_delete_multiple($line_items_to_delete, TRUE);
+ }
}
+
/**
* Remove discount components from a given price and recalculate the total.
*
* @param object $price_wrapper
* Wrapped commerce price.
+ * @param array $discount_types_to_remove
+ * An array of discount type strings to remove.
+ *
+ * @return bool
+ * TRUE if at least one price component has been removed, FALSE otherwise.
*/
-function commerce_discount_remove_discount_components($price_wrapper) {
- $data = (array) $price_wrapper->data->value() + array('components' => array());
+function commerce_discount_remove_discount_components($price_wrapper, $discount_types_to_remove = array('order_discount')) {
+ $price = $price_wrapper->value();
+ // If there are no price or components, there is nothing to remove.
+ if (!$price || empty($price['data']['components'])) {
+ return FALSE;
+ }
+
+ $data = (array) $price['data'] + array('components' => array());
$component_removed = FALSE;
// Remove price components belonging to order discounts.
foreach ($data['components'] as $key => $component) {
@@ -94,14 +116,16 @@ function commerce_discount_remove_discount_components($price_wrapper) {
// Remove all discount components.
if (!empty($component['price']['data']['discount_name'])) {
$discount_name = $component['price']['data']['discount_name'];
- $wrapper = entity_metadata_wrapper('commerce_discount', $discount_name);
- if (!$wrapper->value() || $wrapper->getBundle() == 'order_discount') {
+ $discount = entity_load_single('commerce_discount', $discount_name);
+ if (!$discount || in_array($discount->type, $discount_types_to_remove)) {
$remove = TRUE;
}
- } else if ($component['name'] != 'base_price') {
- // As long as the component is neither base price nor discount, allow other modules to say whether it gets reset.
- // This is so that discounts can apply against a price that has been stripped of components from modules that
- // need to apply against a post-discount price.
+ }
+ elseif ($component['name'] != 'base_price') {
+ // As long as the component is neither base price nor discount, allow
+ // other modules to say whether it gets reset. This is so that discounts
+ // can apply against a price that has been stripped of components from
+ // modules that need to apply against a post-discount price.
drupal_alter('commerce_discount_remove_price_component', $component, $remove);
}
@@ -112,15 +136,18 @@ function commerce_discount_remove_discount_components($price_wrapper) {
}
// Don't alter the price components if no components were removed.
if (!$component_removed) {
- return;
+ return FALSE;
}
+ // Properly re-key the components array.
+ $data['components'] = array_values($data['components']);
// Re-save the price without the discounts (if existed).
$price_wrapper->data->set($data);
// Re-set the total price.
$total = commerce_price_component_total($price_wrapper->value());
- $price_wrapper->amount->set($total['amount']);
+ $price_wrapper->amount = $total['amount'];
+ return TRUE;
}
/**
@@ -137,20 +164,17 @@ function commerce_discount_commerce_cart_order_empty($order) {
}
}
- // Delete line items.
- commerce_line_item_delete_multiple($line_items_to_delete);
+ if ($line_items_to_delete) {
+ // Delete line items.
+ commerce_line_item_delete_multiple($line_items_to_delete);
+ }
}
/**
- * Implements hook_commerce_shipping_method_collect_rates().
- *
- * Invoke the commerce_discount_free_shipping event and the
- * commerce_discount_percent_off_shipping event when the shipping rates
- * are being collected.
+ * Discount the shipping services for a given order.
*/
-function commerce_discount_commerce_shipping_method_collect_rates($method, $order) {
- rules_invoke_event('commerce_discount_free_shipping', $order);
- rules_invoke_event('commerce_discount_percent_off_shipping', $order);
+function commerce_discount_shipping_services($order) {
+ commerce_cart_order_refresh($order);
}
/**
@@ -182,7 +206,7 @@ function commerce_discount_entity_info() {
'views controller class' => 'CommerceDiscountViewsController',
// Enable the entity API's admin UI.
'admin ui' => array(
- 'path' => 'admin/commerce/store/discounts',
+ 'path' => 'admin/commerce/discounts',
'file' => 'includes/commerce_discount.admin.inc',
'controller class' => 'CommerceDiscountUIController',
),
@@ -243,12 +267,10 @@ function commerce_discount_permission() {
* Implements hook_views_api().
*/
function commerce_discount_views_api($module, $api) {
- if ($module == 'views') {
- return array(
- 'version' => 3,
- 'path' => drupal_get_path('module', 'commerce_discount') . '/includes/views',
- );
- }
+ return array(
+ 'version' => 3,
+ 'path' => drupal_get_path('module', 'commerce_discount') . '/includes/views',
+ );
}
/**
@@ -280,7 +302,6 @@ function commerce_discount_form_features_export_form_alter(&$form, $from_state)
* Implements hook_commerce_price_formatted_components_alter().
*/
function commerce_discount_commerce_price_formatted_components_alter(&$components, $price, $entity) {
- //
if (isset($price['data']['components'])) {
// Loop into price components and alter the component title if the discount
// component label is found.
@@ -296,12 +317,12 @@ function commerce_discount_commerce_price_formatted_components_alter(&$component
/**
* Implements hook_form_FORM_ID_alter().
*
- * Disable alteration of discounts with overriden rules.
+ * Disable alteration of discounts with overridden rules.
*/
function commerce_discount_form_commerce_discount_form_alter(&$form, $form_state) {
// Add clearfix to the discount type container.
$form['commerce_discount_type']['#attributes']['class'][] = 'clearfix';
- $form['commerce_discount_fields']['commerce_discount_offer'][LANGUAGE_NONE]['form']['type']['#attributes']['class'][] = 'clearfix';
+ $form['commerce_discount_fields']['commerce_discount_offer']['#attributes']['class'][] = 'clearfix';
if (empty($form_state['commerce_discount']->discount_id)) {
// Entity is new.
@@ -315,7 +336,7 @@ function commerce_discount_form_commerce_discount_form_alter(&$form, $form_state
$rule = rules_config_load('commerce_discount_rule_' . $form_state['commerce_discount']->name);
if ($rule && $rule->hasStatus(ENTITY_OVERRIDDEN)) {
- drupal_set_message(t('The rule associated with this discount is overriden, making it impossible to edit the discount.'), 'warning');
+ drupal_set_message(t('The rule associated with this discount is overridden, making it impossible to edit the discount.'), 'warning');
$form['actions']['submit']['#disabled'] = TRUE;
}
}
@@ -329,15 +350,24 @@ function commerce_discount_field_widget_form_alter(&$element, &$form_state, $con
$element['#options'] += commerce_shipping_service_options_list();
if ($form_state['op'] == 'edit') {
$wrapper_offer = entity_metadata_wrapper('commerce_discount_offer', $element['#entity']);
- if($element['#field_name'] == 'commerce_free_shipping'){
+ if ($element['#field_name'] == 'commerce_free_shipping') {
$element['#default_value'] = $wrapper_offer->commerce_free_shipping->value();
}
- else{
+ else {
$element['#default_value'] = $wrapper_offer->commerce_percent_off_ship_serv->value();
}
-
}
}
+
+ // If the current element is the free shipping discount strategy select list,
+ // alter it to only be visible when a free shipping service has been selected.
+ if (!empty($element['#field_name']) && $element['#field_name'] == 'commerce_free_shipping_strategy') {
+ $element['#states'] = array(
+ 'invisible' => array(
+ ':input[name="commerce_discount_fields[commerce_discount_offer][' . LANGUAGE_NONE . '][form][commerce_free_shipping][' . LANGUAGE_NONE . ']"]' => array('value' => '_none'),
+ ),
+ );
+ }
}
/**
@@ -346,7 +376,13 @@ function commerce_discount_field_widget_form_alter(&$element, &$form_state, $con
* Rebuild Rules configuration.
*/
function commerce_discount_commerce_discount_insert($entity) {
- entity_defaults_rebuild(array('rules_config'));
+ if (module_exists('i18n_string')) {
+ i18n_string_object_update('commerce_discount', $entity);
+ }
+ // We need to reload the discount afresh because some fields contain
+ // serialized and empty values.
+ $discount = entity_load_single('commerce_discount', $entity->discount_id);
+ _commerce_discount_rebuild_rules_config(array(clone $discount));
}
/**
@@ -355,7 +391,146 @@ function commerce_discount_commerce_discount_insert($entity) {
* Rebuild Rules configuration.
*/
function commerce_discount_commerce_discount_update($entity) {
- entity_defaults_rebuild(array('rules_config'));
+ if (module_exists('i18n_string')) {
+ // Account for name changes.
+ if ($entity->original->name != $entity->name) {
+ i18n_string_update_context(
+ "commerce_discount:commerce_discount:" . $entity->original->name . ":component_title",
+ "commerce_discount:commerce_discount:" . $entity->name . ":component_title"
+ );
+ }
+ i18n_string_object_update('commerce_discount', $entity);
+ }
+ // We need to reload the discount afresh because some fields contain
+ // serialized and empty values.
+ $discount = entity_load_single('commerce_discount', $entity->discount_id);
+ _commerce_discount_rebuild_rules_config(array(clone $discount));
+}
+
+/**
+ * Actually rebuild the defaults of a given entity.
+ *
+ * @param array $discounts
+ * An array of discount entities.
+ *
+ * @see entity_defaults_rebuild()
+ */
+function _commerce_discount_rebuild_rules_config(array $discounts) {
+ // Return early if we can't acquire a lock on the rules config.
+ if (!lock_acquire('entity_rebuild_rules_config')) {
+ return;
+ }
+
+ $existing_rules_config = FALSE;
+ $rules_config_names = array();
+ foreach ($discounts as $discount) {
+ $rules_config_names[] = commerce_discount_build_rule_machine_name($discount->name);
+ }
+
+ $info = entity_get_info('rules_config');
+ $hook = isset($info['export']['default hook']) ? $info['export']['default hook'] : 'default_rules_config';
+ $keys = $info['entity keys'] + array(
+ 'module' => 'module',
+ 'status' => 'status',
+ 'name' => $info['entity keys']['id'],
+ );
+
+ // Check for the existence of the module and status columns.
+ if (!in_array($keys['status'], $info['schema_fields_sql']['base table']) || !in_array($keys['module'], $info['schema_fields_sql']['base table'])) {
+ trigger_error("Missing database columns for the exportable entity 'rules_config' as defined by entity_exportable_schema_fields(). Update the according module and run update.php!", E_USER_WARNING);
+ return;
+ }
+
+ // Rebuild the discount rules for the given discounts.
+ $entities = array();
+ foreach (commerce_discount_build_discount_rules($discounts) as $name => $entity) {
+ if (!in_array($name, $rules_config_names)) {
+ continue;
+ }
+ $entity->{$keys['name']} = $name;
+ $entity->{$keys['module']} = 'commerce_discount';
+ $entities[$name] = $entity;
+ $existing_rules_config = TRUE;
+ }
+ drupal_alter($hook, $entities);
+
+ // Check for defaults that disappeared or overridden?
+ if (!$existing_rules_config) {
+ $statuses = array(
+ $keys['status'] => array(
+ ENTITY_OVERRIDDEN,
+ ENTITY_IN_CODE,
+ ENTITY_FIXED,
+ ),
+ );
+ $existing_defaults = entity_load_multiple_by_name('rules_config', FALSE, $statuses);
+
+ foreach ($existing_defaults as $name => $entity) {
+ if (empty($entities[$name]) && in_array($name, $rules_config_names)) {
+ $entity->is_rebuild = TRUE;
+ if (entity_has_status('rules_config', $entity, ENTITY_OVERRIDDEN)) {
+ $entity->{$keys['status']} = ENTITY_CUSTOM;
+ entity_save('rules_config', $entity);
+ }
+ else {
+ entity_delete('rules_config', $name);
+ }
+ unset($entity->is_rebuild);
+ }
+ }
+ }
+
+ // Load all existing entities.
+ $existing_entities = entity_load_multiple_by_name('rules_config', array_keys($entities));
+
+ foreach ($existing_entities as $name => $entity) {
+ if (entity_has_status('rules_config', $entity, ENTITY_CUSTOM)) {
+ // If the entity already exists but is not yet marked as overridden, we
+ // have to update the status.
+ if (!entity_has_status('rules_config', $entity, ENTITY_OVERRIDDEN)) {
+ $entity->{$keys['status']} |= ENTITY_OVERRIDDEN;
+ $entity->{$keys['module']} = $entities[$name]->{$keys['module']};
+ $entity->is_rebuild = TRUE;
+ entity_save('rules_config', $entity);
+ unset($entity->is_rebuild);
+ }
+
+ // The entity is overridden, so we do not need to save the default.
+ unset($entities[$name]);
+ }
+ }
+
+ // Save defaults.
+ $originals = array();
+ foreach ($entities as $name => $entity) {
+ if (!empty($existing_entities[$name])) {
+ // Make sure we are updating the existing default.
+ $entity->{$keys['id']} = $existing_entities[$name]->{$keys['id']};
+ unset($entity->is_new);
+ }
+ // Pre-populate $entity->original as we already have it. So we avoid
+ // loading it again.
+ $entity->original = !empty($existing_entities[$name]) ? $existing_entities[$name] : FALSE;
+ // Keep original entities for hook_{entity_type}_defaults_rebuild()
+ // implementations.
+ $originals[$name] = $entity->original;
+
+ if (!isset($entity->{$keys['status']})) {
+ $entity->{$keys['status']} = ENTITY_IN_CODE;
+ }
+ else {
+ $entity->{$keys['status']} |= ENTITY_IN_CODE;
+ }
+ $entity->is_rebuild = TRUE;
+ entity_save('rules_config', $entity);
+ unset($entity->is_rebuild);
+ }
+
+ // Invoke an entity type-specific hook so modules may apply changes, e.g.
+ // efficiently rebuild caches.
+ module_invoke_all('rules_config_defaults_rebuild', $entities, $originals);
+
+ lock_release('entity_rebuild_rules_config');
}
/**
@@ -364,6 +539,9 @@ function commerce_discount_commerce_discount_update($entity) {
* Delete referenced commerce_discount_offer upon commerce_discount deletion.
*/
function commerce_discount_commerce_discount_delete($entity) {
+ if (module_exists('i18n_string')) {
+ i18n_string_object_remove('commerce_discount', $entity);
+ }
$wrapper = entity_metadata_wrapper('commerce_discount', $entity);
// Delete the referenced commerce_discount_offer.
if ($wrapper->commerce_discount_offer->value()) {
@@ -418,20 +596,23 @@ function commerce_discount_commerce_discount_offer_type_info() {
if (module_exists('commerce_shipping')) {
$types['free_shipping'] = array(
'label' => t('Free shipping'),
- 'action' => 'commerce_discount_free_shipping_service',
+ 'action' => 'commerce_discount_shipping_service',
'entity types' => array('commerce_order'),
- 'event' => 'commerce_discount_free_shipping',
);
$types['percent_off_shipping'] = array(
'label' => t('% off of shipping'),
- 'action' => 'commerce_discount_percent_off_shipping_service',
+ 'action' => 'commerce_discount_shipping_service',
+ 'entity types' => array('commerce_order'),
+ );
+ $types['shipping_upgrade'] = array(
+ 'label' => t('Shipping service upgrade'),
+ 'action' => 'commerce_discount_shipping_service',
'entity types' => array('commerce_order'),
- 'event' => 'commerce_discount_percent_off_shipping',
);
}
$types['free_products'] = array(
- 'label' => t('Free products'),
+ 'label' => t('Add free bonus products'),
'action' => 'commerce_discount_free_products',
'entity types' => array('commerce_order'),
);
@@ -459,11 +640,54 @@ function commerce_discount_commerce_discount_rule_build($rule, $discount) {
if ($action->getElementName() == 'commerce_discount_free_shipping_service') {
$action->settings['shipping_service'] = $shipping_service;
}
- else {
- $action->delete();
- }
}
}
+
+ // Product level discounts must pass the line item's order.
+ $map = array(
+ 'order_discount' => 'commerce-order',
+ 'product_discount' => 'commerce-line-item:order',
+ );
+
+ if (isset($map[$discount->type])) {
+ // Add condition for per-person usage.
+ if ($wrapper->discount_usage_per_person->value()) {
+ $rule->condition(
+ 'commerce_discount_usage_max_usage_per_person',
+ array(
+ 'commerce_discount' => $discount->name,
+ 'order:select' => $map[$discount->type],
+ 'usage' => $wrapper->discount_usage_per_person->value(),
+ )
+ );
+ }
+ // For normal usage.
+ if ($wrapper->discount_usage_limit->value()) {
+ $rule->condition(
+ 'commerce_discount_usage_max_usage',
+ array(
+ 'commerce_discount' => $discount->name,
+ 'order:select' => $map[$discount->type],
+ 'usage' => $wrapper->discount_usage_limit->value(),
+ )
+ );
+ }
+ }
+
+ if (!is_null($wrapper->commerce_discount_date->value())) {
+ // If the end date for the discount has already passed, disable the rule.
+ // Note that we add a day to the discount end date. The date field value is
+ // set for 12:00:00 AM on the end date, but we want the discount to remain
+ // valid through that day.
+ if (REQUEST_TIME >= $wrapper->commerce_discount_date->value2->value() + 86400) {
+ $rule->active = FALSE;
+ }
+
+ // Add condition to check usage didn't reach max uses.
+ $rule->condition('commerce_discount_date_condition', array(
+ 'commerce_discount' => $discount->name,
+ ));
+ }
}
/**
@@ -518,8 +742,8 @@ function commerce_discount_type($discount_type) {
*
* @return mixed
* Either an array of all discount type names keyed by the machine name or a
- * string containing the human readable name for the specified type. If a
- * type is specified that does not exist, this function returns FALSE.
+ * string containing the human readable name for the specified type. If a type
+ * is specified that does not exist, this function returns FALSE.
*/
function commerce_discount_type_get_name($type = NULL) {
$discount_types = commerce_discount_types();
@@ -621,7 +845,7 @@ function commerce_discount_offer_type_get_name($type = NULL) {
}
/**
- * Return an array keyed by commerce order type and label as value.
+ * Return an array keyed by commerce discount name and label as value.
*/
function commerce_discount_entity_list() {
$options = array();
@@ -643,6 +867,9 @@ function commerce_discount_commerce_line_item_type_info() {
'description' => t('Line item for fixed amounts.'),
'add_form_submit_value' => t('Add discount'),
'base' => 'commerce_discount_line_item',
+ 'callbacks' => array(
+ 'title' => 'commerce_discount_line_item_title',
+ ),
),
'product_discount' => array(
'type' => 'product_discount',
@@ -651,6 +878,9 @@ function commerce_discount_commerce_line_item_type_info() {
'product' => TRUE,
'add_form_submit_value' => t('Add product'),
'base' => 'commerce_product_line_item',
+ 'callbacks' => array(
+ 'title' => 'commerce_discount_product_line_item_title',
+ ),
),
);
}
@@ -658,9 +888,646 @@ function commerce_discount_commerce_line_item_type_info() {
/**
* Determine the discount's line item title.
*
- * @return
+ * @return string
* The line item title.
*/
-function commerce_discount_line_item_title() {
- return t('Fixed amount discount');
+function commerce_discount_line_item_title($line_item) {
+ $wrapper = entity_metadata_wrapper('commerce_discount', $line_item->data['discount_name']);
+ $title = $wrapper->component_title->value();
+ return empty($title) ? t('Fixed amount discount') : check_plain($title);
+}
+
+/**
+ * Determine the product_discount's line item title.
+ *
+ * This function wrap's the line item's title in a span element with a class to
+ * provide stylistic changes to a product which has a discount.
+ *
+ * @return string
+ * The line item title.
+ */
+function commerce_discount_product_line_item_title($line_item) {
+ return '' . commerce_product_line_item_title($line_item) . '';
+}
+
+/**
+ * Returns an array of discount compatibility strategies.
+ *
+ * Returned array used in a radio buttons select list.
+ */
+function commerce_discount_compatibility_strategies() {
+ return array(
+ 'any' => t('Any discount'),
+ 'except' => t('Any discount except specific discounts'),
+ 'only' => t('Only with specific discounts'),
+ 'none' => t('Not with any other discount'),
+ );
+}
+
+/**
+ * Returns the compatibility strategy for the given discount.
+ *
+ * @param CommerceDiscount $discount
+ * A Commerce Discount object with a commerce_compatibility_strategy field.
+ *
+ * @return string
+ * The discount's compatibility strategy or 'any' if none is set.
+ */
+function commerce_discount_get_compatibility_strategy($discount) {
+ if (isset($discount->commerce_compatibility_strategy[LANGUAGE_NONE])) {
+ $strategy = $discount->commerce_compatibility_strategy[LANGUAGE_NONE][0]['value'];
+ }
+
+ // If the compatibility strategy is not set, default to 'any'.
+ if (empty($strategy)) {
+ $strategy = 'any';
+ }
+
+ // Note that if the field is set to an unknown value, we still return it. The
+ // default condition for evaluating discount compatibility will pass through
+ // unknown discount strategies, so modules that set them are responsible also
+ // to evaluate them on behalf of all discounts.
+ return $strategy;
+}
+
+/**
+ * Returns the compatibility selection for the given discount.
+ *
+ * @param CommerceDiscount $discount
+ * A Commerce Discount object with a commerce_compatibility_selection field.
+ *
+ * @return int[]
+ * An array of discount IDs selected for the discount's compatibility strategy
+ * or an empty array if none are selected (or a non-array value is found).
+ */
+function commerce_discount_get_compatibility_selection($discount) {
+ // Don't use the entity_metadata_wrapper here on purpose for performance
+ // reasons.
+ $items = field_get_items('commerce_discount', $discount, 'commerce_compatibility_selection', LANGUAGE_NONE);
+ $selection = array();
+
+ if (!$items) {
+ return $selection;
+ }
+
+ foreach ($items as $item) {
+ $selection[] = $item['target_id'];
+ }
+
+ return $selection;
+}
+
+/**
+ * Returns a list of discounts applied.
+ *
+ * Returned list used to make a particular price as determined by its
+ * price components.
+ *
+ * @param array $price
+ * A price field value array including a data array with price components.
+ * @param string $type
+ * Optional. A discount type to filter the return array by so that only
+ * discounts of a matching type are returned.
+ *
+ * @return array
+ * Array of applied discounts.
+ */
+function commerce_discount_get_discounts_applied_to_price($price, $type = '') {
+ $applied_discounts = array();
+
+ // Return early if the price has no components.
+ if (empty($price['data']['components'])) {
+ return array();
+ }
+
+ // Loop over the price components looking for known discount components.
+ foreach ($price['data']['components'] as $component) {
+ if (strpos($component['name'], 'discount|') === 0) {
+ // Load the discount entity represented by this component.
+ $applied_discount_name = substr($component['name'], 9);
+ $applied_discount = entity_load_single('commerce_discount', $applied_discount_name);
+
+ // Add it to the list of applied discounts keyed by ID to prevent
+ // duplicates.
+ if (!empty($applied_discount)) {
+ // Only add the discount to the return value if type filtering was not
+ // requested or the type matches.
+ if (empty($type) || $applied_discount->type == $type) {
+ $applied_discounts[$applied_discount->discount_id] = $applied_discount_name;
+ }
+ }
+ }
+ }
+
+ return $applied_discounts;
+}
+
+/**
+ * Returns a list of discount strategies for free shipping offers.
+ */
+function commerce_discount_free_shipping_strategies() {
+ return array(
+ 'only_selected' => t('Only discount the selected shipping service.'),
+ 'discount_all' => t('Discount all other shipping services by the same amount as the selected shipping service.'),
+ );
+}
+
+/**
+ * Returns the free shipping strategy for the given discount.
+ *
+ * @param CommerceDiscount $discount
+ * A Commerce Discount object with a commerce_free_shipping_strategy field.
+ *
+ * @return string
+ * The discount's free shipping strategy or 'only_selected' if none is set.
+ */
+function commerce_discount_get_free_shipping_strategy($discount) {
+ $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount);
+ $strategy = $discount_wrapper->commerce_discount_offer->commerce_free_shipping_strategy->value();
+
+ // If the free shipping strategy is not set, default to 'only_selected'.
+ if (empty($strategy)) {
+ $strategy = 'only_selected';
+ }
+
+ // Note that if the field is set to an unknown value, we still return it. The
+ // default action for applying a free shipping discount will pass through
+ // unknown discount strategies, so modules that set them are responsible also
+ // to evaluate them on behalf of all discounts.
+ return $strategy;
+}
+
+/**
+ * Get usage of a discount for a user, excluding a certain order id.
+ *
+ * @param string $discount_name
+ * The discount name.
+ * @param string $mail
+ * The user mail.
+ * @param int|bool $exclude_order_id
+ * If provided, the order_id to ignore when calculating the discount usage.
+ *
+ * @return int
+ * Return the number of usage by mail.
+ */
+function commerce_discount_usage_get_usage_by_mail($discount_name, $mail, $exclude_order_id = FALSE) {
+ $usage = &drupal_static(__FUNCTION__, array());
+
+ if (!isset($usage[$mail])) {
+ $usage[$mail] = array();
+ $query = db_select('commerce_discount_usage', 'g')
+ ->fields('g')
+ ->condition('g.mail', $mail);
+ $results = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
+
+ foreach ($results as $result) {
+ $usage[$mail] += array(
+ $result['discount'] => array(),
+ );
+ $usage[$mail][$result['discount']][] = $result['order_id'];
+ }
+ }
+ // The usage array for the given discount must be initialized if not set,
+ // otherwise the array_diff will get a wrong argument.
+ $usage[$mail] += array(
+ $discount_name => array(),
+ );
+
+ // Exclude the order_id passed if necessary.
+ if ($exclude_order_id) {
+ $usage[$mail][$discount_name] = array_diff($usage[$mail][$discount_name], array($exclude_order_id));
+ }
+
+ return count($usage[$mail][$discount_name]);
+}
+
+/**
+ * Implements hook_commerce_order_update().
+ */
+function commerce_discount_commerce_order_update($order) {
+ commerce_discount_usage_record_order_usage($order);
+}
+
+/**
+ * Implements hook_commerce_order_insert().
+ */
+function commerce_discount_commerce_order_insert($order) {
+ commerce_discount_usage_record_order_usage($order);
+}
+
+/**
+ * Implements hook_commerce_order_delete().
+ */
+function commerce_discount_commerce_order_delete($order) {
+ commerce_discount_usage_reset_order_usage($order);
+}
+
+/**
+ * Loads all discounts connected to an order.
+ *
+ * Loads discounts including line item level discounts traced through
+ * line item unit price components.
+ *
+ * @param object $order
+ * A fully qualified order object.
+ *
+ * @return array
+ * List of order discounts.
+ */
+function commerce_discount_usage_order_discounts($order) {
+ $order_wrapper = entity_metadata_wrapper('commerce_order', $order);
+ $order_discounts = array();
+
+ foreach ($order_wrapper->commerce_line_items as $line_item_wrapper) {
+ try {
+ $unit_price = commerce_price_wrapper_value($line_item_wrapper, 'commerce_unit_price', TRUE);
+ }
+ catch (Exception $ex) {
+ // Log and continue if we're unable to load the unit price.
+ // @TODO Resolve how to prevent commerce_cart_order_refresh() from firing
+ // inside an order save via entity_load_unchanged().
+ // @see https://www.drupal.org/node/2661530
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS);
+ $watchdog_variables = array('@backtrace' => json_encode($backtrace, JSON_PRETTY_PRINT));
+ watchdog('commerce_discount', 'Discount usage line item is missing. Backtrace: @backtrace', $watchdog_variables, WATCHDOG_DEBUG); + continue; + } + + foreach ($unit_price['data']['components'] as $key => $component) { + if (strpos($component['name'], 'discount|') === 0 && !empty($component['price']['data']['discount_name'])) { + $order_discount_name = $component['price']['data']['discount_name']; + $order_discount_wrapper = entity_metadata_wrapper('commerce_discount', $order_discount_name); + // Make a list of discounts present via the order's line item price + // components. + if ($order_discount_wrapper->value()) { + $order_discounts[] = $order_discount_wrapper->name->value(); + } + } + } + } + + // Add the set of discounts directly referenced on the order. + if (isset($order->commerce_discounts) && $order_wrapper->commerce_discounts->value()) { + foreach ($order_wrapper->commerce_discounts->value() as $discount) { + if (isset($discount->name)) { + $order_discounts[] = $discount->name; + } + } + } + + $order_discounts = array_unique($order_discounts); + + return $order_discounts; +} + +/** + * Record order usage. + * + * @param object $order + * A fully qualified order object. + */ +function commerce_discount_usage_record_order_usage($order) { + // Reset usage for this order first. + commerce_discount_usage_reset_order_usage($order); + + // Only record discount usage if the order has an email. + $discount_names = commerce_discount_usage_order_discounts($order); + + foreach ($discount_names as $discount_name) { + $record = array( + 'discount' => $discount_name, + 'mail' => $order->mail ? $order->mail : '', + 'order_id' => $order->order_id, + ); + drupal_write_record('commerce_discount_usage', $record); + } +} + +/** + * Reset usage statistics for an entire order. + * + * @param object $order + * A fully qualified order object. + * + * @return DeleteQuery + * Return a new DeleteQuery object. + */ +function commerce_discount_usage_reset_order_usage($order) { + return db_delete('commerce_discount_usage') + ->condition('order_id', $order->order_id) + ->execute(); +} + +/** + * Get usage of a discount, excluding a certain order id. + * + * @param string $discount_name + * The discount name. + * @param bool $exclude_order_id + * If TRUE, the order id will be excluded from the SQL request. + * + * @return int + * Return the number of usage. + */ +function commerce_discount_usage_get_usage($discount_name, $exclude_order_id = FALSE) { + $query = db_select('commerce_discount_usage', 'g') + ->fields('g') + ->condition('g.discount', $discount_name); + + if ($exclude_order_id) { + $query->condition('g.order_id', $exclude_order_id, '<>'); + } + + return $query->execute()->rowCount(); +} + +/** + * Deletes the first discount line item on an order matching by discount name. + * + * @param EntityDrupalWrapper $order_wrapper + * The wrapped order entity. + * @param string $discount_name + * The name of the discount whose line item should be deleted. + * + * @return bool + * TRUE if line item deleted, or FALSE if not found. + */ +function commerce_discount_delete_discount_line_item_by_name($order_wrapper, $discount_name) { + foreach ($order_wrapper->commerce_line_items as $line_item_wrapper) { + if ($line_item_wrapper->getBundle() == 'commerce_discount') { + $line_item = $line_item_wrapper->value(); + + if (isset($line_item->data['discount_name']) && $line_item->data['discount_name'] == $discount_name) { + commerce_line_item_delete($line_item_wrapper->line_item_id->value()); + return TRUE; + } + } + } + + return FALSE; +} + +/** + * Implements hook_entity_info_alter(). + */ +function commerce_discount_entity_info_alter(&$info) { + if (module_exists('i18n_string')) { + // Enable i18n support via the entity API. + $info['commerce_discount']['i18n controller class'] = 'EntityDefaultI18nStringController'; + } +} + +/** + * Implements hook_entity_property_info_alter(). + */ +function commerce_discount_entity_property_info_alter(&$info) { + if (module_exists('i18n_string')) { + // Mark some properties as translatable, but also denote that translation + // works with i18n_string. + foreach (array('component_title') as $name) { + $info['commerce_discount']['properties'][$name]['translatable'] = TRUE; + $info['commerce_discount']['properties'][$name]['i18n string'] = TRUE; + } + } +} + +/** + * Implements hook_query_TAG_alter(). + */ +function commerce_discount_query_entityreference_alter($query) { + $field = $query->getMetaData('field'); + + // Alter the default autocomplete for the compatibility selection field... + if ($field['field_name'] == 'commerce_compatibility_selection' && + strpos(current_path(), 'entityreference/autocomplete') === 0) { + // Extract the bundle of the discount whose compatibility settings are + // being adjusted and limit the autocomplete query to discounts of the + // same bundle (i.e. discount type, Product vs. Order). + $bundle_name = arg(5); + + if (in_array($bundle_name, array('product_discount', 'order_discount'))) { + $query->condition('type', $bundle_name); + } + + // Also do not include the current discount itself as an option. + $entity_id = arg(6); + + if ($entity_id != 'NULL') { + $query->condition('discount_id', $entity_id, '!='); + } + } +} + +/** + * Build the rules configuration for the given discounts. + * + * @param array $discounts + * An array of discount entities. + * + * @return array + * An array of rules configuration objects. + */ +function commerce_discount_build_discount_rules(array $discounts) { + $rules = array(); + $types = commerce_discount_types(); + $offer_types = commerce_discount_offer_types(); + + foreach ($discounts as $discount) { + $wrapper = entity_metadata_wrapper('commerce_discount', $discount); + $wrapper_properties = $wrapper->getPropertyInfo(); + // Only for Commerce Discount wrappers with Commerce Discount Offer defined. + if (isset($wrapper->commerce_discount_offer)) { + $offer_bundle = $wrapper->commerce_discount_offer->getBundle(); + if (!isset($offer_types[$offer_bundle])) { + continue; + } + + $type = $types[$discount->type]; + $offer_type = $offer_types[$offer_bundle]; + + $rule = rules_reaction_rule(); + + $rule->label = $discount->label; + $rule->active = $discount->status; + $rule->weight = !empty($discount->sort_order) ? $discount->sort_order - 11 : -1; + $rule->tags = array('Commerce Discount', check_plain($type['label'])); + + $rule + ->event(!empty($offer_type['event']) ? $offer_type['event'] : $type['event']) + ->action( + $offer_type['action'], array( + 'entity:select' => $type['entity type'], + 'commerce_discount' => $discount->name, + ) + ); + + // Add the compatibility condition to all discounts. Even if the current + // discount is compatible with any other discount, we need to prevent it + // from being added if a previously applied discount indicates it is not + // compatible with the current one. + if ($type['entity type'] == 'commerce_order') { + $rule->condition('commerce_discount_compatibility_check', array( + 'commerce_order:select' => 'commerce-order', + 'commerce_discount' => $discount->name, + )); + } + else { + $rule->condition('commerce_discount_line_item_compatibility_check', array( + 'commerce_line_item:select' => 'commerce-line-item', + 'commerce_discount' => $discount->name, + )); + } + + // Let other modules alter the rule object, with configuration specific + // to commerce discount. We don't invoke an alter function, as it can + // be already achieved by implementing + // hook_default_rules_configuration_alter(). + module_invoke_all('commerce_discount_rule_build', $rule, $discount); + + // Let inline_conditions fields add their own conditions. + foreach ($wrapper_properties as $field_name => $property) { + if (stripos($property['type'], 'inline_conditions') !== FALSE) { + inline_conditions_build($rule, $wrapper->{$field_name}->value()); + } + } + + // Add the commerce discount to the rule configuration, so other may act + // according to it, in hook_default_rules_configuration_alter(). + $rule->commerce_discount = $discount; + + $rule_machine_name = commerce_discount_build_rule_machine_name($discount->name); + $rules[$rule_machine_name] = $rule; + } + } + + return $rules; +} + +/** + * Builds a machine name suitable for use as the rule machine name. + * + * @param string $discount_name + * The machine-name of the discount to build the rule name for. + * + * @return string + * A machine name to be used as the rule configuration machine name. + */ +function commerce_discount_build_rule_machine_name($discount_name) { + $rule_machine_name = 'commerce_discount_rule_' . $discount_name; + // Ensure the name isn't too long. + if (strlen($rule_machine_name) > 64) { + // Shorten the name but ensure uniqueness by using a hash. + $hash = crc32($discount_name); + $rule_machine_name = substr($rule_machine_name, 0, 64 - strlen($hash) - 1) . '_' . $hash; + } + return $rule_machine_name; +} + +/** + * Returns the default array structure for a price field for use when + * reinitializing discount line items. + * + * @param string $currency_code + * The currency code. + * + * @return array + * An initialized price array. + */ +function commerce_discount_empty_price($currency_code) { + $price = array( + 'amount' => 0, + 'currency_code' => $currency_code, + ); + $price['data'] = commerce_price_component_add($price, 'base_price', $price, TRUE, FALSE); + return $price; +} + +/** + * Dumb copy of commerce_order_calculate_total() which accepts a wrapped order. + * This is necessary when called from within a function that already has a + * wrapped order entity to make sure the static cache of the + * commerce_order_total field is correctly updated. + */ +function commerce_discount_calculate_order_total($order_wrapper) { + // First determine the currency to use for the order total. + $default_currency_code = $currency_code = commerce_default_currency(); + $currencies = array(); + + // Populate an array of how many line items on the order use each currency. + foreach ($order_wrapper->commerce_line_items as $delta => $line_item_wrapper) { + // If the current line item actually no longer exists... + if (!$line_item_wrapper->value()) { + // Remove the reference from the order and continue to the next value. + $order_wrapper->commerce_line_items->offsetUnset($delta); + continue; + } + + $line_item_currency_code = $line_item_wrapper->commerce_total->currency_code->value(); + + if (!isset($currencies[$line_item_currency_code])) { + $currencies[$line_item_currency_code] = 1; + } + else { + $currencies[$line_item_currency_code]++; + } + } + + reset($currencies); + + // If only one currency is present on the order, use that to calculate the + // order total. + if (count($currencies) == 1) { + $currency_code = key($currencies); + } + elseif (isset($currencies[$default_currency_code])) { + // Otherwise use the site default currency if it's in the order. + $currency_code = $default_currency_code; + } + elseif (count($currencies) > 1) { + // Otherwise use the first currency on the order. We do this instead of + // trying to determine the most dominant currency for now because using the + // first currency leaves the option open for a UI based module to let + // customers reorder the items in the cart by currency to get the order + // total in a different currency. The currencies array still contains useful + // data, though, should we decide to expand on the count by currency approach. + $currency_code = key($currencies); + } + + // Initialize the order total with the selected currency. + $order_wrapper->commerce_order_total->amount = 0; + $order_wrapper->commerce_order_total->currency_code = $currency_code; + + // Reset the data array of the order total field to only include a + // base price component, set the currency code from any line item. + $base_price = array( + 'amount' => 0, + 'currency_code' => $currency_code, + 'data' => array(), + ); + + $order_wrapper->commerce_order_total->data = commerce_price_component_add($base_price, 'base_price', $base_price, TRUE); + $order_total = $order_wrapper->commerce_order_total->value(); + + // Then loop over each line item and add its total to the order total. + $amount = 0; + + foreach ($order_wrapper->commerce_line_items as $delta => $line_item_wrapper) { + // Convert the line item's total to the order's currency for totalling. + $line_item_total = $line_item_wrapper->commerce_total->value(); + $component_total = commerce_price_component_total($line_item_total); + + // Add the totals. + $amount += commerce_currency_convert( + $component_total['amount'], + $component_total['currency_code'], + $currency_code + ); + + // Combine the line item total's component prices into the order total. + $order_total['data'] = commerce_price_components_combine($order_total, $line_item_total); + } + + // Update the order total price field with the final total amount and data. + $order_wrapper->commerce_order_total->amount = round($amount); + $order_wrapper->commerce_order_total->data = $order_total['data']; } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.rules.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.rules.inc index 1b4a1fe7..3c02807a 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.rules.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/commerce_discount.rules.inc @@ -12,6 +12,101 @@ function commerce_discount_rules_condition_info() { $inline_conditions = inline_conditions_get_info(); $conditions = array(); + // Max usage per person. + $conditions['commerce_discount_usage_max_usage_per_person'] = array( + 'label' => t('Max usage per person'), + 'parameter' => array( + 'order' => array( + 'type' => 'commerce_order', + 'label' => t('Order'), + ), + 'commerce_discount' => array( + 'label' => t('Commerce Discount'), + 'type' => 'token', + 'options list' => 'commerce_discount_entity_list', + ), + 'usage' => array( + 'type' => 'integer', + 'label' => t('Maximum usage per customer'), + 'description' => t('Enter the maximum number of times a specific person (as identified by email) may use this discount. Leave blank for unlimited.'), + ), + ), + 'group' => t('Commerce Discount'), + ); + + // Max usage. + $conditions['commerce_discount_usage_max_usage'] = array( + 'label' => t('Max usage'), + 'parameter' => array( + 'order' => array( + 'type' => 'commerce_order', + 'label' => t('Order'), + ), + 'commerce_discount' => array( + 'label' => t('Commerce Discount'), + 'type' => 'token', + 'options list' => 'commerce_discount_entity_list', + ), + 'usage' => array( + 'type' => 'integer', + 'label' => t('Maximum overall usage'), + 'description' => t('Enter the maximum number of times this discount may be used on the site, by anyone. Leave blank for unlimited.'), + ), + ), + 'group' => t('Commerce Discount'), + ); + + $conditions['commerce_discount_date_condition'] = array( + 'label' => t('Check discount dates'), + 'group' => t('Commerce Discount'), + 'parameter' => array( + 'commerce_discount' => array( + 'label' => t('Commerce Discount'), + 'type' => 'token', + 'options list' => 'commerce_discount_entity_list', + ), + ), + 'base' => 'commerce_discount_date_condition', + ); + + $conditions['commerce_discount_compatibility_check'] = array( + 'label' => t('Check discount compatibility at the order level'), + 'parameter' => array( + 'commerce_order' => array( + 'type' => 'commerce_order', + 'label' => t('Order'), + 'description' => t('The order the discount would be applied to.'), + 'wrapped' => TRUE, + ), + 'commerce_discount' => array( + 'type' => 'token', + 'label' => t('Discount'), + 'description' => t('A discount with a compatibility strategy that requires evaluation.'), + 'options list' => 'commerce_discount_entity_list', + ), + ), + 'group' => t('Commerce Discount'), + ); + + $conditions['commerce_discount_line_item_compatibility_check'] = array( + 'label' => t('Check discount compatibility at the line item level'), + 'parameter' => array( + 'commerce_line_item' => array( + 'type' => 'commerce_line_item', + 'label' => t('Line item'), + 'description' => t('The line item the discount would be applied to.'), + 'wrapped' => TRUE, + ), + 'commerce_discount' => array( + 'type' => 'token', + 'label' => t('Discount'), + 'description' => t('A discount with a compatibility strategy that requires evaluation.'), + 'options list' => 'commerce_discount_entity_list', + ), + ), + 'group' => t('Commerce Discount'), + ); + if (module_exists('commerce_order')) { $conditions['commerce_order_compare_order_amount'] = array( 'label' => t('Order amount comparison'), @@ -27,7 +122,7 @@ function commerce_discount_rules_condition_info() { 'label' => t('Operator'), 'description' => t('The operator used with the order amount value below.'), 'default value' => '>=', - 'options list' => '_inline_conditions_operator_options', + 'options list' => '_commerce_discount_operator_options', ), 'total' => array( 'type' => 'commerce_price', @@ -35,9 +130,17 @@ function commerce_discount_rules_condition_info() { 'default value' => '', 'description' => t('The value to compare against the passed order amount.'), ), + 'line_item_types' => array( + 'type' => 'list
' . t('For more information, refer to the discount compatibility !link on drupal.org.', array('!link' => '' . t('documentation page') . ''));; + + // Ensure the compatibility strategy field has a default value. + if (empty($form['commerce_discount_fields']['commerce_compatibility_strategy'][LANGUAGE_NONE]['#default_value'])) { + $form['commerce_discount_fields']['commerce_compatibility_strategy'][LANGUAGE_NONE]['#default_value'] = 'any'; + } + + // Add visibility states to the discount compatibility selection field. + $form['commerce_discount_fields']['commerce_compatibility_selection']['#states'] = array( + 'visible' => array( + ':input[name="commerce_discount_fields[commerce_compatibility_strategy][' . LANGUAGE_NONE . ']"]' => array( + array('value' => 'except'), + array('value' => 'only'), + ), + ), + ); + + // We have to do some extra adjustments to move compatibility fields into + // the vertical tabs. + $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_strategy'] = $form['commerce_discount_fields']['commerce_compatibility_strategy']; + $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_strategy']['#parents'] = array( + 'commerce_discount_fields', 'commerce_compatibility_strategy', + ); + $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_selection'] = $form['commerce_discount_fields']['commerce_compatibility_selection']; + $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_selection']['#parents'] = array( + 'commerce_discount_fields', 'commerce_compatibility_selection', + ); + unset($form['commerce_discount_fields']['commerce_compatibility_strategy'], $form['commerce_discount_fields']['commerce_compatibility_selection']); + $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', '#value' => t('Save discount'), '#weight' => 40, '#ief_submit_all' => TRUE, - '#submit' => null, + '#submit' => NULL, ); if (!$commerce_discount->hasStatus(ENTITY_IN_CODE) && $op != 'add') { @@ -242,17 +325,30 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_ '#weight' => 45, '#limit_validation_errors' => array(), '#submit' => array('commerce_discount_form_submit_delete'), + '#suffix' => l(t('Cancel'), 'admin/commerce/discounts'), ); } + else { + $form['actions']['submit']['#suffix'] = l(t('Cancel'), 'admin/commerce/discounts'); + } + + $form['commerce_discount_fields']['additional_settings']['commerce_discount_usage'] = array( + '#type' => 'fieldset', + '#title' => t('Maximum usage'), + '#collapsible' => TRUE, + ); + $form['commerce_discount_fields']['additional_settings']['discount_date'] = array( + '#type' => 'fieldset', + '#title' => t('Discount dates'), + '#collapsible' => TRUE, + '#weight' => -1, + ); // Add assets. $form['#attached']['js'][] = drupal_get_path('module', 'commerce_discount') . '/js/commerce_discount.js'; $form['#attached']['css'][] = drupal_get_path('module', 'commerce_discount') . '/css/commerce_discount.css'; - // Load rtl.css file if needed. - if ($GLOBALS['language']->direction == 1) { - $form['#attached']['css'][] = drupal_get_path('module', 'commerce_discount') . '/css/commerce_discount-rtl.css'; - } $form['#attributes']['class'][] = 'commerce-discount-form'; + return $form; } @@ -275,6 +371,14 @@ function commerce_discount_form_validate($form, &$form_state) { if (!empty($form_state['values']['name'])) { form_set_value($form['name'], 'discount_' . $form_state['values']['name'], $form_state); } + + // Check if this is a percentage offer. + if (isset($form_state['values']['commerce_discount_fields']['commerce_discount_offer'][LANGUAGE_NONE]['form']['commerce_percentage'])) { + $percentage = $form_state['values']['commerce_discount_fields']['commerce_discount_offer'][LANGUAGE_NONE]['form']['commerce_percentage'][LANGUAGE_NONE][0]['value']; + if (!empty($percentage) && $percentage <= 0) { + form_set_error('commerce_discount_fields][commerce_discount_offer][' . LANGUAGE_NONE . '][form][commerce_percentage', t('Percentage should be a positive, non-zero number.')); + } + } } /** @@ -283,23 +387,30 @@ function commerce_discount_form_validate($form, &$form_state) { function commerce_discount_form_submit(&$form, &$form_state) { $commerce_discount = entity_ui_form_submit_build_entity($form, $form_state); $commerce_discount->save(); - $form_state['redirect'] = 'admin/commerce/store/discounts'; + + // Set the redirect based on the type of the discount. + if ($commerce_discount->type == 'order_discount') { + $form_state['redirect'] = array('admin/commerce/discounts', array('query' => array('type' => 'order_discount'))); + } + else { + $form_state['redirect'] = 'admin/commerce/discounts'; + } } /** * Form API submit callback for the delete button. */ function commerce_discount_form_submit_delete(&$form, &$form_state) { - $form_state['redirect'] = 'admin/commerce/store/discounts/manage/' . $form_state['commerce_discount']->name . '/delete'; + $form_state['redirect'] = 'admin/commerce/discounts/manage/' . $form_state['commerce_discount']->name . '/delete'; } /** * Checks if a Discount machine name is taken. * - * @param $value + * @param string $value * The machine name, not prefixed with 'discount_'. * - * @return + * @return object|bool * Whether or not the field machine name is taken. */ function _commerce_discount_name_exists($value) { @@ -318,9 +429,67 @@ function commerce_discount_settings() { $form['commerce_discount_line_item_types'] = array( '#type' => 'checkboxes', '#title' => t('Line item types to use for discounts'), - '#default_value' => variable_get('commerce_discount_line_item_types', array('product')), + '#default_value' => variable_get('commerce_discount_line_item_types', array_diff(commerce_product_line_item_types(), array('product_discount'))), '#options' => $types, '#description' => t('Select the line item types that will be taken into account for calculating the discount amounts in percentage offers.'), ); return system_settings_form($form); } + +/** + * Add fields to the additional_settings vertical tabs container. + */ +function commerce_discount_form_pre_render($fields) { + $fields['additional_settings']['commerce_discount_usage']['discount_usage_per_person'] = $fields['discount_usage_per_person']; + $fields['additional_settings']['commerce_discount_usage']['discount_usage_limit'] = $fields['discount_usage_limit']; + $fields['additional_settings']['discount_date']['commerce_discount_date'] = $fields['commerce_discount_date']; + + unset($fields['discount_usage_per_person']); + unset($fields['discount_usage_limit']); + unset($fields['commerce_discount_date']); + + return $fields; +} + +/** + * Implements hook_date_combo_process_alter(). + */ +function commerce_discount_date_combo_process_alter(&$element, &$form_state, $context) { + if ($element['#field_name'] == 'commerce_discount_date') { + $element['#attributes'] = 'container-inline'; + + // Hide the checkbox for showing the end date. + $element['show_todate']['#type'] = 'value'; + $element['show_todate']['#default_value'] = TRUE; + unset($element['show_todate']['#prefix']); + unset($element['show_todate']['#suffix']); + + // Ignore the "Show end date" checkbox. + unset($element['value2']['#states']); + + // Remove fieldset description. + $element['#fieldset_description'] = ''; + } +} + +/** + * Implements hook_date_popup_process_alter(). + */ +function commerce_discount_date_popup_process_alter(&$element, &$form_state, $context) { + if ($element['#field']['field_name'] == 'commerce_discount_date') { + // Date-clear. + unset($element['#attributes']['class']); + array_shift($element['#wrapper_attributes']['class']); + // Reset the titles and descriptions of the start and end date fields. + $field_name = end($element['#parents']); + if ($field_name == 'value') { + $element['date']['#title'] = t('Start date'); + $element['date']['#description'] = t('Starts at 12:00:00 AM'); + } + else { + $element['date']['#title'] = t('End date'); + $element['date']['#description'] = t('Ends after 11:59:59 PM'); + } + $element['#title'] = ''; + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.class.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.class.inc index c1a1351b..e27724e8 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.class.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.class.inc @@ -1,5 +1,10 @@ component_title = $this->getTranslation('component_title'); } + /** + * {@inheritdoc} + */ protected function defaultUri() { $entity_info = entity_get_info('commerce_discount'); $path = $entity_info['admin ui']['path'] . '/manage'; return array('path' => $path . '/' . $this->name); } + + /** + * Overridden, to introduce the method for old entity API versions (BC). + * + * @todo Remove once we bump the required entity API version. + */ + public function getTranslation($property, $langcode = NULL) { + if (module_exists('i18n_string')) { + return parent::getTranslation($property, $langcode); + } + return $this->$property; + } + } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.controller.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.controller.inc index f53a62db..ec2e6a91 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.controller.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount.controller.inc @@ -11,13 +11,15 @@ class CommerceDiscountControllerExportable extends EntityAPIControllerExportable { /** - * Override export, to allow embedding the commerce discount offer - * inside the export of the comemrce discount. + * {@inheritdoc} + * + * Override export, to allow embedding the commerce discount offer inside the + * export of the commerce discount. */ public function export($entity, $prefix = '') { $vars = get_object_vars($entity); - // Add commerce_discout_offer full entity export. + // Add commerce_discount_offer full entity export. $wrapper = entity_metadata_wrapper('commerce_discount', $entity); $discount_offer = $wrapper->commerce_discount_offer->value(); if (!empty($discount_offer)) { @@ -38,7 +40,7 @@ class CommerceDiscountControllerExportable extends EntityAPIControllerExportable * @param string $export * An exported entity as serialized string. * - * @return + * @return object * An entity object not yet saved. */ public function import($export) { @@ -52,7 +54,7 @@ class CommerceDiscountControllerExportable extends EntityAPIControllerExportable } /** - * Overridden to handle embedded dicount_offer update. + * Overridden to handle embedded discount_offer update. */ public function save($entity, DatabaseTransaction $transaction = NULL) { // If overwriting an existing discount, delete the referenced @@ -75,7 +77,9 @@ class CommerceDiscountControllerExportable extends EntityAPIControllerExportable */ public function delete($ids, DatabaseTransaction $transaction = NULL) { parent::delete($ids, $transaction); - // Rebuild entities. + + // Rebuild rules config. entity_defaults_rebuild(array('rules_config')); } + } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount_offer.class.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount_offer.class.inc index c0c8a2f8..7da6c5a6 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount_offer.class.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/commerce_discount_offer.class.inc @@ -1,5 +1,10 @@ type = $form_state['commerce_dicount_offer_selection_' . $entity_form['#ief_id']]; + if (isset($form_state['commerce_discount_offer_selection_' . $entity_form['#ief_id']])) { + $offer->type = $form_state['commerce_discount_offer_selection_' . $entity_form['#ief_id']]; } // Get discount type. $discount_type = commerce_discount_type($form_state['commerce_discount']->type); - $options = array(); + $offer_types = array(); foreach (commerce_discount_offer_types() as $type => $info) { if (in_array($discount_type['entity type'], $info['entity types'])) { - $options[$type] = $info['label']; + $offer_types[$type] = $info['label']; } } // Ensures the discount type includes the passed offer type. If not, set the // offer type to the first found valid offer. - if (!in_array($offer->type, array_keys($options))) { - $offer->type = reset(array_keys($options)); + if (!in_array($offer->type, array_keys($offer_types))) { + $offer->type = reset(array_keys($offer_types)); + } + + $ief_id = $entity_form['#ief_id']; + field_attach_form('commerce_discount_offer', $offer, $entity_form, $form_state, LANGUAGE_NONE); + + $fields_wrapper = array( + '#type' => 'container', + '#attributes' => array( + 'class' => array('commerce-offer-fields-wrapper'), + ), + '#weight' => 2, + '#parents' => array( + 'commerce_discount_fields', + 'commerce_discount_offer', + LANGUAGE_NONE, + 'form', + ), + ); + + // Transfer field elements onto fields container. + foreach (element_children($entity_form) as $key) { + $fields_wrapper[$key] = $entity_form[$key]; + unset($entity_form[$key]); } + // Set the fields container back to the form. + $entity_form['commerce_discount_offer_fields'] = $fields_wrapper; + // Add offer type options. $entity_form['type'] = array( - '#title' => t('Choose offer type'), '#type' => 'radios', - '#options' => $options, + '#title' => t('Choose offer type'), + '#title_display' => 'invisible', + '#options' => $offer_types, '#required' => FALSE, '#default_value' => $offer->type, '#ajax' => array( - 'callback' => 'inline_entity_form_get_element', - 'wrapper' => 'inline-entity-form-' . $entity_form['#ief_id'], + 'callback' => 'inline_entity_form_get_element', + 'wrapper' => 'inline-entity-form-' . $ief_id, ), + '#weight' => 1, ); - field_attach_form('commerce_discount_offer', $offer, $entity_form, $form_state, LANGUAGE_NONE); + // Add wrapper class for CSS to avoid form item collisions. + $entity_form['#attributes']['class'][] = 'commerce-offer-type-wrapper'; + $entity_form['#type'] = 'fieldset'; + $entity_form['#title'] = t('Choose offer type'); return $entity_form; } + } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views.inc index 5fd510fb..0d3273d0 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views.inc @@ -16,26 +16,26 @@ class CommerceDiscountViewsController extends EntityDefaultViewsController { public function views_data() { $data = parent::views_data(); - // Expose the product status. - $data['commerce_discount']['status'] = array( - 'title' => t('Status'), - 'help' => t('Whether or not the discount is active.'), - 'field' => array( - 'handler' => 'views_handler_field_boolean', - 'click sortable' => TRUE, - 'output formats' => array( - 'active-disabled' => array(t('Active'), t('Disabled')), + // Expose the product status. + $data['commerce_discount']['status'] = array( + 'title' => t('Status'), + 'help' => t('Whether or not the discount is active.'), + 'field' => array( + 'handler' => 'views_handler_field_boolean', + 'click sortable' => TRUE, + 'output formats' => array( + 'active-disabled' => array(t('Active'), t('Disabled')), + ), ), - ), - 'filter' => array( - 'handler' => 'views_handler_filter_boolean_operator', - 'label' => t('Active'), - 'type' => 'yes-no', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), - ); + 'filter' => array( + 'handler' => 'views_handler_filter_boolean_operator', + 'label' => t('Active'), + 'type' => 'yes-no', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); // Show the operations using CTools dropbutton menu. $data['commerce_discount']['operations_dropbutton'] = array( @@ -52,3 +52,163 @@ class CommerceDiscountViewsController extends EntityDefaultViewsController { } } + +/** + * Implements hook_views_data_alter(). + */ +function commerce_discount_views_data_alter(&$data) { + if (isset($data['commerce_discount'])) { + + // Usage analytics field. + $data['commerce_discount']['commerce_discount_usage'] = array( + 'title' => t('Analytics'), + 'help' => t('Show discount usage and usage limit.'), + 'field' => array( + 'handler' => 'commerce_discount_handler_field_commerce_discount_analytics', + ), + 'real field' => 'discount_id', + ); + + // Usage relationship. + $data['commerce_discount']['discount_usage'] = array( + 'relationship' => array( + 'title' => t('Discount usage'), + 'label' => t('Discount usage'), + 'help' => t('Relate this discount to its usage statistics.'), + 'handler' => 'views_handler_relationship', + 'base' => 'commerce_discount_usage', + 'base field' => 'discount', + 'field' => 'name', + ), + ); + } + + // Order table: discount usage relationship. + if (isset($data['commerce_order'])) { + $data['commerce_order']['discount_usage'] = array( + 'relationship' => array( + 'title' => t('Discount usage'), + 'label' => t('Discount usage'), + 'help' => t('Relate this order to its discount usage statistics.'), + 'handler' => 'views_handler_relationship', + 'base' => 'commerce_discount_usage', + 'base field' => 'order_id', + 'field' => 'order_id', + ), + ); + } + + // User table: discount usage relationship. + $data['users']['discount_usage'] = array( + 'relationship' => array( + 'title' => t('Discount usage'), + 'label' => t('Discount usage'), + 'help' => t('Relate this user to its discount usage statistics.'), + 'handler' => 'views_handler_relationship', + 'base' => 'commerce_discount_usage', + 'base field' => 'mail', + 'field' => 'mail', + ), + ); +} + +/** + * Implements hook_views_data(). + */ +function commerce_discount_usage_views_data() { + $data = array(); + $data['commerce_discount_usage']['table']['group'] = t('Commerce discount usage'); + + // Base table. + $data['commerce_discount_usage']['table']['base'] = array( + 'field' => 'mail', + 'title' => t('Commerce Discount Usage'), + 'help' => t('Usage statistics about discounts.'), + ); + + // Discount name. + $data['commerce_discount_usage']['discount'] = array( + 'title' => t('Discount'), + 'help' => t('The unique human-readable identifier of the discount.'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_string', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + 'argument' => array( + 'handler' => 'views_handler_argument_string', + ), + 'relationship' => array( + 'title' => t('Discount'), + 'label' => t('Discount'), + 'help' => t('Relate a usage statistics record to its discount.'), + 'handler' => 'views_handler_relationship', + 'base' => 'commerce_discount', + 'base field' => 'name', + 'field' => 'discount', + ), + ); + + // Customer mail. + $data['commerce_discount_usage']['mail'] = array( + 'title' => t('User'), + 'help' => t('The email address of the customer who used the discount.'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_string', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + 'argument' => array( + 'handler' => 'views_handler_argument_string', + ), + 'relationship' => array( + 'title' => t('Customer email'), + 'label' => t('Customer email'), + 'help' => t('Relate a usage statistics record to its user.'), + 'handler' => 'views_handler_relationship', + 'base' => 'users', + 'base field' => 'mail', + 'field' => 'mail', + ), + ); + + // Order ID. + $data['commerce_discount_usage']['order_id'] = array( + 'title' => t('Order ID'), + 'help' => t('The unique internal identifier of the order where the discount was used.'), + 'field' => array( + 'handler' => 'commerce_order_handler_field_order', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + 'argument' => array( + 'handler' => 'commerce_order_handler_argument_order_order_id', + ), + 'relationship' => array( + 'title' => t('Order'), + 'label' => t('Order'), + 'help' => t('Relate a usage statistics record to its order.'), + 'handler' => 'views_handler_relationship', + 'base' => 'commerce_order', + 'base field' => 'order_id', + 'field' => 'order_id', + ), + ); + + return $data; +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views_default.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views_default.inc index cd77219f..09638c1b 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views_default.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/commerce_discount.views_default.inc @@ -30,15 +30,29 @@ function commerce_discount_views_default_views() { $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['query']['options']['query_comment'] = FALSE; $handler->display->display_options['exposed_form']['type'] = 'basic'; + $handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE; + $handler->display->display_options['exposed_form']['options']['autosubmit'] = TRUE; $handler->display->display_options['pager']['type'] = 'full'; + $handler->display->display_options['pager']['options']['items_per_page'] = '25'; + $handler->display->display_options['pager']['options']['offset'] = '0'; + $handler->display->display_options['pager']['options']['id'] = '0'; + $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'table'; + $handler->display->display_options['style_options']['grouping'] = array( + 0 => array( + 'field' => 'status', + 'rendered' => 1, + 'rendered_strip' => 0, + ), + ); $handler->display->display_options['style_options']['columns'] = array( 'label' => 'label', 'type_1' => 'type_1', 'type' => 'type', - 'status' => 'status', + 'commerce_discount_usage' => 'commerce_discount_usage', 'commerce_discount_date' => 'commerce_discount_date', 'commerce_discount_date_1' => 'commerce_discount_date_1', + 'status' => 'status', 'operations_dropbutton' => 'operations_dropbutton', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -69,23 +83,23 @@ function commerce_discount_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'status' => array( + 'commerce_discount_date' => array( 'sortable' => 1, - 'default_sort_order' => 'desc', + 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'commerce_discount_date' => array( + 'commerce_discount_date_1' => array( 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'commerce_discount_date_1' => array( + 'status' => array( 'sortable' => 1, - 'default_sort_order' => 'asc', + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -97,56 +111,88 @@ function commerce_discount_views_default_views() { ), ); $handler->display->display_options['style_options']['empty_table'] = TRUE; - /* No results behavior: Global: Text area */ $handler->display->display_options['empty']['area']['id'] = 'area'; $handler->display->display_options['empty']['area']['table'] = 'views'; $handler->display->display_options['empty']['area']['field'] = 'area'; $handler->display->display_options['empty']['area']['content'] = 'No discounts found.'; - /* Relationship: Entity Reference: Referenced Entity */ $handler->display->display_options['relationships']['commerce_discount_offer_target_id']['id'] = 'commerce_discount_offer_target_id'; $handler->display->display_options['relationships']['commerce_discount_offer_target_id']['table'] = 'field_data_commerce_discount_offer'; $handler->display->display_options['relationships']['commerce_discount_offer_target_id']['field'] = 'commerce_discount_offer_target_id'; $handler->display->display_options['relationships']['commerce_discount_offer_target_id']['required'] = TRUE; - /* Field: Commerce Discount: Label */ + /* Field: Commerce Discount: Admin title */ $handler->display->display_options['fields']['label']['id'] = 'label'; $handler->display->display_options['fields']['label']['table'] = 'commerce_discount'; $handler->display->display_options['fields']['label']['field'] = 'label'; - $handler->display->display_options['fields']['label']['label'] = 'Name'; /* Field: Commerce Discount Offer: Type */ $handler->display->display_options['fields']['type_1']['id'] = 'type_1'; $handler->display->display_options['fields']['type_1']['table'] = 'commerce_discount_offer'; $handler->display->display_options['fields']['type_1']['field'] = 'type'; $handler->display->display_options['fields']['type_1']['relationship'] = 'commerce_discount_offer_target_id'; - $handler->display->display_options['fields']['type_1']['label'] = 'Offer'; - /* Field: Commerce Discount: Type */ - $handler->display->display_options['fields']['type']['id'] = 'type'; - $handler->display->display_options['fields']['type']['table'] = 'commerce_discount'; - $handler->display->display_options['fields']['type']['field'] = 'type'; - $handler->display->display_options['fields']['type']['alter']['alter_text'] = TRUE; - $handler->display->display_options['fields']['type']['alter']['text'] = '[type]'; + $handler->display->display_options['fields']['type_1']['label'] = 'Offer type'; + /* Field: Commerce Discount: Discount dates */ + $handler->display->display_options['fields']['commerce_discount_date']['id'] = 'commerce_discount_date'; + $handler->display->display_options['fields']['commerce_discount_date']['table'] = 'field_data_commerce_discount_date'; + $handler->display->display_options['fields']['commerce_discount_date']['field'] = 'commerce_discount_date'; + $handler->display->display_options['fields']['commerce_discount_date']['label'] = 'Valid dates'; + $handler->display->display_options['fields']['commerce_discount_date']['empty'] = 'Any'; + $handler->display->display_options['fields']['commerce_discount_date']['settings'] = array( + 'format_type' => 'short', + 'custom_date_format' => '', + 'fromto' => 'both', + 'multiple_number' => '', + 'multiple_from' => '', + 'multiple_to' => '', + 'show_remaining_days' => 0, + ); + /* Field: Commerce Discount: Analytics */ + $handler->display->display_options['fields']['commerce_discount_usage']['id'] = 'commerce_discount_usage'; + $handler->display->display_options['fields']['commerce_discount_usage']['table'] = 'commerce_discount'; + $handler->display->display_options['fields']['commerce_discount_usage']['field'] = 'commerce_discount_usage'; /* Field: Commerce Discount: Status */ $handler->display->display_options['fields']['status']['id'] = 'status'; $handler->display->display_options['fields']['status']['table'] = 'commerce_discount'; $handler->display->display_options['fields']['status']['field'] = 'status'; + $handler->display->display_options['fields']['status']['exclude'] = TRUE; $handler->display->display_options['fields']['status']['type'] = 'active-disabled'; $handler->display->display_options['fields']['status']['not'] = 0; + /* Field: Commerce Discount: Sort order */ + $handler->display->display_options['fields']['sort_order']['id'] = 'sort_order'; + $handler->display->display_options['fields']['sort_order']['table'] = 'commerce_discount'; + $handler->display->display_options['fields']['sort_order']['field'] = 'sort_order'; /* Field: Commerce Discount: Operations */ $handler->display->display_options['fields']['operations_dropbutton']['id'] = 'operations_dropbutton'; $handler->display->display_options['fields']['operations_dropbutton']['table'] = 'commerce_discount'; $handler->display->display_options['fields']['operations_dropbutton']['field'] = 'operations_dropbutton'; - /* Filter criterion: Commerce Discount: Label */ - $handler->display->display_options['filters']['label']['id'] = 'label'; - $handler->display->display_options['filters']['label']['table'] = 'commerce_discount'; - $handler->display->display_options['filters']['label']['field'] = 'label'; - $handler->display->display_options['filters']['label']['operator'] = 'contains'; - $handler->display->display_options['filters']['label']['group'] = 1; - $handler->display->display_options['filters']['label']['exposed'] = TRUE; - $handler->display->display_options['filters']['label']['expose']['operator_id'] = 'label_op'; - $handler->display->display_options['filters']['label']['expose']['label'] = 'Name'; - $handler->display->display_options['filters']['label']['expose']['operator'] = 'label_op'; - $handler->display->display_options['filters']['label']['expose']['identifier'] = 'label'; + /* Sort criterion: Commerce Discount: Status */ + $handler->display->display_options['sorts']['status']['id'] = 'status'; + $handler->display->display_options['sorts']['status']['table'] = 'commerce_discount'; + $handler->display->display_options['sorts']['status']['field'] = 'status'; + $handler->display->display_options['sorts']['status']['order'] = 'DESC'; + /* Sort criterion: Commerce Discount: Sort order */ + $handler->display->display_options['sorts']['sort_order']['id'] = 'sort_order'; + $handler->display->display_options['sorts']['sort_order']['table'] = 'commerce_discount'; + $handler->display->display_options['sorts']['sort_order']['field'] = 'sort_order'; + /* Filter criterion: Commerce Discount: Type */ + $handler->display->display_options['filters']['type']['id'] = 'type'; + $handler->display->display_options['filters']['type']['table'] = 'commerce_discount'; + $handler->display->display_options['filters']['type']['field'] = 'type'; + $handler->display->display_options['filters']['type']['value'] = array( + 'product_discount' => 'product_discount', + ); + $handler->display->display_options['filters']['type']['group'] = 1; + $handler->display->display_options['filters']['type']['exposed'] = TRUE; + $handler->display->display_options['filters']['type']['expose']['operator_id'] = 'type_op'; + $handler->display->display_options['filters']['type']['expose']['label'] = 'Discount type'; + $handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op'; + $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type'; + $handler->display->display_options['filters']['type']['expose']['required'] = TRUE; + $handler->display->display_options['filters']['type']['expose']['remember_roles'] = array( + 2 => '2', + 1 => 0, + 3 => 0, + ); /* Filter criterion: Commerce Discount Offer: Type */ $handler->display->display_options['filters']['type_1']['id'] = 'type_1'; $handler->display->display_options['filters']['type_1']['table'] = 'commerce_discount_offer'; @@ -155,54 +201,13 @@ function commerce_discount_views_default_views() { $handler->display->display_options['filters']['type_1']['group'] = 1; $handler->display->display_options['filters']['type_1']['exposed'] = TRUE; $handler->display->display_options['filters']['type_1']['expose']['operator_id'] = 'type_1_op'; - $handler->display->display_options['filters']['type_1']['expose']['label'] = 'Offer'; + $handler->display->display_options['filters']['type_1']['expose']['label'] = 'Offer type'; $handler->display->display_options['filters']['type_1']['expose']['operator'] = 'type_1_op'; $handler->display->display_options['filters']['type_1']['expose']['identifier'] = 'type_1'; - /* Filter criterion: Commerce Discount: Type */ - $handler->display->display_options['filters']['type']['id'] = 'type'; - $handler->display->display_options['filters']['type']['table'] = 'commerce_discount'; - $handler->display->display_options['filters']['type']['field'] = 'type'; - $handler->display->display_options['filters']['type']['group'] = 1; - $handler->display->display_options['filters']['type']['exposed'] = TRUE; - $handler->display->display_options['filters']['type']['expose']['operator_id'] = 'type_op'; - $handler->display->display_options['filters']['type']['expose']['label'] = 'Type'; - $handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op'; - $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type'; - /* Filter criterion: Commerce Discount: Status */ - $handler->display->display_options['filters']['status']['id'] = 'status'; - $handler->display->display_options['filters']['status']['table'] = 'commerce_discount'; - $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = 'All'; - $handler->display->display_options['filters']['status']['exposed'] = TRUE; - $handler->display->display_options['filters']['status']['expose']['operator_id'] = ''; - $handler->display->display_options['filters']['status']['expose']['label'] = 'Active'; - $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op'; - $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status'; - $translatables['commerce_discount_overview'] = array( - t('Master'), - t('more'), - t('Apply'), - t('Reset'), - t('Sort by'), - t('Asc'), - t('Desc'), - t('Items per page'), - t('- All -'), - t('Offset'), - t('« first'), - t('‹ previous'), - t('next ›'), - t('last »'), - t('No discounts found.'), - t('Commerce Discount Offer entity referenced from commerce_discount_offer'), - t('Name'), - t('Offer'), - t('Type'), - t('[type]'), - t('Status'), - t('Operations'), - t('Name'), - t('Active'), + $handler->display->display_options['filters']['type_1']['expose']['remember_roles'] = array( + 2 => '2', + 1 => 0, + 3 => 0, ); $views['commerce_discount_overview'] = $view; diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/handlers/commerce_discount_usage_handler_field_commerce_discount_analytics.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_commerce_discount_analytics.inc similarity index 71% rename from profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/handlers/commerce_discount_usage_handler_field_commerce_discount_analytics.inc rename to profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_commerce_discount_analytics.inc index 48a5adb6..7521ec71 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/handlers/commerce_discount_usage_handler_field_commerce_discount_analytics.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_commerce_discount_analytics.inc @@ -1,11 +1,19 @@ additional_fields['discount_id'] = 'discount_id'; @@ -13,7 +21,10 @@ class commerce_discount_usage_handler_field_commerce_discount_analytics extends $this->real_field = 'discount_id'; } - function render($values) { + /** + * {@inheritdoc} + */ + public function render($values) { // Wrap the discount entity found. $wrapper = entity_metadata_wrapper('commerce_discount', entity_load_single('commerce_discount', $this->get_value($values, 'discount_id'))); @@ -23,9 +34,10 @@ class commerce_discount_usage_handler_field_commerce_discount_analytics extends 'items' => array( $wrapper->discount_usage_limit->value() ? t('@max available', array('@max' => $wrapper->discount_usage_limit->value())) : t('Unlimited'), $wrapper->discount_usage_per_person->value() ? t('Limit @max per customer', array('@max' => $wrapper->discount_usage_per_person->value())) : t('Unlimited usage per customer'), - t('Used @used times', array('@used' => commerce_discount_usage_get_usage($wrapper->name->value()))) - ) + t('Used @used times', array('@used' => commerce_discount_usage_get_usage($wrapper->name->value()))), + ), ) ); } + } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_operations_dropbutton.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_operations_dropbutton.inc index 8d290692..0009c437 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_operations_dropbutton.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/includes/views/handlers/commerce_discount_handler_field_operations_dropbutton.inc @@ -1,11 +1,19 @@ additional_fields['discount_id'] = 'discount_id'; @@ -13,7 +21,10 @@ class commerce_discount_handler_field_operations_dropbutton extends views_handle $this->real_field = 'discount_id'; } - function render($values) { + /** + * {@inheritdoc} + */ + public function render($values) { // Load the line item and return its title. $discount_id = $this->get_value($values, 'discount_id'); $commerce_discount = entity_load_single('commerce_discount', $discount_id); @@ -21,7 +32,7 @@ class commerce_discount_handler_field_operations_dropbutton extends views_handle $entity_info = entity_get_info('commerce_discount'); $path = $entity_info['admin ui']['path'] . '/manage'; - // Preapre the links. + // Prepare the links. $links = array(); $links[] = array( 'href' => $path . '/' . $commerce_discount->name, @@ -53,6 +64,14 @@ class commerce_discount_handler_field_operations_dropbutton extends views_handle 'title' => t('export'), ); + if (module_exists('i18n_string')) { + $links[] = array( + 'href' => $path . '/' . $commerce_discount->name . '/translate', + 'title' => t('translate'), + ); + } + return theme('links__ctools_dropbutton', array('links' => $links)); } + } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/js/commerce_discount.js b/profiles/commerce_kickstart/modules/contrib/commerce_discount/js/commerce_discount.js index a9e069df..3a083150 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/js/commerce_discount.js +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/js/commerce_discount.js @@ -1,12 +1,108 @@ -(function ($) { - -Drupal.behaviors.commerceDiscount = {}; -Drupal.behaviors.commerceDiscount.attach = function(context) { - $('input:radio').change(function() { - $('input:radio:not(:checked)').closest('div').removeClass('selected'); - $(this).closest('div').addClass('selected'); - }) - .filter(':checked').closest('div').addClass('selected'); -}; - -})(jQuery); +/** + * @file + * Commerce discount admin helper. + */ + +(function ($, Drupal) { + Drupal.behaviors.commerceDiscount = {}; + Drupal.behaviors.commerceDiscount.attach = function(context) { + $('input:radio').change(function() { + $('input:radio:not(:checked)').closest('div').removeClass('selected'); + $(this).closest('div').addClass('selected'); + }).filter(':checked').closest('div').addClass('selected'); + + // Provide the vertical tab summaries. + $('fieldset#edit-commerce-discount-fields-additional-settings-discount-options', context).drupalSetSummary(function(context) { + var values = []; + $("input[name^='status']:checked", context).parent().each(function() { + values.push(Drupal.checkPlain($(this).text().trim())); + }); + values.push(Drupal.t("Sort order: @Sort order", {'@Sort order': $("select[name^='sort_order'] option:selected").val()})); + return values.join(', '); + }); + $('fieldset#edit-commerce-discount-fields-additional-settings-commerce-discount-compatibility', context).drupalSetSummary(function(context) { + var values = [], + value; + + value = $('input[name="commerce_discount_fields[commerce_compatibility_strategy][und]"]:checked', context).val(); + if (value == 'any') { + return Drupal.t('Compatible with all'); + } + else if (value == 'only' || value == 'except') { + selected = $('input[name^="commerce_discount_fields[commerce_compatibility_selection]"][name$="[target_id]"]', context).each(function (context) { + var ruleName = Drupal.checkPlain($(this).val().replace(/ \(\d+\)/, '').trim()); + if (ruleName != '') { + values.push(ruleName); + } + }); + if (value == 'only') { + if (values.length == 0) { + return Drupal.t('Incompatible with all'); + } + else if (values.length == 1) { + return Drupal.t('Only with @selected', {'@selected': values.shift()}); + } + else { + return Drupal.t('Only with @selected and @remaining more...', {'@selected': values.shift(), '@remaining': values.length}); + } + } + else { + if (values.length == 0) { + return Drupal.t('Compatible with all'); + } + else if (values.length == 1) { + return Drupal.t('All except @selected', {'@selected': values.shift()}); + } + else { + return Drupal.t('All except @selected and @remaining more...', {'@selected': values.shift(), '@remaining': values.length}); + } + } + } + else if (value == 'none') { + return Drupal.t('Incompatible with all'); + } + }); + $('fieldset#edit-commerce-discount-fields-additional-settings-discount-date', context).drupalSetSummary(function(context) { + var fromDate, + toDate, + fromDateTS, + toDateTS; + + fromDate = $('input[name="commerce_discount_fields[commerce_discount_date][und][0][value][date]"]').val(); + fromDateTS = fromDate ? new Date(fromDate) : 0; + toDate = $('input[name="commerce_discount_fields[commerce_discount_date][und][0][value2][date]"]').val(); + toDateTS = toDate ? new Date(toDate) : 0; + + options = { + '!from': fromDateTS < Date.now() ? Drupal.t('Started') : Drupal.t('Starts'), + '!to': toDateTS < Date.now() ? Drupal.t('Ended') : Drupal.t('Ends'), + '@fromDate': fromDate, + '@toDate': toDate + }; + + if (fromDate && toDate) { + options['!to'] = options['!to'].toLowerCase(); + return Drupal.t('!from @fromDate and !to @toDate', options); + } + else if (fromDate && !toDate) { + return Drupal.t('!from @fromDate', options); + } + else if (!fromDate && toDate) { + return Drupal.t('!to @toDate', options); + } + else { + return Drupal.t('Always active'); + } + }); + $('fieldset#edit-commerce-discount-fields-additional-settings-commerce-discount-usage', context).drupalSetSummary(function(context) { + var usagePerPerson = $('input[name="commerce_discount_fields[discount_usage_per_person][und][0][value]"]').val(), + overallUsage = $('input[name="commerce_discount_fields[discount_usage_limit][und][0][value]"]').val(), + values = []; + + values.push(Drupal.t('!usagePerPerson per person', {'!usagePerPerson': usagePerPerson > 0 ? Drupal.checkPlain(usagePerPerson) : '∞'})); + values.push(Drupal.t('!overallUsage total', {'!overallUsage': overallUsage > 0 ? Drupal.checkPlain(overallUsage) : '∞'})); + + return values.join(', '); + }); + }; +}(jQuery, Drupal)); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.info b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.info deleted file mode 100644 index fc121f8a..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.info +++ /dev/null @@ -1,19 +0,0 @@ -name = Commerce Discount Date -description = Provides date fields for the Commerce discount entity. -core = 7.x -package = Commerce (contrib) - -dependencies[] = commerce_discount -dependencies[] = date -dependencies[] = date_popup - -; Simple tests -files[] = commerce_discount_date.test - - -; Information added by drush on 2015-08-20 -version = "7.x-1.0-alpha5+0-dev" -core = "7.x" -project = "commerce_discount" -datestamp = "1440110608" - diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.install b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.install deleted file mode 100644 index e4b7e89b..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.install +++ /dev/null @@ -1,43 +0,0 @@ - array('commerce_discount'), - 'settings' => array( - 'granularity' => array( - 'month' => 'month', - 'day' => 'day', - 'year' => 'year', - ), - 'tz_handling' => 'none', - 'timezone_db' => '', - 'todate' => 'optional', - 'handler' => 'base', - 'target_type' => 'commerce_discount', - 'handler_settings' => array( - 'target_bundles' => array(), - ), - ), - 'field_name' => 'commerce_discount_date', - 'type' => 'datestamp', - 'locked' => TRUE, - ); - field_create_field($field); -} - -/** - * Implements hook_uninstall(). - */ -function commerce_discount_date_uninstall() { - field_delete_field('commerce_discount_date'); -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.module b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.module deleted file mode 100644 index 7c3ae6fa..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.module +++ /dev/null @@ -1,99 +0,0 @@ - $value) { - if (!field_info_instance('commerce_discount', 'commerce_discount_date', $type)) { - $instance = array( - 'field_name' => 'commerce_discount_date', - 'entity_type' => 'commerce_discount', - 'bundle' => $type, - 'label' => t('Discount dates'), - 'widget' => array( - 'module' => 'date', - 'type' => 'date_popup', - 'weight' => -11, - ), - 'settings' => array( - 'default_value' => 'blank', - 'default_value2' => 'blank', - ), - ); - field_create_instance($instance); - } - } -} - -/** - * Implements hook_views_api(). - */ -function commerce_discount_date_views_api($module, $api) { - if ($module == 'views') { - return array( - 'version' => 2, - 'path' => drupal_get_path('module', 'commerce_discount_date') . '/includes/views', - ); - } -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function commerce_discount_date_form_commerce_discount_form_alter(&$form, $form_state) { - $form['commerce_discount_fields']['commerce_discount_date']['#after_build'][] = 'commerce_discount_date_after_build'; -} - -/** - * After-build callback for altering the date field. - * - * @param $element - * The date field. - * - * @return - * The altered date field. - */ -function commerce_discount_date_after_build($element, $form_state) { - // Reset the titles. - $element[LANGUAGE_NONE][0]['value']['#title'] = t('Start date'); - $element[LANGUAGE_NONE][0]['value2']['#title'] = t('End date'); - $element[LANGUAGE_NONE][0]['value']['date']['#title'] = ''; - $element[LANGUAGE_NONE][0]['value']['time']['#title'] = ''; - $element[LANGUAGE_NONE][0]['value2']['date']['#title'] = ''; - $element[LANGUAGE_NONE][0]['value2']['time']['#title'] = ''; - $element[LANGUAGE_NONE][0]['#fieldset_description'] = ''; - - // Ignore the "Show end date" checkbox. - unset($element[LANGUAGE_NONE][0]['value2']['#states']); - - // Check the "show end date" checkbox. - $element[LANGUAGE_NONE][0]['show_todate']['#checked'] = TRUE; - - return $element; -} - -/** - * Implements hook_commerce_discount_rule_build(). - */ -function commerce_discount_date_commerce_discount_rule_build($rule, $discount) { - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - if (!$wrapper->commerce_discount_date->value()) { - // No need to add a condition. - return; - } - - // Add condition to check usage didn't reach max uses. - $rule->condition('commerce_discount_date_condition', array( - 'commerce_discount' => $discount->name, - )); -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.rules.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.rules.inc deleted file mode 100644 index bed6296b..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.rules.inc +++ /dev/null @@ -1,38 +0,0 @@ - t('Check discount dates'), - 'group' => t('Commerce Discount'), - 'parameter' => array( - 'commerce_discount' => array( - 'label' => t('Commerce Discount'), - 'type' => 'token', - 'options list' => 'commerce_discount_entity_list', - ), - ), - 'base' => 'commerce_discount_date_condition', - ); - - return $items; -} - -/** - * Rules condition: Check discount can be applied. - */ -function commerce_discount_date_condition($discount_name) { - $wrapper = entity_metadata_wrapper('commerce_discount', $discount_name); - $time = time(); - return $time >= $wrapper->commerce_discount_date->value->value() && $time <= $wrapper->commerce_discount_date->value2->value(); -} - diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.test deleted file mode 100644 index 00e5d9fc..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/commerce_discount_date.test +++ /dev/null @@ -1,254 +0,0 @@ - 'Discounts date', - 'description' => 'Test discounts date UI and functionality', - 'group' => 'Commerce discounts', - ); - } - - /** - * {@inheritdoc} - */ - public function setUp() { - parent::setUp(); - } - - /** - * Test date specific elements in the add discount UI. - */ - public function testDiscountDateUIAddDiscount() { - // Login with store admin. - $this->drupalLogin($this->store_admin); - - // Access to the admin discount creation page. - $this->drupalGet('admin/commerce/store/discounts/add'); - - // Check the integrity of the add form. - $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value][date]', NULL, t('Start date field is present')); - $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value2][date]', NULL, t('End date field is present')); - - // Create a discount valid from yesterday until tomorrow. - $date_format = 'm/d/Y'; - $start_time = time() - 86400; - $start_date = date($date_format, $start_time); - $end_time = time() + 86400; - $end_date = date($date_format, $end_time); - - $values = array( - 'label' => 'Order discount - fixed', - 'name' => 'order_discount_fixed', - 'component_title' => 'Order discount', - 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, - 'commerce_discount_fields[commerce_discount_date][und][0][value][date]' => $start_date, - 'commerce_discount_fields[commerce_discount_date][und][0][value2][date]' => $end_date, - ); - $this->drupalPost(NULL, $values, t('Save discount')); - - // Load the discount and wrap it. - $discount = entity_load_single('commerce_discount', 1); - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - - // Check the usage fields of the stored discount. - $this->assertTrue(date($date_format, $wrapper->commerce_discount_date->value->value()) == $start_date, t('Start date is stored correctly.')); - $this->assertTrue(date($date_format, $wrapper->commerce_discount_date->value2->value()) == $end_date, t('End date is stored correctly.')); - - // // Check the discounts listing - // $this->assertText($start_date, t('Start date is shown')); - // $this->assertText($end_date, t('End date is shown')); - } - - /** - * Test the Edit discount UI. - */ - public function testDiscountDateUIEditDiscount() { - // Create a discount valid from yesterday until tomorrow. - $start_time = time() - 86400; - $end_time = time() + 86400; - $discount = $this->createDateDiscount('order_discount', 'fixed_amount', 300, $start_time, $end_time); - - // Login with store admin. - $this->drupalLogin($this->store_admin); - - // Access to the admin discount edit page. - $this->drupalGet('admin/commerce/store/discounts/manage/' . $discount->name); - - // Check the integrity of the add form. - $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value][date]', NULL, t('Start date field is present')); - $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value2][date]', NULL, t('End date field is present')); - - // Try to save the product and check validation messages. - $this->drupalPost(NULL, array(), t('Save discount')); - - // Change the discount date, to be valid from tomorrow. - $date_format = 'm/d/Y'; - $start_time = time() + 86400; - $start_date = date($date_format, $start_time); - $end_time = time() + 2 * 86400; - $end_date = date($date_format, $end_time); - - $values = array( - 'label' => 'Order discount - fixed', - 'name' => 'order_discount_fixed', - 'component_title' => 'Order discount', - 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, - 'commerce_discount_fields[commerce_discount_date][und][0][value][date]' => $start_date, - 'commerce_discount_fields[commerce_discount_date][und][0][value2][date]' => $end_date, - ); - - // $this->drupalPost(NULL, $values, t('Save discount')); - - // Load the discount and wrap it. - $discount = entity_load_single('commerce_discount', 1); - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - - // // Check the usage fields of the stored discount. - // $this->assertTrue(date($date_format, $wrapper->commerce_discount_date->value->value()) == $start_date, t('Start date is stored correctly.')); - // $this->assertTrue(date($date_format, $wrapper->commerce_discount_date->value2->value()) == $end_date, t('End date is stored correctly.')); - - // // Check the discounts listing - // $this->assertText($start_date, t('Start date is shown')); - // $this->assertText($end_date, t('End date is shown')); - } - - /** - * Test order discount in timespan. - */ - public function testDiscountDateOrderDiscountInTime() { - // Create a discount valid from yesterday until tomorrow. - $start_time = time() - 86400; - $end_time = time() + 86400; - - // Testing fixed discount. - $discount = $this->createDateDiscount('order_discount', 'fixed_amount', 300, $start_time, $end_time); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Check if the discount was applied on the order total price. - $this->assertTrue($wrapper->commerce_order_total->amount->value() == 700, t('Order discount is deducted when in time frame.')); - } - - /** - * Test order discount out of timespan. - */ - public function testDiscountDateOrderDiscountOutOfTime() { - - // Create a discount valid from tomorrow. - $start_time = time() + 86400; - $end_time = time() + 2 * 86400; - - // Testing fixed discount. - // Create a fixed order discount of $3 limited to one use. - $discount = $this->createDateDiscount('order_discount', 'fixed_amount', 300, $start_time, $end_time); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - // Check if the discount was applied on the order total price. - $this->assertTrue($wrapper->commerce_order_total->amount->value() == 1000, t('Order discount is ignored when out of time frame.')); - } - - /** - * Test product discount in timespan. - */ - public function testDiscountDateProductDiscountInTime() { - // Create a discount valid from yesterday until tomorrow. - $start_time = time() - 86400; - $end_time = time() + 86400; - - $discount = $this->createDateDiscount('product_discount', 'fixed_amount', 300, $start_time, $end_time); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - // Invoke line item price re-calculation. - $line_item = $wrapper->commerce_line_items->get(0)->value(); - rules_invoke_event('commerce_product_calculate_sell_price', $line_item); - // Check if the discount was added as a component to the line item. - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $price_data = $line_item_wrapper->commerce_unit_price->data->value(); - $this->assertTrue($price_data['components'][1]['price']['amount'] == -300, t('Product discount is applied when discount is in time frame.')); - } - - /** - * Test product discount out of timespan. - */ - public function testDiscountDateProductDiscountOutOfTime() { - // Create a discount valid from tomorrow. - $start_time = time() + 86400; - $end_time = time() + 2 * 86400; - - $discount = $this->createDateDiscount('product_discount', 'fixed_amount', 300, $start_time, $end_time); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - // Invoke line item price re-calculation. - $line_item = $wrapper->commerce_line_items->get(0)->value(); - rules_invoke_event('commerce_product_calculate_sell_price', $line_item); - // Check if the discount was added as a component to the line item. - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $price_data = $line_item_wrapper->commerce_unit_price->data->value(); - $this->assertTrue(count($price_data['components']) == 1, t('Product discount is ignored when discount is out of time frame.')); - } - - /** - * Create a date discount. - * - * @param string $discount_type - * The discount type; Either 'order_discount' or 'product_discount'. - * @param string $offer_type - * The discount offer type; Either 'fixed_amount' or 'percentage'. - * @param integer $amount - * The discount offer amount. - * @param $start_time - * Discount valid from. - * @param $end_time - * Discount valid until. - * - * @return object - * The newly created commerce_discount entity. - */ - protected function createDateDiscount($discount_type, $offer_type, $amount, $start_time, $end_time) { - // Use the base class to create a discount. - $discount = parent::createDiscount($discount_type, $offer_type, $amount); - - // Populate the date fields. - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - - $date_data = array( - 'value' => $start_time, - 'value2' => $end_time, - 'date_type' => 'datestamp', - ); - - $wrapper->commerce_discount_date->set($date_data); - $wrapper->save(); - - return $wrapper->value(); - } -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/includes/views/commerce_discount_date.views_default.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/includes/views/commerce_discount_date.views_default.inc deleted file mode 100644 index 9c4f770e..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_date/includes/views/commerce_discount_date.views_default.inc +++ /dev/null @@ -1,111 +0,0 @@ -display['default']->handler; - - // In order to insert the date fields in the middle of the fields array, - // rebuild it while inserting the date fields after the 'rendered_entity' - // field. - if (empty($handler->display->display_options['fields']) || !is_array($handler->display->display_options['fields'])) { - return; - } - foreach ($handler->display->display_options['fields'] as $field_id => $field) { - $fields[$field_id] = $field; - - if ($field_id == 'rendered_entity') { - $fields += $date_fields; - } - } - - // Overwrite the original fields array. - $handler->display->display_options['fields'] = $fields; -} - -/** - * Helper function to get the Views import. - */ -function _commerce_discount_date_views_get_view_delta() { - $handler = new stdClass(); - - /* Field: Commerce Discount: Discount dates */ - $handler->display->display_options['fields']['commerce_discount_date']['id'] = 'commerce_discount_date'; - $handler->display->display_options['fields']['commerce_discount_date']['table'] = 'field_data_commerce_discount_date'; - $handler->display->display_options['fields']['commerce_discount_date']['field'] = 'commerce_discount_date'; - $handler->display->display_options['fields']['commerce_discount_date']['label'] = 'Start date'; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['external'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['trim'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['alter']['html'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['element_label_colon'] = 1; - $handler->display->display_options['fields']['commerce_discount_date']['element_default_classes'] = 1; - $handler->display->display_options['fields']['commerce_discount_date']['hide_empty'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['empty_zero'] = 0; - $handler->display->display_options['fields']['commerce_discount_date']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['commerce_discount_date']['settings'] = array( - 'format_type' => 'short', - 'fromto' => 'value', - 'multiple_number' => '', - 'multiple_from' => '', - 'multiple_to' => '', - ); - $handler->display->display_options['fields']['commerce_discount_date']['field_api_classes'] = 0; - /* Field: Commerce Discount: Discount dates */ - $handler->display->display_options['fields']['commerce_discount_date_1']['id'] = 'commerce_discount_date_1'; - $handler->display->display_options['fields']['commerce_discount_date_1']['table'] = 'field_data_commerce_discount_date'; - $handler->display->display_options['fields']['commerce_discount_date_1']['field'] = 'commerce_discount_date'; - $handler->display->display_options['fields']['commerce_discount_date_1']['label'] = 'End date'; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['external'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['trim'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['alter']['html'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['element_label_colon'] = 1; - $handler->display->display_options['fields']['commerce_discount_date_1']['element_default_classes'] = 1; - $handler->display->display_options['fields']['commerce_discount_date_1']['hide_empty'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['empty_zero'] = 0; - $handler->display->display_options['fields']['commerce_discount_date_1']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['commerce_discount_date_1']['settings'] = array( - 'format_type' => 'short', - 'fromto' => 'value2', - 'multiple_number' => '', - 'multiple_from' => '', - 'multiple_to' => '', - ); - $handler->display->display_options['fields']['commerce_discount_date_1']['field_api_classes'] = 0; - - return $handler->display->display_options['fields']; -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.info b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.info deleted file mode 100644 index 5f886b3d..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.info +++ /dev/null @@ -1,21 +0,0 @@ -name = Commerce Discount Usage -description = Provide usage tracking and limits for Commerce Discounts -package = Commerce (contrib) -core = 7.x - -; Dependencies -dependencies[] = commerce_discount - -; Views handlers -files[] = includes/views/handlers/commerce_discount_usage_handler_field_commerce_discount_analytics.inc - -; Simple tests -files[] = commerce_discount_usage.test - - -; Information added by drush on 2015-08-20 -version = "7.x-1.0-alpha5+0-dev" -core = "7.x" -project = "commerce_discount" -datestamp = "1440110608" - diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.install b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.install deleted file mode 100644 index f7b3b07f..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.install +++ /dev/null @@ -1,158 +0,0 @@ - array('commerce_discount'), - 'field_name' => 'discount_usage_per_person', - 'type' => 'number_integer', - 'locked' => TRUE, - ); - field_create_field($field); - } - foreach (commerce_discount_types() as $type => $info) { - if (empty($instances['commerce_discount'][$type]['discount_usage_per_person'])) { - $instance = array( - 'field_name' => 'discount_usage_per_person', - 'entity_type' => 'commerce_discount', - 'bundle' => $type, - 'label' => t('Maximum usage per customer'), - 'description' => t('Enter the maximum number of times a specific person (as identified by email) may use this discount. Leave blank for unlimited.'), - 'required' => FALSE, - 'widget' => array( - 'weight' => 100, - ), - 'settings' => array( - 'min' => 0 - ) - ); - field_create_instance($instance); - } - } - - // Discount usage. - if (empty($fields['discount_usage_limit'])) { - // Create entity reference field. - $field = array( - 'entity_types' => array('commerce_discount'), - 'field_name' => 'discount_usage_limit', - 'type' => 'number_integer', - 'locked' => TRUE, - ); - field_create_field($field); - } - foreach (commerce_discount_types() as $type => $info) { - if (empty($instances['commerce_discount'][$type]['discount_usage_limit'])) { - $instance = array( - 'field_name' => 'discount_usage_limit', - 'entity_type' => 'commerce_discount', - 'bundle' => $type, - 'label' => t('Maximum overall usage'), - 'description' => t('Enter the maximum number of times this discount may be used on the site, by anyone. Leave blank for unlimited.'), - 'required' => FALSE, - 'widget' => array( - 'weight' => 100, - ), - 'settings' => array( - 'min' => 0 - ) - ); - field_create_instance($instance); - } - } -} - -/** - * Implements hook_schema(). - */ -function commerce_discount_usage_schema() { - $schema['commerce_discount_usage'] = array( - 'fields' => array( - 'discount' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'description' => 'Discount name.', - ), - 'mail' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The email of the customer that used this discount.', - ), - 'order_id' => array( - 'type' => 'int', - 'not null' => TRUE, - 'description' => 'The order id that this discount was used with.', - ), - ), - 'unique keys' => array( - 'discount_mail_order_id' => array('discount', 'mail', 'order_id'), - ), - 'foreign keys' => array( - 'discount' => array( - 'table' => 'commerce_discount', - 'column' => array('discount' => 'name') - ), - 'order_id' => array( - 'table' => 'commerce_order', - 'column' => array('order_id' => 'order_id') - ), - 'mail' => array( - 'table' => 'users', - 'column' => array('mail' => 'mail') - ) - ), - 'indexes' => array( - 'mail' => array('mail'), - 'discount' => array('discount'), - 'order_id' => array('order_id') - ) - ); - - return $schema; -} - -/** - * Create usage table - */ -function commerce_discount_usage_update_7001() { - // Add usage table. - if (!db_table_exists('commerce_discount_usage')) { - db_create_table('commerce_discount_usage', drupal_get_schema_unprocessed('commerce_discount_usage', 'commerce_discount_usage')); - } -} - -/** - * Migrate from commerce_discount_max_uses to discount_usage_limit. - */ -function commerce_discount_usage_update_7002() { - foreach (entity_load('commerce_discount') as $discount) { - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - if (!isset($wrapper->discount_usage_limit) || $wrapper->discount_usage_limit->value() == FALSE - && isset($wrapper->commerce_discount_max_uses) && $wrapper->commerce_discount_max_uses->value()) { - $wrapper->discount_usage_limit = $wrapper->commerce_discount_max_uses->value(); - entity_save('commerce_discount', $discount); - } - } - - field_delete_field('commerce_discount_max_uses'); -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.module b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.module deleted file mode 100644 index 6833c71b..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.module +++ /dev/null @@ -1,216 +0,0 @@ - 'commerce-order', - 'product_discount' => 'commerce-line-item:order' - ); - - if (isset($map[$discount->type])) { - // Add condition for per-person usage - if ($wrapper->discount_usage_per_person->value()) { - $rule->condition( - 'commerce_discount_usage_max_usage_per_person', - array( - 'commerce_discount' => $discount->name, - 'order:select' => $map[$discount->type], - 'usage' => $wrapper->discount_usage_per_person->value(), - ) - ); - } - // For normal usage - if ($wrapper->discount_usage_limit->value()) { - $rule->condition( - 'commerce_discount_usage_max_usage', - array( - 'commerce_discount' => $discount->name, - 'order:select' => $map[$discount->type], - 'usage' => $wrapper->discount_usage_limit->value(), - ) - ); - } - } -} - -/* - * Implements hook_commerce_discount_usages(). - */ -function commerce_discount_usage_flush_caches() { - module_load_install('commerce_discount_usage'); - _commerce_discount_usage_install_helper(); -} - -/** - * Get usage of a discount for a user, excluding a certain order id. - * - * @param string $discount_name - * The discount name. - * @param string $mail - * The user mail. - * @param bool $exclude_order_id - * If TRUE, the order id will be excluded from the SQL request. - * - * @return int - * Return the number of usage by mail. - */ -function commerce_discount_usage_get_usage_by_mail($discount_name, $mail, $exclude_order_id = FALSE) { - $query = db_select('commerce_discount_usage', 'g') - ->fields('g') - ->condition('g.mail', $mail) - ->condition('g.discount', $discount_name); - - if ($exclude_order_id) { - $query->condition('g.order_id', $exclude_order_id, '<>'); - } - - return $query->execute()->rowCount(); -} - -/** - * Get usage of a discount, excluding a certain order id. - * - * @param string $discount_name - * The discount name. - * @param bool $exclude_order_id - * If TRUE, the order id will be excluded from the SQL request. - * - * @return int - * Return the number of usage. - */ -function commerce_discount_usage_get_usage($discount_name, $exclude_order_id = FALSE) { - $query = db_select('commerce_discount_usage', 'g') - ->fields('g') - ->condition('g.discount', $discount_name); - - if ($exclude_order_id) { - $query->condition('g.order_id', $exclude_order_id, '<>'); - } - - return $query->execute()->rowCount(); -} - -/** - * Reset usage statistics for an entire order - * - * @param object $order - * A fully qualified order object. - * - * @return DeleteQuery - * Return a new DeleteQuery object. - */ -function commerce_discount_usage_reset_order_usage($order) { - return db_delete('commerce_discount_usage') - ->condition('order_id', $order->order_id) - ->execute(); -} - -/** - * Record order usage - * - * @param object $order - * A fully qualified order object. - * - * @return void - */ -function commerce_discount_usage_record_order_usage($order) { - // Reset usage for this order first. - commerce_discount_usage_reset_order_usage($order); - - // Only record discount usage if the order has an email. - $discount_names = commerce_discount_usage_order_discounts($order); - - foreach ($discount_names as $discount_name) { - $record = array( - 'discount' => $discount_name, - 'mail' => $order->mail ? $order->mail : '', - 'order_id' => $order->order_id - ); - drupal_write_record('commerce_discount_usage', $record); - } -} - -/** - * Load all discounts connected to an order, including line item level discounts - * traced through line item unit price components. - * - * @param object $order - * A fully qualified order object. - * - * @return array - * - */ -function commerce_discount_usage_order_discounts($order) { - $order_wrapper = entity_metadata_wrapper('commerce_order', $order); - $order_discounts = array(); - - foreach ($order_wrapper->commerce_line_items as $line_item_wrapper) { - $data = $line_item_wrapper->commerce_unit_price->data->value(); - - foreach ($data['components'] as $key => $component) { - if ($component['name'] == 'discount' || !empty($component['price']['data']['discount_name'])) { - $order_discount_name = $component['price']['data']['discount_name']; - $order_discount_wrapper = entity_metadata_wrapper('commerce_discount', $order_discount_name); - // Make a list of discounts present via the order's line item price - // components. - if ($order_discount_wrapper->value()) { - $order_discounts[] = $order_discount_wrapper->name->value(); - } - } - } - } - - // Add the set of discounts directly referenced on the order. - if (!empty($order->commerce_discounts)) { - foreach ($order_wrapper->commerce_discounts->value() as $discount) { - $order_discounts[] = $discount->name; - } - } - - $order_discounts = array_unique($order_discounts); - - return $order_discounts; -} - -/* - * Implements hook_commerce_order_update(). - */ -function commerce_discount_usage_commerce_order_update($order) { - commerce_discount_usage_record_order_usage($order); -} - -/* - * Implements hook_commerce_order_insert(). - */ -function commerce_discount_usage_commerce_order_insert($order) { - commerce_discount_usage_record_order_usage($order); -} - -/* - * Implements hook_commerce_order_delete(). - */ -function commerce_discount_usage_commerce_order_delete($order) { - commerce_discount_usage_reset_order_usage($order); -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function commerce_discount_usage_form_commerce_discount_form_alter(&$form, $form_state) { - $form['#attached']['css'][] = drupal_get_path('module', 'commerce_discount_usage') . '/css/commerce_discount_usage.css'; -} - -/* - * Implements hook_views_api(). - */ -function commerce_discount_usage_views_api() { - return array( - 'version' => 2, - 'path' => drupal_get_path('module', 'commerce_discount_usage') . '/includes/views' - ); -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.rules.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.rules.inc deleted file mode 100644 index 52655204..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.rules.inc +++ /dev/null @@ -1,88 +0,0 @@ - t('Max usage per person'), - 'parameter' => array( - 'order' => array( - 'type' => 'commerce_order', - 'label' => t('Order') - ), - 'commerce_discount' => array( - 'label' => t('Commerce Discount'), - 'type' => 'token', - 'options list' => 'commerce_discount_entity_list', - ), - 'usage' => array( - 'type' => 'integer', - 'label' => t('Maximum usage per customer'), - 'description' => t('Enter the maximum number of times a specific person (as identified by email) may use this discount. Leave blank for unlimited.'), - ), - ), - 'group' => t('Commerce Discount'), - ); - - // Max usage - $conditions['commerce_discount_usage_max_usage'] = array( - 'label' => t('Max usage'), - 'parameter' => array( - 'order' => array( - 'type' => 'commerce_order', - 'label' => t('Order') - ), - 'commerce_discount' => array( - 'label' => t('Commerce Discount'), - 'type' => 'token', - 'options list' => 'commerce_discount_entity_list', - ), - 'usage' => array( - 'type' => 'integer', - 'label' => t('Maximum overall usage'), - 'description' => t('Enter the maximum number of times this discount may be used on the site, by anyone. Leave blank for unlimited.'), - ), - ), - 'group' => t('Commerce Discount'), - ); - - return $conditions; -} - -/* - * Rules condition callback: evaluate maximum usage per-person of a discount. - */ -function commerce_discount_usage_max_usage_per_person($order, $discount_name) { - $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount_name); - $per_person_limit = $discount_wrapper->discount_usage_per_person->value(); - - // Nothing to count if the order does not have an email. - if (!$per_person_limit || !$order->mail) { - return TRUE; - } - - // Find other orders owned by same person that have same discount. - $usage = commerce_discount_usage_get_usage_by_mail($discount_name, $order->mail, $order->order_id); - - return $usage < $per_person_limit; -} - -/* - * Rules condition callback: evaluate maximum usage of a discount. - */ -function commerce_discount_usage_max_usage($order, $discount_name) { - $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount_name); - $limit = $discount_wrapper->discount_usage_limit->value(); - - if (!$limit) { - return TRUE; - } - - // Find other orders that have same discount. - $usage = commerce_discount_usage_get_usage($discount_name, $order->order_id); - - return $usage < $limit; -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.test deleted file mode 100644 index 57365f16..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/commerce_discount_usage.test +++ /dev/null @@ -1,271 +0,0 @@ - 'Discounts usage', - 'description' => 'Test discounts usage UI and functionality', - 'group' => 'Commerce discounts', - ); - } - - /** - * {@inheritdoc} - */ - public function setUp() { - parent::setUp(); - $this->store_customer2 = $this->createStoreCustomer(); - } - - /** - * Test usage specific elements in the add discount UI. - */ - public function testCommerceDiscountUsageUIAddDiscount() { - // Login with store admin. - $this->drupalLogin($this->store_admin); - - // Access to the admin discount creation page. - $this->drupalGet('admin/commerce/store/discounts/add'); - - // Check the integrity of the add form. - // $this->assertFieldByName('commerce_discount_fields[discount_usage_limit][limit_uses]', NULL, t('Quantity field is present')); - $this->assertFieldByName('commerce_discount_fields[discount_usage_limit][und][0][value]', NULL, t('Amount field is present')); - - // Create a discount. - $values = array( - 'label' => 'Order discount - fixed', - 'name' => 'order_discount_fixed', - 'component_title' => 'Order discount', - 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, - 'commerce_discount_fields[discount_usage_limit][und][0][value]' => 5, - ); - $this->drupalPost(NULL, $values, t('Save discount')); - - // Load the discount and wrap it. - $discount = entity_load_single('commerce_discount', 1); - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - - // Check the usage fields of the stored discount. - $this->assertTrue($wrapper->discount_usage_per_person->value() == 0, t('Discount uses field is empty.')); - $this->assertTrue($wrapper->discount_usage_limit->value() == 5, t('Discount max uses stored correctly.')); - - // Check the discounts listing - $this->assertText(t('@amount available', array('@amount' => 5)), t('Analytics - Max usage is shown.')); - $this->assertText(t('Used @amount times', array('@amount' => 0)), t('Analytics - Usage is shown.')); - } - - /** - * Test usage specific elements in the edit discount UI. - */ - public function testCommerceDiscountUsageUIEditDiscount() { - // Testing fixed discount. - // Create a fixed order discount of $3 limited to one use. - $discount = $this->createUsageDiscount('order_discount', 'fixed_amount', 300, 1); - - // Login with store admin. - $this->drupalLogin($this->store_admin); - - // Access to the admin discount edit page. - $this->drupalGet('admin/commerce/store/discounts/manage/' . $discount->name); - - // Check the integrity of the add form. - // $this->assertFieldByName('commerce_discount_fields[discount_usage_limit][limit_uses]', NULL, t('Quantity field is present')); - $this->assertFieldByName('commerce_discount_fields[discount_usage_limit][und][0][value]', NULL, t('Amount field is present')); - - // Change the discount values. - $values = array( - 'label' => 'Order discount - fixed', - 'name' => 'order_discount_fixed', - 'component_title' => 'Order discount', - 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, - 'commerce_discount_fields[discount_usage_limit][und][0][value]' => 5, - ); - $this->drupalPost(NULL, $values, t('Save discount')); - - // Load the discount and wrap it. - $discount = entity_load_single('commerce_discount', 1); - $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); - - // Check the usage fields of the stored discount. - $this->assertTrue($discount_wrapper->discount_usage_per_person->value() == 0, t('Discount uses field is empty.')); - // $this->assertTrue($discount_wrapper->discount_usage_limit->value() == 5, t('Discount max uses stored correctly.')); - - // Check the discounts listing - $this->assertText(t('@amount available', array('@amount' => 5)), t('Analytics - Max usage is shown.')); - $this->assertText(t('Used @amount times', array('@amount' => 0)), t('Analytics - Usage is shown.')); - } - - /** - * Test fixed order discounts. - */ - public function testCommerceDiscountUsageFixedOrderDiscount() { - // Testing fixed discount. - // Create a fixed order discount of $3 limited to one use. - $discount = $this->createUsageDiscount('order_discount', 'fixed_amount', 300, 1); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Check if the discount was applied on the order total price. - $this->assertTrue($wrapper->commerce_order_total->amount->value() == 700, t('Fixed order discount is deducted correctly on the first use.')); - - // Create another order to make sure the discount isn't applied again. - $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Check if the discount was applied on the order total price. - $this->assertTrue($wrapper->commerce_order_total->amount->value() == 1000, t('Fixed order discount is ignored after maximal usage.')); - } - - /** - * Test percentage order discounts. - */ - public function testCommerceDiscountUsagePercentageOrderDiscount() { - // Testing percentage discount. - // Create a percentage order discount of 5% limited to one use. - $discount = $this->createUsageDiscount('order_discount', 'percentage', 5, 1); - // Create a completed order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Check if the discount was applied on the order total price. - $this->assertTrue($wrapper->commerce_order_total->amount->value() == 950, t('Percentage order discount is deducted correctly.')); - - // Create another order to make sure the discount isn't applied again. - $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Check if the discount was applied on the order total price. - $this->assertTrue($wrapper->commerce_order_total->amount->value() == 1000, t('Percentage order discount is ignored after maximal usage.')); - } - - /** - * Test fixed product discounts. - */ - public function testCommerceDiscountUsageFixedProductDiscount() { - $discount = $this->createUsageDiscount('product_discount', 'fixed_amount', 300, 1); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - // Invoke line item price re-calculation. - $line_item = $wrapper->commerce_line_items->get(0)->value(); - rules_invoke_event('commerce_product_calculate_sell_price', $line_item); - // Check if the discount was added as a component to the line item. - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $price_data = $line_item_wrapper->commerce_unit_price->data->value(); - $this->assertTrue($price_data['components'][1]['price']['amount'] == -300, t('Fixed product discount is added as a price compoennt to the line item.')); - - // Create another order to make sure the discount isn't applied again. - $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Invoke line item price re-calculation. - $line_item = $wrapper->commerce_line_items->get(0)->value(); - rules_invoke_event('commerce_product_calculate_sell_price', $line_item); - // Check if the discount was added as a component to the line item. - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $price_data = $line_item_wrapper->commerce_unit_price->data->value(); - // $this->assertTrue(count($price_data['components']) === 1, t('Fixed product discount is ignored after maximal usage.')); - } - - /** - * Test percentage product discounts. - */ - public function testCommerceDiscountUsagePercentageProductDiscount() { - $discount = $this->createUsageDiscount('product_discount', 'percentage', 5, 1); - - // Create an order. - $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Invoke line item price re-calculation. - $line_item = $wrapper->commerce_line_items->get(0)->value(); - rules_invoke_event('commerce_product_calculate_sell_price', $line_item); - // Check if the discount was added as a component to the line item. - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $price_data = $line_item_wrapper->commerce_unit_price->data->value(); - // $this->assertTrue($price_data['components'][1]['price']['amount'] == -500, t('Percentage product discount is added as a price compoennt to the line item.')); - - // Create another order to make sure the discount isn't applied again. - $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'complete'); - $wrapper = entity_metadata_wrapper('commerce_order', $order); - - // Recalculate discounts. - commerce_cart_order_refresh($order); - - // Invoke line item price re-calculation. - $line_item = $wrapper->commerce_line_items->get(0)->value(); - rules_invoke_event('commerce_product_calculate_sell_price', $line_item); - // Check if the discount was added as a component to the line item. - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $price_data = $line_item_wrapper->commerce_unit_price->data->value(); - $this->assertTrue(count($price_data['components']) == 1, t('Percentage product discount is ignored after maximal usage.')); - } - - /** - * Create a discount. - * - * @param string $discount_type - * The discount type; Either 'order_discount' or 'product_discount'. - * @param string $offer_type - * The discount offer type; Either 'fixed_amount' or 'percentage'. - * @param integer $amount - * The discount offer amount. - * @param integer $max_usage - * Maximal uses for the discount. - * - * @return object - * The newly created commerce_discount entity. - */ - protected function createUsageDiscount($discount_type, $offer_type, $amount, $max_usage) { - // Use the base class to create a discount. - $discount = parent::createDiscount($discount_type, $offer_type, $amount); - - // Populate the max usage field. - $wrapper = entity_metadata_wrapper('commerce_discount', $discount); - $wrapper->discount_usage_limit = $max_usage; - $wrapper->save(); - - return $wrapper->value(); - } - -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/css/commerce_discount_usage.css b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/css/commerce_discount_usage.css deleted file mode 100644 index d0b9f383..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/css/commerce_discount_usage.css +++ /dev/null @@ -1,5 +0,0 @@ -#commerce-discount-fields-wrapper .field-name-discount-usage-limit, -#commerce-discount-fields-wrapper .field-name-discount-usage-per-person{ - float:none; - clear:both; -} \ No newline at end of file diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/commerce_discount_usage.views.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/commerce_discount_usage.views.inc deleted file mode 100644 index 1a66e8e1..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/commerce_discount_usage.views.inc +++ /dev/null @@ -1,161 +0,0 @@ - t('Analytics'), - 'help' => t('Show discount usage and usage limit.'), - 'field' => array( - 'handler' => 'commerce_discount_usage_handler_field_commerce_discount_analytics', - ), - 'real field' => 'discount_id', - ); - - // Usage relationship - $data['commerce_discount']['discount_usage'] = array( - 'relationship' => array( - 'title' => t('Discount usage'), - 'label' => t('Discount usage'), - 'help' => t('Relate this discount to its usage statistics.'), - 'handler' => 'views_handler_relationship', - 'base' => 'commerce_discount_usage', - 'base field' => 'discount', - 'field' => 'name', - ), - ); - } - - // Order table: discount usage relationship - if (isset($data['commerce_order'])) { - $data['commerce_order']['discount_usage'] = array( - 'relationship' => array( - 'title' => t('Discount usage'), - 'label' => t('Discount usage'), - 'help' => t('Relate this order to its discount usage statistics.'), - 'handler' => 'views_handler_relationship', - 'base' => 'commerce_discount_usage', - 'base field' => 'order_id', - 'field' => 'order_id', - ), - ); - } - - // User table: discount usage relationship - $data['users']['discount_usage'] = array( - 'relationship' => array( - 'title' => t('Discount usage'), - 'label' => t('Discount usage'), - 'help' => t('Relate this user to its discount usage statistics.'), - 'handler' => 'views_handler_relationship', - 'base' => 'commerce_discount_usage', - 'base field' => 'mail', - 'field' => 'mail', - ), - ); -} - -/* - * Implements hook_views_data(). - */ -function commerce_discount_usage_views_data() { - $data = array(); - $data['commerce_discount_usage']['table']['group'] = t('Commerce discount usage'); - - // Base table - $data['commerce_discount_usage']['table']['base'] = array( - 'field' => 'mail', - 'title' => t('Commerce Discount Usage'), - 'help' => t('Usage statistics about discounts.'), - ); - - // Discount name. - $data['commerce_discount_usage']['discount'] = array( - 'title' => t('Discount'), - 'help' => t('The unique human-readable identifier of the discount.'), - 'field' => array( - 'handler' => 'views_handler_field', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'handler' => 'views_handler_filter_string', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), - 'argument' => array( - 'handler' => 'views_handler_argument_string', - ), - 'relationship' => array( - 'title' => t('Discount'), - 'label' => t('Discount'), - 'help' => t('Relate a usage statistics record to its discount.'), - 'handler' => 'views_handler_relationship', - 'base' => 'commerce_discount', - 'base field' => 'name', - 'field' => 'discount', - ) - ); - - // Customer mail. - $data['commerce_discount_usage']['mail'] = array( - 'title' => t('User'), - 'help' => t('The email address of the customer who used the discount.'), - 'field' => array( - 'handler' => 'views_handler_field', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'handler' => 'views_handler_filter_string', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), - 'argument' => array( - 'handler' => 'views_handler_argument_string', - ), - 'relationship' => array( - 'title' => t('Customer email'), - 'label' => t('Customer email'), - 'help' => t('Relate a usage statistics record to its user.'), - 'handler' => 'views_handler_relationship', - 'base' => 'users', - 'base field' => 'mail', - 'field' => 'mail', - ) - ); - - // Order ID. - $data['commerce_discount_usage']['order_id'] = array( - 'title' => t('Order ID'), - 'help' => t('The unique internal identifier of the order where the discount was used.'), - 'field' => array( - 'handler' => 'commerce_order_handler_field_order', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'handler' => 'views_handler_filter_numeric', - ), - 'sort' => array( - 'handler' => 'views_handler_sort', - ), - 'argument' => array( - 'handler' => 'commerce_order_handler_argument_order_order_id', - ), - 'relationship' => array( - 'title' => t('Order'), - 'label' => t('Order'), - 'help' => t('Relate a usage statistics record to its order.'), - 'handler' => 'views_handler_relationship', - 'base' => 'commerce_order', - 'base field' => 'order_id', - 'field' => 'order_id', - ) - ); - - return $data; -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/commerce_discount_usage.views_default.inc b/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/commerce_discount_usage.views_default.inc deleted file mode 100644 index 6f271ad5..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/modules/commerce_discount_usage/includes/views/commerce_discount_usage.views_default.inc +++ /dev/null @@ -1,66 +0,0 @@ -display['default']->handler; - - if (empty($handler->display->display_options['fields']) || !is_array($handler->display->display_options['fields'])) { - return; - } - - $fields = array(); - foreach ($handler->display->display_options['fields'] as $field_id => $field) { - // Add the usage column after the status column. - if ($field_id == 'status') { - $fields += $usage_field; - } - $fields[$field_id] = $field; - } - - // Overwrite the original fields array. - $handler->display->display_options['fields'] = $fields; -} - -/** - * Helper function to get the Views import. - */ -function _commerce_discount_usage_views_get_view_delta() { - $handler = new stdClass(); - - /* Field: Commerce Discount: Analytics */ - $handler->display->display_options['fields']['commerce_discount_usage']['id'] = 'commerce_discount_usage'; - $handler->display->display_options['fields']['commerce_discount_usage']['table'] = 'commerce_discount'; - $handler->display->display_options['fields']['commerce_discount_usage']['field'] = 'commerce_discount_usage'; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['external'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['trim'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['alter']['html'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['element_label_colon'] = 1; - $handler->display->display_options['fields']['commerce_discount_usage']['element_default_classes'] = 1; - $handler->display->display_options['fields']['commerce_discount_usage']['hide_empty'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['empty_zero'] = 0; - $handler->display->display_options['fields']['commerce_discount_usage']['hide_alter_empty'] = 1; - - return $handler->display->display_options['fields']; -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/sass/_mixins.scss b/profiles/commerce_kickstart/modules/contrib/commerce_discount/sass/_mixins.scss new file mode 100644 index 00000000..7374cf0d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/sass/_mixins.scss @@ -0,0 +1,85 @@ +$gray: #f0f0f0; +$gray2: #ccc; +$gray3: #e7e8e3; +$gray4: #4d4e49; +$grayLight: #f6f6f6; +$grayDark: #6d6d6d; +$blue: #0089c9; +$green: #7cae20; +$azure: #d2eeff; + +@mixin gradient { + // http://caniuse.com/#search=linear-gradient + background-image: -webkit-linear-gradient(top, rgb(252, 253, 252) 36%, rgb(240, 240, 240) 68%); + background-image: linear-gradient(top, rgb(252, 253, 252) 36%, rgb(240, 240, 240) 68%); +} + +@mixin box { + padding: 0; +} + +// https://css-tricks.com/snippets/css/clear-fix/ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin btn { + color: black; + border-radius: 5px; + [dir="ltr"] & { + margin-right: 20px; + } + [dir="rtl"] & { + margin-left: 20px; + } + + margin-bottom: 5px; + padding: 5px; + &:hover { + background-color: $grayLight; + cursor: pointer; + label { + cursor: pointer; + } + } +} + +@mixin radio-buttons { + clear: both; + + .form-item { + @include btn; + + input { + display: inline; + } + } +} + +@mixin fieldset-title { + fieldset.form-wrapper { + border: none; + + legend { + width: 100%; + } + .fieldset-legend { + border-bottom: 1px solid $gray2; + display: block; + margin-top: 0; + [dir="ltr"] & { + padding-left: 0; + } + [dir="rtl"] & { + padding-right: 0; + } + + text-transform: none; + width: 100%; + } + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/commerce_discount.scss b/profiles/commerce_kickstart/modules/contrib/commerce_discount/sass/commerce_discount.scss similarity index 51% rename from profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/commerce_discount.scss rename to profiles/commerce_kickstart/modules/contrib/commerce_discount/sass/commerce_discount.scss index da2295fe..b81aee5e 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/commerce_discount.scss +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/sass/commerce_discount.scss @@ -1,4 +1,4 @@ -@import "_mixins.scss"; +@import "mixins"; /** * Discount form. @@ -6,37 +6,41 @@ .commerce-discount-form { // Position the discount status block on top right region. position: relative; - .form-item-status { - background-color: #eee; - padding: 10px 10px 20px 10px; - position: absolute; - top: 0; - right: 0; // LTR - width: 180px; - } - // Reset + + // Reset. .form-item-label { clear: both; + .form-item { @include box; } } + .form-item.form-type-radio { position: relative; + .ajax-progress-throbber { position: absolute; right: -10px; + .message { display: none; } } } - // general block margins + + // General block margins. #commerce-discount-fields-wrapper { - & > .form-wrapper { + .form-wrapper { margin-bottom: 15px; } + + .field-name-discount-usage-limit, .field-name-discount-usage-per-person { + float: none; + clear: both; + } } + #edit-actions { clear: both; } @@ -48,24 +52,46 @@ .form-item-commerce-discount-type { .form-radios { margin-top: 5px; + .form-item { @include btn; - float: left; + + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } &.selected { background-color: #eee; } + .ajax-progress { display: none; } - #edit-commerce-discount-type { - @include radio-buttons; - clear: none; + } + } +} - .form-item { - float: left; // LTR - } - } +#edit-commerce-discount-type { + padding: 0; + + @include radio-buttons; + + margin-top: 10px; + clear: none; + + .form-item { + [dir="ltr"] & { + float: left; + margin-right: 20px; + } + + [dir="rtl"] & { + float: right; + margin-left: 20px; } } } @@ -85,55 +111,93 @@ * Choose offer type block. */ .field-name-commerce-discount-offer { - border: none; + // Help with floaties inside. + @include clearfix; + + border: 0; margin: 0; padding: 0; - .form-wrapper .form-wrapper { - .form-item { - margin-bottom: 2px; + // Offer type options. + .form-item-commerce-discount-fields-commerce-discount-offer-und-form-type.form-type-radios { + padding-left: 0; + padding-right: 0; + [dir="ltr"] & { + float: left; + margin-right: 20px; + padding-right: 20px; + border-right: 1px dotted $gray2; + } + + [dir="rtl"] & { + float: right; + margin-left: 20px; + padding-left: 20px; + border-left: 1px dotted $gray2; + } + + .form-radios { + @include radio-buttons; + margin: 10px; padding: 0; - label { - border-bottom: 1px solid $gray2; - padding-left: 5px; // LTR - } - div.form-radios { - @include radio-buttons; - - background-color: transparent; - border-right: 1px dotted $gray2; /* LTR */ - float: left; /* LTR */ - margin: 10px; - padding: 4px; - padding-right: 20px; /* LTR */ - - .form-item { - &.selected { - background-color: #eee; - } - .ajax-progress { - display: none; - } + .form-item { + &.selected { + background-color: #eee; + } + + .ajax-progress { + display: none; } + } + + label { + border-bottom: 0; - label { - border-bottom: 0; + [dir="ltr"] & { padding-left: 0; } + + [dir="rtl"] & { + padding-right: 0; + } } } + } + + // Avoid collision with fields below. + .commerce-offer-type-wrapper > .fieldset-wrapper { + @include clearfix; + } + + // The two columns for the offer type. + .commerce-offer-fields-wrapper { + padding: 0; + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } + } + + .form-wrapper .form-wrapper { + .form-item { + margin-bottom: 2px; + } + .form-wrapper { label { border-bottom: 0; - padding-left: 0; - } - &.form-item { - background-color: transparent; - float: left; /* LTR */ - margin: 10px; - padding: 4px; + [dir="ltr"] & { + padding-left: 0; + } + + [dir="rtl"] & { + padding-right: 0; + } } } } @@ -144,19 +208,56 @@ */ .field-name-commerce-discount-date { clear: both; - @include fieldset-title; + .form-wrapper fieldset.form-wrapper { margin: 0; } - .fieldset-wrapper { - @include fieldset-content; + .fieldset-wrapper { background-color: transparent; display: inline-block; margin: 10px; padding: 4px; width: auto; } + + .container-inline-date { + clear: none; + + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } + + .date-padding { + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } + } + + .form-text { + background-image: url(../images/calendar.svg); + background-repeat: no-repeat; + background-position: calc(100% - 0.25em) center; + background-size: 1.25em; + } + } + + // Date.css override. + fieldset.date-combo .container-inline-date .date-padding { + padding: 0; + } + // Vertical tab fix. + fieldset.date-combo .fieldset-wrapper > .container-inline-date { + padding-top: 0; + } } /** @@ -172,40 +273,76 @@ border-bottom: 1px solid $gray2; } } + .form-item .form-select { - float: left; // LTR + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } + margin: 10px; } + .field-name-commerce-discount-max-uses { @include box; & > div { - float: left; // LTR - margin-left: 30px; // LTR + [dir="ltr"] & { + float: left; + margin-left: 30px; + + &:first-child { + margin-left: 0; + } + } + + [dir="rtl"] & { + float: right; + margin-right: 30px; - &:first-child { - margin-left: 0; + &:first-child { + margin-right: 0; + } } input[disabled] { - background: #eeeeee; + background: #eee; } } } + .field-type-number-integer { - float: left; // LTR + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } .form-item { padding: 0; } + label { display: inline; font-weight: normal; - margin-left: 10px; // LTR + + [dir="ltr"] & { + margin-left: 10px; + } + + [dir="rtl"] & { + margin-right: 10px; + } } + .form-disabled input { - border: none; - background: none; + border: 0; + background-color: transparent; } } } @@ -215,22 +352,24 @@ */ .view-commerce-discount-overview { .views-table { - border: none; + border: 0; tr, td { - border: none; + border: 0; } + th { text-transform: none; - .views-field-enable-disable {} .views-field-operations-dropbutton { width: 70px; } } + td { .views-field-type { padding: 10px 20px; } + .views-field-commerce-discount-usage li { list-style-type: none; @@ -239,6 +378,7 @@ font-style: italic; } } + .views-field-enable-disable .item-list ul { width: 140px; border: 2px solid $grayDark; @@ -248,7 +388,15 @@ li { display: block; width: 50%; - float: left; // LTR + + [dir="ltr"] & { + float: left; + } + + [dir="rtl"] & { + float: right; + } + text-transform: uppercase; padding: 5px 0; font-weight: bold; @@ -270,6 +418,7 @@ } } } + .views-field-operations-dropbutton { position: relative; @@ -287,3 +436,7 @@ } } } + +.field-name-commerce-compatibility-strategy .field-widget-options-buttons .form-wrapper { + clear: both; +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/_mixins.scss b/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/_mixins.scss deleted file mode 100644 index cad8a772..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/_mixins.scss +++ /dev/null @@ -1,114 +0,0 @@ -$gray: #f0f0f0; -$gray2: #cccccc; -$gray3: #e7e8e3; -$gray4: #4d4e49; -$grayLight: #f6f6f6; -$grayDark: #6d6d6d; -$blue: #0089c9; -$green: #7cae20; -$azure: #d2eeff; - -@mixin gradient { - background-image: linear-gradient(top, rgb(252,253,252) 36%, rgb(240,240,240) 68%); - background-image: -o-linear-gradient(top, rgb(252,253,252) 36%, rgb(240,240,240) 68%); - background-image: -moz-linear-gradient(top, rgb(252,253,252) 36%, rgb(240,240,240) 68%); - background-image: -webkit-linear-gradient(top, rgb(252,253,252) 36%, rgb(240,240,240) 68%); - background-image: -ms-linear-gradient(top, rgb(252,253,252) 36%, rgb(240,240,240) 68%); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.36, rgb(252,253,252)), color-stop(0.68, rgb(240,240,240))); -} - -@mixin box { - padding: 0px; -} - -@mixin btn { - color: black; - border-radius: 5px; - margin-right: 20px; // LTR - margin-bottom: 5px; - padding: 5px; - &:hover { - background-color: $grayLight; - cursor: pointer; - label { - cursor: pointer; - } - } -} - -@mixin radio-buttons { - @include box; - clear: both; - margin-top: 10px; - - .form-item { - @include btn; - - input { - display: inline; - } - } -} - -@mixin fieldset-title { - fieldset.form-wrapper { - border: none; - - legend { - width: 100%; - } - .fieldset-legend { - border-bottom: 1px solid $gray2; - display: block; - margin-top: 0; - padding-left: 0; - text-transform: none; - width: 100%; - } - } -} - -@mixin fieldset-content { - @include box; - - .form-type-checkbox { - // Hide Show end date checkbox. - display: none; - } - .container-inline-date { - clear: none; - float: left; // LTR - width: auto; - - .description { - display: none; - } - .form-item { - padding: 0; - } - .date-padding { - float: left; // LTR - padding: 0; - - input.form-text { - width: 55px; - } - & > .form-item:first-child input.form-text { - // TODO: For some reason this icon isn't added. - background: white url('../images/calendar.png') no-repeat 86px 0px; // LTR - width: 100px; - } - } - & > .form-item { - border: none; - } - label { - display: block; - float: left; // LTR - padding-right: 10px; // LTR - } - &.end-date-wrapper { - margin-left: 20px; // LTR - } - } -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/commerce_discount-rtl.scss b/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/commerce_discount-rtl.scss deleted file mode 100644 index 8c810909..00000000 --- a/profiles/commerce_kickstart/modules/contrib/commerce_discount/scss/commerce_discount-rtl.scss +++ /dev/null @@ -1,200 +0,0 @@ -@import "_mixins.scss"; - -@mixin btn { - margin-left: 20px; - margin-right: 0; // RTL -} -.form-item.form-type-radio { - position: relative; - .progress-disabled { - float: none; - } - .ajax-progress-throbber { - position: absolute; - right: -10px; - } -} - -@mixin radio-buttons { - .form-item { - @include btn; - } -} - -@mixin fieldset-content { - .container-inline-date { - float: right; - - .date-padding { - float: left; // LTR - - - & > .form-item:first-child input.form-text { - // TODO: For some reason this icon isn't added. - background: white url('../images/calendar.png') no-repeat 2px 0px; - } - } - label { - float: right; - padding-right: 0px; - padding-left: 10px; // RTL - } - &.end-date-wrapper { - margin-left: 0; // RTL - margin-right: 20px; - } - } -} - -html.js input.form-autocomplete { - background-position: 0% 2px; // RTL -} - -/** - * Discount form. - */ -.commerce-discount-form { - // Position the discount status block on top right region. - position: relative; - .form-item-status { - background-color: #eee; - padding: 10px 10px 20px 10px; - position: absolute; - top: 0; - left: 0; - right: auto; // RTL - width: 180px; - } - // Reset - .form-item-label { - clear: both; - .form-item { - @include box; - } - } - .form-item.form-type-radio { - position: relative; - .ajax-progress-throbber { - position: absolute; - right: -10px; - - } - } - // general block margins - #commerce-discount-fields-wrapper .form-wrapper { - & > #inline-conditions-inline_conditions .form-wrapper .ajax-progress { - display: block; /* RTL */ - margin-top: 10px; /* RTL */ - width: 180px; /* RTL */ - } - & > #inline-conditions-inline_conditions .form-wrapper .condition-wrapper .form-item { - .ajax-progress { - display: inline-block; - margin-top: 0; - width: auto; - } - } - } -} -/** - * Choose discount type block. - */ -.form-item-commerce-discount-type { - .form-radios { - .form-item { - float: right; - - #edit-commerce-discount-type { - @include radio-buttons; - - .form-item { - float: right; - } - } - } - } -} -/** - * Choose offer type block. - */ -.field-name-commerce-discount-offer { - clear: both; // RTL - - .form-wrapper .form-wrapper { - .form-item { - label { - padding-right: 5px; - padding-left: 0; // RTL - } - div.form-radios { - @include radio-buttons; - - border-right: 0; // RTL - border-left: 1px dotted $gray2; - float: right; - padding-right: 0; // RTL - padding-left: 20px; - - label { - padding-right: 5px; - padding-left: 0; // RTL - } - } - } - .form-wrapper { - label { - padding-right: 5px; - padding-left: 0; // RTL - } - &.form-item { - float: right; - } - } - } -} - -/** - * Discount dates block. - */ -.field-name-commerce-discount-date { - .fieldset-wrapper { - @include fieldset-content; - } -} - -/** - * Usage block. - */ -.commerce-discount-usage { - .form-item.form-type-select { - margin: 0; - - label { - border-bottom: 1px solid $gray2; - } - } - .form-item .form-select { - float: right; - } - .field-name-commerce-discount-max-uses { - @include box; - - & > div { - float: left; // LTR - margin-left: 30px; // LTR - - &:first-child { - margin-left: 0; - } - - } - } - .field-type-number-integer { - float: right; - - label { - margin-left: 0px; - margin-right: 10px; // RTL - } - } -} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount.test new file mode 100644 index 00000000..02e0288f --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount.test @@ -0,0 +1,587 @@ + 'Discounts', + 'description' => 'Test discounts functionality', + 'group' => 'Commerce Discount', + ); + } + + /** + * Test the importing of commerce discounts. + */ + public function testCommerceDiscountImport() { + $exported_discount = '{ + "name" : "pf", + "label" : "PF", + "type" : "product_discount", + "status" : "1", + "component_title" : "pf", + "sort_order" : "10", + "commerce_discount_offer" : { + "type" : "fixed_amount", + "commerce_fixed_amount" : { "und" : [ + { + "amount" : "1200", + "currency_code" : "USD", + "data" : { "components" : [] } + } + ] + } + }, + "commerce_compatibility_strategy" : { "und" : [ { "value" : "any" } ] }, + "commerce_compatibility_selection" : [], + "commerce_discount_date" : [], + "inline_conditions" : [], + "discount_usage_per_person" : [], + "discount_usage_limit" : [] +}'; + + // Import the discount. + $import = entity_import('commerce_discount', $exported_discount); + $this->assertNotNull($import, 'Entity export JSON imported successfully.'); + entity_save('commerce_discount', $import); + + // Export the discount to make sure it's identical to the import string. + $discount = entity_load_single('commerce_discount', $import->discount_id); + $export = entity_export('commerce_discount', $discount); + $this->assertTrue($exported_discount == $export, 'Exported discount is identical to its origin.'); + } + + /** + * Test order wrapper cache from order refresh. + */ + public function testCommerceDiscountOrderRefreshWrapper() { + // Create a 'free bonus products' product discount. + $discount = $this->createDiscount('order_discount', 'free_products', array($this->product->product_id)); + // Create a completed order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + $line_items = $order_wrapper->value()->commerce_line_items[LANGUAGE_NONE]; + $this->assertEqual($order_wrapper->commerce_line_items->count(), count($line_items), 'Number of line items matched'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + $order_wrapper = commerce_cart_order_refresh($order); + $line_items = $order_wrapper->value()->commerce_line_items[LANGUAGE_NONE]; + $this->assertEqual($order_wrapper->commerce_line_items->count(), count($line_items), 'Number of line items matched'); + } + + /** + * Test fixed order discounts. + */ + public function testCommerceDiscountFixedOrderDiscount() { + // Testing fixed discount. + // Create a fixed order discount of $3. + $discount = $this->createDiscount('order_discount', 'fixed_amount', 300); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 700, 'Fixed order discount is deducted correctly.'); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 700, 'Fixed order discount is deducted correctly even after order refresh.'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + // Re-save the order. + // Check if the discount was applied on the order total price. + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $order_wrapper->save(); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 1000, "Fixed order discount is removed when it's not applicable."); + } + + /** + * Test percentage order discounts. + */ + public function testCommerceDiscountPercentageOrderDiscount() { + // Testing percentage discount. + // Create a percentage order discount of 5%. + $discount = $this->createDiscount('order_discount', 'percentage', 5); + // Create a completed order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 950, 'Percentage order discount is deducted correctly.'); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 950, 'Percentage order discount is deducted correctly even after refresh.'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 1000, "Percentage order discount is removed when it's not applicable."); + } + + /** + * Test a 100% off product percentage discount. + * + * A 100% off product-level discount differs from the "Free product" discount + * offer type since those are normally used as an "add-on" that is added + * without the user's interaction (maybe as part of a package, or bonus); + * whereas a 100% off discount should be used for any product purposely added + * to a cart order. + */ + public function testCommerceDiscountOneHundredPercentOff() { + // Login as the store admin. + $this->drupalLogin($this->store_admin); + + // Create a 100% off discount and create a test product. + $discount = $this->createDiscount('product_discount', 'percentage', 100, 'freebie'); + + $product = $this->createDummyProduct('TEST-PRODUCT', 'Test Product', 999); + + // Create the order and apply the freebie discount. + $order = $this->createDummyOrder($this->store_admin->uid, array($product->product_id => 1)); + $order_wrapper = commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('freebie', $order); + $this->assertTrue($properly_applied, t('100% off discount applied to a product.')); + + // Verify that the product is now free. + $unit_price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + + $this->assertEqual($unit_price['amount'], 0, 'Product line item unit price amount is properly set to 0.'); + $this->assertEqual($unit_price['data']['components'][1]['price']['amount'], -999, 'Product line item unit price discount component properly set to 100% of the product price.'); + + $order_wrapper = commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('freebie', $order); + $this->assertTrue($properly_applied, t('100% off discount applied to a product even after refresh.')); + + // Verify that the product is now free. + $unit_price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + + $this->assertEqual($unit_price['amount'], 0, 'Product line item unit price amount is properly set to 0 even after refresh.'); + $this->assertEqual($unit_price['data']['components'][1]['price']['amount'], -999, 'Product line item unit price discount component properly set to 100% of the product price even after refresh.'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + $unit_price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + + $properly_applied = $this->discountAppliedToOrder('freebie', $order); + $this->assertFalse($properly_applied, t('100% off discount not applied to a product.')); + + $this->assertEqual($unit_price['amount'], 999, 'Product line item unit price amount is 999.'); + } + + /** + * Test free bonus products order discounts. + */ + public function testCommerceDiscountFreeProductsOrderDiscount() { + // Create 'free bonus products' product discount. + $discount = $this->createDiscount('order_discount', 'free_products', array($this->product->product_id)); + // Create a completed order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertEqual($order_wrapper->commerce_order_total->amount->value(), 1000, 'Free Bonus Products order discount has the price of only one product.'); + $this->assertEqual($order_wrapper->commerce_line_items->count(), 2, 'Free Bonus Products order discount is added as a line item.'); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertEqual($order_wrapper->commerce_order_total->amount->value(), 1000, 'Free Bonus Products order discount has the price of only one product even after refresh.'); + $this->assertEqual($order_wrapper->commerce_line_items->count(), 2, 'Free Bonus Products order discount is added as a line item even after refresh.'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + // Re-save the order. + // Check if the discount was applied on the order total price. + $order_wrapper = commerce_cart_order_refresh($order); + $this->assertEqual($order_wrapper->commerce_order_total->amount->value(), 1000, "Free Bonus Products order discount is removed when it's not applicable and price is the same."); + $this->assertEqual($order_wrapper->commerce_line_items->count(), 1, "Free Bonus Products order discount is removed when it's not applicable and line item count is only 1"); + } + + /** + * Test fixed product discounts. + */ + public function testCommerceDiscountFixedProductDiscount() { + $discount = $this->createDiscount('product_discount', 'fixed_amount', 300); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was added as a component to the line item. + $price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + $this->assertTrue($price['data']['components'][1]['price']['amount'] == -300, 'Fixed product discount is added as a price component to the line item.'); + $this->assertEqual($price['amount'], 700, 'Line item price with fixed product discount is correct.'); + + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was added as a component to the line item. + $price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + $this->assertTrue($price['data']['components'][1]['price']['amount'] == -300, 'Fixed product discount is added as a price component to the line item even after refresh.'); + $this->assertEqual($price['amount'], 700, 'Line item price with fixed product discount is correct even after refresh.'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount is not applied. + $price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + $this->assertEqual($price['amount'], 1000, 'Disabled fixed product discount is does not appear in the price.'); + } + + /** + * Test percentage product discounts. + */ + public function testCommerceDiscountPercentageProductDiscount() { + $discount = $this->createDiscount('product_discount', 'percentage', 5); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was added as a component to the line item. + $price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + $this->assertEqual($price['data']['components'][1]['price']['amount'], -50, 'Percentage product discount is added as a price component to the line item.'); + $this->assertEqual($price['amount'], 950, 'Line item amount with Percentage product discount is correct.'); + + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was added as a component to the line item. + $price = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + $this->assertEqual($price['data']['components'][1]['price']['amount'], -50, 'Percentage product discount is added as a price component to the line item even after refresh.'); + $this->assertEqual($price['amount'], 950, 'Line item amount with Percentage product discount is correct even after refresh.'); + + // Disable the discount. + $discount->status = FALSE; + entity_save('commerce_discount', $discount); + + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was added as a component to the line item. + $price_data = $order_wrapper->commerce_line_items->get(0)->commerce_unit_price->value(); + $this->assertEqual($price_data['amount'], 1000, 'Line item amount without Percentage product discount is correct.'); + } + + /** + * Test discounted product price display. + */ + public function testCommerceDiscountDiscountedProductPriceDisplay() { + // Create a product discount. + $this->createDiscount('product_discount', 'fixed_amount', 300); + $formatted_discounted_price = '$7.00'; + + // Log in as a normal user. + $this->drupalLogin($this->store_customer); + + $nid = $this->product_node->nid; + // View a product node. + $this->drupalGet("node/$nid"); + $product_price = $this->xpath('//div[contains(@class, "field-name-commerce-price")]/div[contains(@class, "field-item")]'); + $this->assertTrue(trim((string) $product_price[0]->div) == $formatted_discounted_price, 'Discounted product price is shown on product page.'); + + // Add a product to the cart. + $this->drupalPost('node/' . $this->product_node->nid, array(), t('Add to cart')); + + // View the cart. + $this->drupalGet('cart'); + $product_price = $this->xpath('//td[contains(@class, "views-field-commerce-unit-price")]'); + $this->assertTrue(trim((string) $product_price[0]->{0}) == $formatted_discounted_price, 'Discounted product price is shown on the cart.'); + } + + /** + * Test multiple fixed order discounts. + */ + public function testCommerceDiscountMultipleFixedOrderDiscounts() { + // Create two discounts. + $this->createDiscount('order_discount', 'fixed_amount', 300, 'of1'); + $this->createDiscount('order_discount', 'fixed_amount', 200, 'of2'); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + $this->assertTrue($order_wrapper->commerce_discounts->count() == 2, '2 discounts are listed as applied on the order.'); + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 500, 'Two fixed order discounts are applied on the total price.'); + $this->assertTrue($order_wrapper->commerce_line_items->count() == 3, 'An order with one product and two fixed order discounts has three line items.'); + $order_wrapper->save(); + $this->assertTrue($order_wrapper->commerce_line_items->count() == 3, 'After updating the order it still has three line items.'); + } + + /** + * Test rounding in percentage based product discounts. + * + * To test the rounding used when adding discount price components to product + * line items, we use a 30% discount on a product that costs $10.25. When + * rounding was not working correctly, the unit price amount would be set to + * $7.18 even though the sum of the unit price's price components would in + * fact be $7.17. In reality, since the actual discount amount SHOULD be + * rounded up to $3.08 from $3.075, the unit price amount SHOULD be $7.17. + * This test ensures that is the case in conjunction with a patch from the + * linked issue below. + * + * @link https://www.drupal.org/node/2468943#comment-10476486 + */ + public function testCommerceProductPercentageDiscountRounding() { + // Create the 30% discount and $10.25 product. + $this->createDiscount('product_discount', 'percentage', 30, 'discount_30_off'); + $product = $this->createDummyProduct('TEST-PRODUCT', 'Test Product', 1025); + + // Create the order and apply discount. + $order = $this->createDummyOrder($this->store_customer->uid, array($product->product_id => 1), 'completed'); + $order_wrapper = commerce_cart_order_refresh($order); + + // Verify rounding came out properly. + $line_item_wrapper = $order_wrapper->commerce_line_items->get(0); + $unit_price = $line_item_wrapper->commerce_unit_price->value(); + + $this->assertEqual($unit_price['amount'], 717, 'Product line item unit price amount rounded properly for a 30% discount.'); + $this->assertEqual($unit_price['data']['components'][1]['price']['amount'], -308, 'Product line item unit price discount component properly rounded for a 30% discount.'); + } + + /** + * Test discount compatibility strategies. + * + * Currently implemented strategies include: + * - any: discount is compatible with any other discount. + * - except: discount is compatible with any discount except selected ones. + * - only: discount is only compatible with selected ones. + * - none: discount is not compatible with any other discount. + * + * Compatibility is checked first to ensure that discounts already on an order + * are not incompatible with the discount being added. It is then checked to + * ensure the discount being added is not incompatible with any discount that + * has already been added to the order. + */ + public function testCommerceDiscountCompatibilityStrategies() { + // Create two discounts set to execute one after the other. + $discount_one = $this->createDiscount('order_discount', 'fixed_amount', 100, 'of1', 1); + $discount_one_wrapper = entity_metadata_wrapper('commerce_discount', $discount_one); + $discount_two = $this->createDiscount('order_discount', 'fixed_amount', 200, 'of2', 2); + $discount_two_wrapper = entity_metadata_wrapper('commerce_discount', $discount_two); + + // Create an order and recalculate discounts. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + + // Test compatibility with both discounts using the "any" strategy. Both + // discounts should be applied. + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Discount one and two applied when both are compatible with any discount.')); + + // Test compatibility with only discount one using the "none" strategy. Only + // discount one should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'none'; + $discount_one_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && !$this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Only discount one applied when it is not compatible with any other discount.')); + + // Test compatibility with only discount two using the "none" strategy. Only + // discount one should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'any'; + $discount_one_wrapper->save(); + $discount_two_wrapper->commerce_compatibility_strategy = 'none'; + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && !$this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Only discount one applied when discount two is not compatible with any other discount.')); + + // Test compatibility with discount one compatible with any discount + // except discount two. Only discount one should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'except'; + $discount_one_wrapper->commerce_compatibility_selection = array($discount_two->discount_id); + $discount_one_wrapper->save(); + $discount_two_wrapper->commerce_compatibility_strategy = 'any'; + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && !$this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Only discount one applied when it is compatible with any discount except discount two.')); + + // Test compatibility with discount two compatible with any discount + // except discount one. Only discount one should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'any'; + $discount_one_wrapper->save(); + $discount_two_wrapper->commerce_compatibility_strategy = 'except'; + $discount_two_wrapper->commerce_compatibility_selection = array($discount_one->discount_id); + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && !$this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Only discount one applied when it is compatible with any discount and discount two is compatible with any discount except discount one.')); + + // Test compatibility with discount two compatible with only discount + // one. Both discounts should be applied. + $discount_two_wrapper->commerce_compatibility_strategy = 'only'; + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Both discounts applied when discount one is compatible with any discount and discount two is compatible only with discount one.')); + + // Test compatibility with discount two compatible with only discount + // one. Both discounts should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'only'; + $discount_one_wrapper->save(); + $discount_two_wrapper->commerce_compatibility_strategy = 'any'; + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Both discounts applied when discount one is only compatible with discount two and discount two is compatible with any discount.')); + } + + /** + * Test discount deletion. + * + * Discount deletion should not cause fatal errors on cart refresh. + * + * @link https://www.drupal.org/node/2538812 + */ + public function testCartWithDiscountsDeleted() { + // Testing fixed discount. + // Create a fixed order discount of $3. + /** @var CommerceDiscount $discount */ + $discount = $this->createDiscount('order_discount', 'fixed_amount', 300); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 700, 'Fixed order discount is deducted correctly.'); + + // Delete the discount. + $discount->delete(); + + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 1000, "Fixed order discount is removed when it's not applicable."); + } + + /** + * Test discount compatibility regression https://www.drupal.org/node/2621526. + * + * Discount "toggles" when cart page is refreshed. + */ + public function testCommerceDiscountCompatibilityStrategiesRefresh() { + // Create two discounts set to execute one after the other. + $discount_one = $this->createDiscount('product_discount', 'percentage', 10, 'of1'); + $discount_one_wrapper = entity_metadata_wrapper('commerce_discount', $discount_one); + $discount_two = $this->createDiscount('product_discount', 'percentage', 20, 'of2', 2); + $discount_two_wrapper = entity_metadata_wrapper('commerce_discount', $discount_two); + + // Create an order and recalculate discounts. + $order = $this->createDummyOrder($this->store_customer->uid, array( + $this->product->product_id => 1 + ), 'completed'); + + // Test compatibility with discount one compatible only with discount two + // And discount two compatible with any discount. Both should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'only'; + $discount_one_wrapper->commerce_compatibility_selection = array( + $discount_two->discount_id + ); + $discount_one_wrapper->save(); + $discount_two_wrapper->commerce_compatibility_strategy = 'any'; + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Both discounts applied when discount one is compatible with any discount and discount two is compatible only with discount one.')); + + // Regression test for discount compatibility with itself. + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($properly_applied, t('Both discounts applied when discount one is compatible with any discount, discount two is compatible only with discount one and the order refreshed one more time.')); + } + + /** + * Test discount compatibility regression https://www.drupal.org/node/2621526. + * + * Two "none" compatible discounts "toggles" when cart page is refreshed. + */ + public function testCommerceDiscountCompatibilityStrategiesRefreshNone() { + // Create two discounts set to execute one after the other. + $discount_one = $this->createDiscount('product_discount', 'percentage', 10, 'of1'); + $discount_one_wrapper = entity_metadata_wrapper('commerce_discount', $discount_one); + $discount_two = $this->createDiscount('product_discount', 'percentage', 20, 'of2', 2); + $discount_two_wrapper = entity_metadata_wrapper('commerce_discount', $discount_two); + + // Create an order and recalculate discounts. + $order = $this->createDummyOrder($this->store_customer->uid, array( + $this->product->product_id => 1 + ), 'completed'); + + // Test compatibility with both discounts compatible with no other + // discounts. + // Only first discount should be applied. + $discount_one_wrapper->commerce_compatibility_strategy = 'none'; + $discount_one_wrapper->save(); + $discount_two_wrapper->commerce_compatibility_strategy = 'none'; + $discount_two_wrapper->save(); + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && ! $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($this->discountAppliedToOrder('of1', $order), t('Discount 1.')); + $this->assertFalse($this->discountAppliedToOrder('of2', $order), t('Discount 2.')); + $this->assertTrue($properly_applied, t('Only first discount applied when both discounts are incompatible with any discounts.')); + + // Regression test for discount compatibility with itself. + commerce_cart_order_refresh($order); + + $properly_applied = $this->discountAppliedToOrder('of1', $order) && ! $this->discountAppliedToOrder('of2', $order); + $this->assertTrue($this->discountAppliedToOrder('of1', $order), t('Discount 1.')); + $this->assertFalse($this->discountAppliedToOrder('of2', $order), t('Discount 2.')); + $this->assertTrue($properly_applied, t('Only first discount applied when both discounts are incompatible with any discounts and order refreshed once again.')); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_base.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_base.test new file mode 100644 index 00000000..5c1570e1 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_base.test @@ -0,0 +1,253 @@ +sub_module) { + $modules[] = $this->sub_module; + } + parent::setUp($modules); + + // User creation for different operations. + $this->store_admin = $this->createStoreAdmin(); + $this->store_customer = $this->createStoreCustomer(); + + // Create a dummy product. + $this->product = $this->createDummyProduct('PROD-01', 'Product One', 1000); + + // Create a dummy product display content type. + $this->createDummyProductDisplayContentType(); + + // Create a product display node. + $this->product_node = $this->createDummyProductNode(array($this->product->product_id), 'Product One node'); + + // Set the default country to US. + variable_set('site_default_country', 'US'); + } + + /** + * Create a discount. + * + * @param string $discount_type + * The discount type; Either 'order_discount' or 'product_discount'. + * @param string $offer_type + * The discount offer type; One of 'fixed_amount', 'percentage', + * 'free_products', 'free_shipping', 'percent_off_shipping' or + * 'shipping_upgrade'. + * @param int|array $amount + * In case of 'fixed_amount' a number: the discount amount. + * In case of 'percentage' a number: the percentage (a number less than 1). + * In case of 'free_products' an array of the product ids. + * In case of 'free_shipping' a string of the free shipping service name. + * In case of 'percent_off_shipping' an array with the percentage amount + * (key: 'percent', should be < 100) and the shipping service name string + * (key: 'service'). + * In case of 'shipping_upgrade' an array with the source service (key: ' + * source') and the target service (key: 'target'). + * @param string $name + * Discount name - Optional. If given, CANNOT start with a number. + * @param string $component_title + * Component title - Optional. + * + * @return object + * The newly created commerce_discount entity. + */ + protected function createDiscount($discount_type, $offer_type, $amount, $name = '', $component_title = '', $sort_order = 10) { + // Create the discount offer. + $commerce_discount_offer = entity_create('commerce_discount_offer', array('type' => $offer_type)); + $offer_wrapper = entity_metadata_wrapper('commerce_discount_offer', $commerce_discount_offer); + switch ($offer_type) { + case 'fixed_amount': + $offer_wrapper->commerce_fixed_amount->amount = $amount; + $offer_wrapper->commerce_fixed_amount->currency_code = 'USD'; + break; + + case 'percentage': + $offer_wrapper->commerce_percentage = $amount; + break; + + case 'free_products': + // Product ids array should be provided for $amount. + $offer_wrapper->commerce_free_products = $amount; + break; + + case 'free_shipping': + $offer_wrapper->commerce_free_shipping = $amount; + $offer_wrapper->commerce_free_shipping_strategy = 'only_selected'; + break; + + case 'percent_off_shipping': + $offer_wrapper->commerce_percent_off_shipping = $amount['percent']; + if (!empty($amount[1])) { + $offer_wrapper->commerce_percent_off_ship_serv = $amount['service']; + } + break; + + case 'shipping_upgrade': + $offer_wrapper->commerce_shipping_upgrade_target = $amount['target']; + $offer_wrapper->commerce_shipping_upgrade_source = $amount['source']; + break; + } + + $offer_wrapper->save(); + + // Provide default name. + $name = $name ? $name : $discount_type . '_' . $offer_type; + $component_title = $component_title ? $component_title : $name; + + // Create the discount. + $values = array( + 'name' => $name, + 'label' => $name, + 'type' => $discount_type, + 'sort_order' => $sort_order, + 'component_title' => $component_title, + 'status' => TRUE, + 'export_status' => TRUE, + ); + $commerce_discount = entity_create('commerce_discount', $values); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $commerce_discount); + $discount_wrapper->commerce_discount_offer = $commerce_discount_offer; + $discount_wrapper->save(); + + return $discount_wrapper->value(); + } + + /** + * Determines whether or not a discount has been applied to an order. + * + * @param string $discount_name + * The machine-name of the discount to look for. + * @param object $order + * The order object to inspect for the discount. + * + * @return bool + * Boolean indicating whether or not the discount is applied to the order. + */ + public function discountAppliedToOrder($discount_name, $order) { + // Fetch the list of discounts applied to the order based on the price + // components in its order total array. + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + $order_total = $order_wrapper->commerce_order_total->value(); + $applied_discounts = commerce_discount_get_discounts_applied_to_price($order_total); + + // Look for the given discount in the list of applied discounts. + return in_array($discount_name, $applied_discounts); + } + + /** + * Create a discount. + * + * @param string $discount_type + * The discount type; Either 'order_discount' or 'product_discount'. + * @param string $offer_type + * The discount offer type; Either 'fixed_amount' or 'percentage'. + * @param int $amount + * The discount offer amount. + * @param int $max_usage + * Maximal uses for the discount. + * + * @return object + * The newly created commerce_discount entity. + */ + protected function createUsageDiscount($discount_type, $offer_type, $amount, $max_usage) { + // Use the base class to create a discount. + $discount = $this->createDiscount($discount_type, $offer_type, $amount); + + // Populate the max usage field. + $wrapper = entity_metadata_wrapper('commerce_discount', $discount); + $wrapper->discount_usage_limit = $max_usage; + $wrapper->save(); + + return $wrapper->value(); + } + + /** + * Create a date discount. + * + * @param string $discount_type + * The discount type; Either 'order_discount' or 'product_discount'. + * @param string $offer_type + * The discount offer type; Either 'fixed_amount' or 'percentage'. + * @param int $amount + * The discount offer amount. + * @param int $start_time + * Discount valid from. + * @param int $end_time + * Discount valid until. + * + * @return object + * The newly created commerce_discount entity. + */ + protected function createDateDiscount($discount_type, $offer_type, $amount, $start_time, $end_time) { + // Use the base class to create a discount. + $discount = $this->createDiscount($discount_type, $offer_type, $amount); + + // Populate the date fields. + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + $discount_wrapper->commerce_discount_date = array( + 'value' => $start_time, + 'value2' => $end_time, + 'date_type' => 'datestamp', + ); + $discount_wrapper->save(); + + return $discount_wrapper->value(); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_conditions.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_conditions.test new file mode 100644 index 00000000..bb7f90c7 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_conditions.test @@ -0,0 +1,184 @@ + 'Discounts inline conditions', + 'description' => 'Test discounts inline conditions', + 'group' => 'Commerce Discount', + ); + } + + /** + * Set up our tests by adding some additional products. + */ + public function setUp() { + parent::setUp(); + + // We need a bunch of products. + $this->products['b'] = $this->createDummyProduct('PROD-B', 'Product B', 1000); + $this->products['c'] = $this->createDummyProduct('PROD-C', 'Product C', 1000); + $this->products['d'] = $this->createDummyProduct('PROD-D', 'Product D', 1000); + $this->products['e'] = $this->createDummyProduct('PROD-E', 'Product E', 1000); + $this->products['f'] = $this->createDummyProduct('PROD-F', 'Product F', 1000); + } + + /** + * Tests the 'commerce_order_contains_products' rule. + */ + public function testOrderContainsProductsCondition() { + // Build a test matrix. + // @see https://www.drupal.org/node/2398113 + $test_matrix = array( + // All of the products, including other products. + 'all inclusive' => array( + 'products_in_order' => array('b', 'c', 'd', 'e', 'f'), + 'results' => array( + 'any' => TRUE, + 'all' => TRUE, + 'exactly' => FALSE, + 'only' => FALSE, + ), + ), + // All of the products, exclusive of other products. + 'all exclusive' => array( + 'products_in_order' => array('c', 'e', 'f'), + 'results' => array( + 'any' => TRUE, + 'all' => TRUE, + 'exactly' => TRUE, + 'only' => TRUE, + ), + ), + // Some of the products, including one other product. + 'some inclusive' => array( + 'products_in_order' => array('b', 'c'), + 'results' => array( + 'any' => TRUE, + 'all' => FALSE, + 'exactly' => FALSE, + 'only' => FALSE, + ), + ), + // Some of the products, exclusively. + 'some exclusive' => array( + 'products_in_order' => array('e', 'f'), + 'results' => array( + 'any' => TRUE, + 'all' => FALSE, + 'exactly' => FALSE, + 'only' => TRUE, + ), + ), + // None of the products. + 'none' => array( + 'products_in_order' => array('b', 'd'), + 'results' => array( + 'any' => FALSE, + 'all' => FALSE, + 'exactly' => FALSE, + 'only' => FALSE, + ), + ), + ); + + // Set up all of the discount rules. + foreach ($test_matrix['none']['results'] as $operator => $result) { + $discount = $this->createDiscount('order_discount', 'fixed_amount', 100, 'ic_' . $operator, 1); + $discount->inline_conditions[LANGUAGE_NONE][0] = array( + 'condition_name' => 'commerce_order_contains_products', + 'condition_settings' => array( + 'operator' => $operator, + 'products' => array( + array('product_id' => $this->products['c']->product_id), + array('product_id' => $this->products['e']->product_id), + array('product_id' => $this->products['f']->product_id), + ), + ), + ); + entity_save('commerce_discount', $discount); + } + + // Loop through each element of the test matrix and run the tests. + foreach ($test_matrix as $set => $test_details) { + $order_products = array(); + + // Only add products we want for our test. + foreach ($test_details['products_in_order'] as $product_letter) { + $order_products[$this->products[$product_letter]->product_id] = 1; + } + + // Create a discount with our dummy products. + $order = $this->createDummyOrder($this->store_customer->uid, $order_products); + + // Refresh the order to apply the discounts. + commerce_cart_order_refresh($order); + + // Check if the discount was applied on the order total price. + foreach ($test_details['results'] as $operator => $result) { + $this->assertTrue(($this->discountAppliedToOrder('ic_' . $operator, $order) === $result), 'Order discount properly applies with "' . $operator . '" operator to product set: ' . $set . '.', 'Discount'); + } + + // Delete the order. + commerce_order_delete($order->order_id); + } + } + + /** + * Test commerce_product_contains_products() condition. + */ + public function testCommerceProductContainsProducts() { + $discount = $this->createDiscount('product_discount', 'fixed_amount', 100, 'product_sku_discount'); + $discount->inline_conditions[LANGUAGE_NONE][0] = array( + 'condition_name' => 'commerce_product_contains_products', + 'condition_settings' => array( + 'sku' => array( + array('product_id' => $this->products['c']->product_id), + ), + ), + ); + entity_save('commerce_discount', $discount); + + // Calculated price has discount. + $calculated_data = commerce_product_calculate_sell_price($this->products['c']); + $discounts = commerce_discount_get_discounts_applied_to_price($calculated_data); + $this->assertTrue(!empty($discounts)); + + $calculated_data = commerce_product_calculate_sell_price($this->products['b']); + $discounts = commerce_discount_get_discounts_applied_to_price($calculated_data); + $this->assertTrue(empty($discounts)); + + // Orders have discount. + $order = $this->createDummyOrder($this->store_customer->uid, array( + $this->products['c']->product_id => 1, + )); + // Refresh the order to apply the discounts. + commerce_cart_order_refresh($order); + $this->assertTrue($this->discountAppliedToOrder('product_sku_discount', $order)); + + // Delete order createDummyOrder method uses commerce_cart_order_load. + commerce_order_delete($order->order_id); + + $order2 = $this->createDummyOrder($this->store_customer->uid, array( + $this->products['b']->product_id => 1, + )); + // Refresh the order to apply the discounts. + commerce_cart_order_refresh($order2); + $this->assertFalse($this->discountAppliedToOrder('product_sku_discount', $order2)); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_date.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_date.test new file mode 100644 index 00000000..418e3599 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_date.test @@ -0,0 +1,144 @@ + 'Discounts date', + 'description' => 'Test discounts date functionality', + 'group' => 'Commerce Discount', + ); + } + + /** + * {@inheritdoc} + */ + public function setUp() { + parent::setUp(); + } + + /** + * Test order discount in timespan. + */ + public function testDiscountDateOrderDiscountInTime() { + // Create a discount valid from yesterday until tomorrow. + $start_time = time() - $this->dayInSeconds; + $end_time = time() + $this->dayInSeconds; + + // Testing fixed discount. + $this->createDateDiscount('order_discount', 'fixed_amount', 300, $start_time, $end_time); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 700, 'Order discount is deducted when in time frame.'); + } + + /** + * Test order discount out of timespan. + */ + public function testDiscountDateOrderDiscountOutOfTime() { + // Create a discount valid from tomorrow. + $start_time = time() + $this->dayInSeconds; + $end_time = time() + 2 * $this->dayInSeconds; + + // Testing fixed discount. + // Create a fixed order discount of $3 limited to one use. + $this->createDateDiscount('order_discount', 'fixed_amount', 300, $start_time, $end_time); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 1000, 'Order discount is ignored when out of time frame.'); + } + + /** + * Test product discount in timespan. + */ + public function testDiscountDateProductDiscountInTime() { + // Create a discount valid from yesterday until tomorrow. + $start_time = time() - $this->dayInSeconds; + $end_time = time() + $this->dayInSeconds; + + $this->createDateDiscount('product_discount', 'fixed_amount', 300, $start_time, $end_time); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + // Invoke line item price re-calculation. + $line_item = $order_wrapper->commerce_line_items->get(0)->value(); + rules_invoke_event('commerce_product_calculate_sell_price', $line_item); + // Check if the discount was added as a component to the line item. + $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); + $price_data = $line_item_wrapper->commerce_unit_price->data->value(); + $this->assertEqual($price_data['components'][1]['price']['amount'], -300, 'Product discount is applied when discount is in time frame.'); + } + + /** + * Test product discount out of timespan. + */ + public function testDiscountDateProductDiscountOutOfTime() { + // Create a discount valid from tomorrow. + $start_time = time() + $this->dayInSeconds; + $end_time = time() + (2 * $this->dayInSeconds); + + $this->createDateDiscount('product_discount', 'fixed_amount', 300, $start_time, $end_time); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + // Invoke line item price re-calculation. + $line_item = $order_wrapper->commerce_line_items->get(0)->value(); + rules_invoke_event('commerce_product_calculate_sell_price', $line_item); + // Check if the discount was added as a component to the line item. + $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); + $price_data = $line_item_wrapper->commerce_unit_price->data->value(); + $this->assertTrue(count($price_data['components']) == 1, 'Product discount is ignored when discount is out of time frame.'); + } + + /** + * Test product discount on the same day. + */ + public function testDiscountSameDay() { + // Create a discount valid for today only. + $start_date = new DateTime(); + $start_date->setTime(0, 0, 0); + $start_time = $start_date->getTimestamp(); + $end_time = $start_time; + + $this->createDateDiscount('product_discount', 'fixed_amount', 300, $start_time, $end_time); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + // Invoke line item price re-calculation. + $line_item = $order_wrapper->commerce_line_items->get(0)->value(); + rules_invoke_event('commerce_product_calculate_sell_price', $line_item); + // Check if the discount was added as a component to the line item. + $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); + $price_data = $line_item_wrapper->commerce_unit_price->data->value(); + $this->assertEqual($price_data['components'][1]['price']['amount'], -300, 'Product discount is applied when discount is in time frame.'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_date_ui.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_date_ui.test new file mode 100644 index 00000000..a3ec38f2 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_date_ui.test @@ -0,0 +1,141 @@ + 'Discounts date UI', + 'description' => 'Test discounts date UI', + 'group' => 'Commerce Discount UI', + ); + } + + /** + * {@inheritdoc} + */ + public function setUp() { + parent::setUp(); + } + + /** + * Test date specific elements in the add discount UI. + */ + public function testDiscountDateUIAddDiscount() { + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount creation page. + $this->drupalGet('admin/commerce/discounts/add'); + + // Check the integrity of the add form. + $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value][date]', NULL, 'Start date field is present'); + $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value2][date]', NULL, 'End date field is present'); + + // Create a discount valid from yesterday until tomorrow. + $start_time = time() - $this->dayInSeconds; + $start_date = date($this->dateFormat, $start_time); + $end_time = time() + $this->dayInSeconds; + $end_date = date($this->dateFormat, $end_time); + + $values = array( + 'label' => 'Order discount - fixed', + 'name' => 'order_discount_fixed', + 'component_title' => 'Order discount', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, + 'commerce_discount_fields[commerce_discount_date][und][0][value][date]' => $start_date, + 'commerce_discount_fields[commerce_discount_date][und][0][value2][date]' => $end_date, + ); + $this->drupalPost(NULL, $values, t('Save discount')); + + // Load the discount and wrap it. + $discount = entity_load_single('commerce_discount', 1); + $wrapper = entity_metadata_wrapper('commerce_discount', $discount); + + // Check the usage fields of the stored discount. + $result_start_date = date($this->dateFormat, $wrapper->commerce_discount_date->value->value()); + $result_end_date = date($this->dateFormat, $wrapper->commerce_discount_date->value2->value()); + $this->assertEqual($result_start_date, $start_date, 'Start date is stored correctly.'); + $this->assertEqual($result_end_date, $end_date, 'End date is stored correctly.'); + + // Check the discounts listing. + $this->assertText($start_date, 'Start date is shown'); + $this->assertText($end_date, 'End date is shown'); + } + + /** + * Test the Edit discount UI. + */ + public function testDiscountDateUIEditDiscount() { + // Create a discount valid from yesterday until tomorrow. + $start_time = time() - $this->dayInSeconds; + $end_time = time() + $this->dayInSeconds; + $discount = $this->createDateDiscount('order_discount', 'fixed_amount', 300, $start_time, $end_time); + + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount edit page. + $this->drupalGet('admin/commerce/discounts/manage/' . $discount->name); + + // Check the integrity of the add form. + $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value][date]', NULL, 'Start date field is present'); + $this->assertFieldByName('commerce_discount_fields[commerce_discount_date][und][0][value2][date]', NULL, 'End date field is present'); + + // Change the discount date, to be valid from tomorrow. + $start_time = time() + $this->dayInSeconds; + $end_time = time() + (2 * $this->dayInSeconds); + $start_date = date($this->dateFormat, $start_time); + $end_date = date($this->dateFormat, $end_time); + + $values = array( + 'label' => 'Order discount - fixed', + 'name' => 'order_discount_fixed', + 'component_title' => 'Order discount', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, + 'commerce_discount_fields[commerce_discount_date][und][0][value][date]' => $start_date, + 'commerce_discount_fields[commerce_discount_date][und][0][value2][date]' => $end_date, + ); + + $this->drupalPost(NULL, $values, t('Save discount')); + + // Load the discount from the database and wrap it. + $discounts = entity_load('commerce_discount', array($discount->discount_id), $conditions = array(), $reset = TRUE); + $wrapper = entity_metadata_wrapper('commerce_discount', reset($discounts)); + + // Check the usage fields of the stored discount. + $result_start_date = date($this->dateFormat, $wrapper->commerce_discount_date->value->value()); + $result_end_date = date($this->dateFormat, $wrapper->commerce_discount_date->value2->value()); + $this->assertEqual($result_start_date, $start_date, 'Start date is stored correctly.'); + $this->assertEqual($result_end_date, $end_date, 'End date is stored correctly.'); + + // Check the discounts listing. + $this->assertText($start_date, 'Start date is shown'); + $this->assertText($end_date, 'End date is shown'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping.test new file mode 100644 index 00000000..1c099015 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping.test @@ -0,0 +1,229 @@ + 'Shipping discounts', + 'description' => 'Test shipping discounts functionality', + 'group' => 'Commerce Discount', + ); + } + + /** + * @inheritdoc + */ + public function setUp() { + parent::setUp(); + module_enable(array('commerce_discount_shipping_test')); + $this->resetAll(); + } + + /** + * Test shipping discounts. + */ + public function testCommerceDiscountShippingDiscounts() { + $shipping_service_name = 'commerce_discount_cheap_shipping'; + $decent_shipping_service_name = 'commerce_discount_decent_shipping'; + $expensive_shipping_service_name = 'commerce_discount_expensive_shipping'; + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'checkout_review', NULL); + + // Check shipping prices shown in checkout. + $this->drupalLogin($this->store_customer); + $this->drupalGet('checkout/' . $order->order_id . '/shipping'); + $this->assertText('Cheap shipping: $5.00', t('Cheap shipping price displayed correctly on checkout without a discount.')); + $this->assertText('Decent shipping: $15.00', t('Decent shipping price displayed correctly on checkout without a discount.')); + $this->assertText('Expensive shipping: $25.00', t('Expensive shipping price displayed correctly on checkout without a discount.')); + $this->assertText('Deluxe shipping: $55.00', t('Deluxe shipping price displayed correctly on checkout without a discount.')); + + // Select cheap shipping. + $edit = array( + 'commerce_shipping[shipping_service]' => $shipping_service_name, + ); + $this->drupalPostAJAX(NULL, $edit, 'commerce_shipping[shipping_service]'); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$5.00', t('Cheap shipping price is correctly displayed on checkout review.')); + $this->assertText('Order total$15.00', t('Undiscounted order total with cheap shipping is correctly displayed on checkout review.')); + + // Create a discount. + $discount = $this->createDiscount('order_discount', 'free_shipping', $shipping_service_name, 'free_shipping', 'Free cheap shipping'); + // Go back to shipping checkout step. + $this->drupalPost(NULL, array(), t('Go back')); + $this->assertText('Cheap shipping: $0.00', t('Cheap shipping price displayed correctly on checkout shipping with a cheap discount.')); + $this->assertText('Decent shipping: $15.00', t('Decent shipping price displayed correctly on checkout shipping with a cheap discount.')); + $this->assertText('Expensive shipping: $25.00', t('Expensive shipping price displayed correctly on checkout shipping with a cheap discount.')); + $this->assertText('Deluxe shipping: $55.00', t('Deluxe shipping price displayed correctly on checkout shipping with a cheap discount.')); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$5.00', t('Cheap shipping price is correctly displayed on checkout review.')); + $this->assertText('Free cheap shipping-$5.00', t('Free cheap shipping discount amount is correctly displayed on checkout review.')); + $this->assertText('Order total$10.00', t('Order total with free cheap shipping discount is correctly displayed on checkout review.')); + + $this->drupalPost(NULL, array(), t('Go back')); + // Select decent shipping. + $edit = array( + 'commerce_shipping[shipping_service]' => $decent_shipping_service_name, + ); + $this->drupalPostAJAX(NULL, $edit, 'commerce_shipping[shipping_service]'); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$15.00', t('Decent shipping price is correctly displayed.')); + $this->assertText('Order total$25.00', t('Undiscounted order total with decent shipping and with unapplied cheap shipping discount is correctly displayed.')); + + // Update discount to have a 'discount_all' strategy. + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + $discount_wrapper->commerce_discount_offer->commerce_free_shipping_strategy = 'discount_all'; + $discount_wrapper->commerce_discount_offer->save(); + + $this->drupalPost(NULL, array(), t('Go back')); + $this->assertText('Cheap shipping: $0.00', t('Cheap shipping price displayed correctly on checkout shipping with a cheap discount with discount_all strategy.')); + $this->assertText('Decent shipping: $10.00', t('Decent shipping price displayed correctly on checkout shipping with a cheap discount with discount_all strategy.')); + $this->assertText('Expensive shipping: $20.00', t('Expensive shipping price displayed correctly on checkout shipping with a cheap discount with discount_all strategy.')); + $this->assertText('Deluxe shipping: $50.00', t('Deluxe shipping price displayed correctly on checkout shipping with a cheap discount with discount_all strategy.')); + + // Select expensive shipping. + $edit = array( + 'commerce_shipping[shipping_service]' => $expensive_shipping_service_name, + ); + $this->drupalPostAJAX(NULL, $edit, 'commerce_shipping[shipping_service]'); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$25.00', t('Expensive shipping price is correctly displayed on checkout review.')); + $this->assertText('Free cheap shipping-$5.00', t('Discount amount on expensive shipping is correctly displayed in case of a discount_all cheap shipping on checkout review.')); + $this->assertText('Order total$30.00', t('Undiscounted order total with decent shipping and with unapplied discounted cheap shipping is correctly displayed on checkout review.')); + + // Remove discount. + entity_delete('commerce_discount', $discount->discount_id); + + // Create discount for the expensive shipping method with 'discount_all' strategy. + $discount = $this->createDiscount('order_discount', 'free_shipping', $expensive_shipping_service_name, 'free_shipping', 'Free expensive shipping'); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + $discount_wrapper->commerce_discount_offer->commerce_free_shipping_strategy = 'discount_all'; + $discount_wrapper->commerce_discount_offer->save(); + + $this->drupalPost(NULL, array(), t('Go back')); + $this->assertText('Cheap shipping: $0.00', t('Cheap shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + $this->assertText('Decent shipping: $0.00', t('Decent shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + $this->assertText('Expensive shipping: $0.00', t('Expensive shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + $this->assertText('Deluxe shipping: $30.00', t('Deluxe shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + + // Select deluxe shipping. + $edit = array( + 'commerce_shipping[shipping_service]' => 'commerce_discount_deluxe_shipping', + ); + $this->drupalPostAJAX(NULL, $edit, 'commerce_shipping[shipping_service]'); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$55.00', t('Deluxe shipping price is correctly displayed on checkout review.')); + $this->assertText('Free expensive shipping-$25.00', t('Discount amount on deluxe shipping is correctly displayed in case of a discount_all expensive shipping on checkout review.')); + $this->assertText('Order total$40.00', t('Order total with deluxe shipping and with discounted expensive shipping discount is correctly displayed on checkout review.')); + + // Remove discount. + entity_delete('commerce_discount', $discount->discount_id); + + // Create a free cheap shipping discount with discount_all strategy. + $discount = $this->createDiscount('order_discount', 'free_shipping', $shipping_service_name, 'free_shipping', 'Free cheap shipping'); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + $discount_wrapper->commerce_discount_offer->commerce_free_shipping_strategy = 'discount_all'; + $discount_wrapper->commerce_discount_offer->save(); + + // Create a 20% percent off shipping discount. + $offer = array( + 'percent' => 20, + 'service' => '', + ); + $percent_discount = $this->createDiscount('order_discount', 'percent_off_shipping', $offer, 'percent_off_shipping', '20% off shipping'); + $percent_discount->sort_order = 9; + entity_save('commerce_discount', $percent_discount); + + $this->drupalPost(NULL, array(), t('Go back')); + $this->assertText('Cheap shipping: $0.00', t('Cheap shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + $this->assertText('Decent shipping: $7.00', t('Decent shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + $this->assertText('Expensive shipping: $15.00', t('Expensive shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + $this->assertText('Deluxe shipping: $39.00', t('Deluxe shipping price displayed correctly on checkout shipping with an expensive discount with discount_all strategy.')); + + // Select deluxe shipping. + $edit = array( + 'commerce_shipping[shipping_service]' => 'commerce_discount_deluxe_shipping', + ); + $this->drupalPostAJAX(NULL, $edit, 'commerce_shipping[shipping_service]'); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$55.00', t('Deluxe shipping price is correctly displayed on checkout review.')); + $this->assertText('Free cheap shipping-$5.00', t('Discount amount on deluxe shipping is correctly displayed in case of a discount_all cheap shipping discount on checkout review.')); + $this->assertText('20% off shipping-$11.00', t('Discount amount on deluxe shipping is correctly displayed in case of an "all" 20% shipping discount on checkout review.')); + $this->assertText('Order total$49.00', t('Order total with deluxe shipping and with a discount_all cheap shipping discount and a 20% "all" shipping discount is correctly displayed on checkout review.')); + + // Remove free shipping discount. + entity_delete('commerce_discount', $discount->discount_id); + + // Create shipping upgrade discount. + $offer = array( + 'source' => $shipping_service_name, + 'target' => $expensive_shipping_service_name, + ); + $this->createDiscount('order_discount', 'shipping_upgrade', $offer, 'shipping_upgrade', 'Shipping upgrade', 11); + + $this->drupalPost(NULL, array(), t('Go back')); + $this->assertText('Cheap shipping: $4.00', t('Cheap shipping price displayed correctly on checkout shipping with a 20% "all" shipping discount and a cheap->expensive upgrade discount.')); + $this->assertText('Decent shipping: $12.00', t('Decent shipping price displayed correctly on checkout shipping with a 20% "all" shipping discount and a cheap->expensive upgrade discount.')); + $this->assertText('Expensive shipping: $4.00', t('Expensive shipping price displayed correctly on checkout shipping with a 20% "all" shipping discount and a cheap->expensive upgrade discount.')); + $this->assertText('Deluxe shipping: $44.00', t('Deluxe shipping price displayed correctly on checkout shipping with a 20% "all" shipping discount and a cheap->expensive upgrade discount.')); + + // Select expensive shipping. + $edit = array( + 'commerce_shipping[shipping_service]' => $expensive_shipping_service_name, + ); + $this->drupalPostAJAX(NULL, $edit, 'commerce_shipping[shipping_service]'); + // Go to next checkout step. + $this->drupalPost(NULL, $edit, t('Continue to next step')); + $this->assertText('Shipping$25.00', t('Expensive shipping price is correctly displayed on checkout review with a 20% "all" shipping discount and a cheap->expensive upgrade discount.')); + $this->assertText('Shipping upgrade-$16.00', t('Discount amount on expensive shipping is correctly displayed in case of cheap->expensive upgrade discount on checkout review.')); + $this->assertText('20% off shipping-$5.00', t('20% off discount amount on expensive shipping is correctly displayed on checkout review.')); + $this->assertText('Order total$14.00', t('Order total with deluxe shipping and with a 20% "all" shipping discount and a cheap->expensive upgrade discount is correctly displayed on checkout review.')); + } + + /** + * Test a free shipping discount combined with a fixed amount discount. + */ + public function testCommerceDiscountShippingAndFixedAmount() { + $shipping_service_name = 'commerce_discount_cheap_shipping'; + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed', NULL); + module_load_include('inc', 'commerce_shipping', 'commerce_shipping.rules'); + commerce_shipping_rate_apply($order, $shipping_service_name); + commerce_order_save($order); + unset($order->shipping_rates); + $free_shipping_discount = $this->createDiscount('order_discount', 'free_shipping', $shipping_service_name, 'free_shipping', 'Free cheap shipping', 1); + $this->createDiscount('order_discount', 'fixed_amount', 1500, 'of1'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Order total before discount is 1000, assert that applying both a shipping + // discount and a fixed amount discount isn't causing the order total to + // be negative (make sure order total is properly recalculated after the + // free shipping discount is applied). + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 0, 'Order total is correct when the free shipping discount has a lower weight than the fixed amount.'); + + // Update the free shipping discount weight to make sure the order total + // is correct when the shipping discount is evaluated after the fixed amount + // discount. + $free_shipping_discount->sort_order = 20; + $free_shipping_discount->save(); + $order_wrapper = commerce_cart_order_refresh($order); + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 0, 'Order total is correct when the free shipping discount has a higher weight than the fixed amount.'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping_test/commerce_discount_shipping_test.info b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping_test/commerce_discount_shipping_test.info new file mode 100644 index 00000000..74eda69d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping_test/commerce_discount_shipping_test.info @@ -0,0 +1,13 @@ +name = Commerce discount test shipping method +description = Provides shipping methods for commerce discount tests. +package = Commerce (shipping) +dependencies[] = commerce +dependencies[] = commerce_shipping +core = 7.x + +; Information added by Drupal.org packaging script on 2017-12-19 +version = "7.x-1.0-beta5" +core = "7.x" +project = "commerce_discount" +datestamp = "1513724288" + diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping_test/commerce_discount_shipping_test.module b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping_test/commerce_discount_shipping_test.module new file mode 100644 index 00000000..db34ecb9 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_shipping_test/commerce_discount_shipping_test.module @@ -0,0 +1,110 @@ + t('Discount test shipping method'), + 'description' => t('Defines 3 shipping services.'), + ); + + $shipping_methods['commerce_discount_test_other_method'] = array( + 'title' => t('Discount test other shipping method'), + 'description' => t('Defines a shipping service.'), + ); + + return $shipping_methods; +} + +/** + * Implements hook_commerce_shipping_service_info(). + */ +function commerce_discount_shipping_test_commerce_shipping_service_info() { + $shipping_services = array(); + + $shipping_services['commerce_discount_cheap_shipping'] = array( + 'title' => t('Cheap shipping service'), + 'description' => t('A cheap flat rate service.'), + 'display_title' => t('Cheap shipping'), + 'shipping_method' => 'commerce_discount_test_shipping_method', + 'price_component' => 'shipping', + 'callbacks' => array( + 'rate' => 'commerce_discount_test_shipping_service_rate', + ), + ); + + $shipping_services['commerce_discount_decent_shipping'] = array( + 'title' => t('Decent shipping service'), + 'description' => t('A decent flat rate service.'), + 'display_title' => t('Decent shipping'), + 'shipping_method' => 'commerce_discount_test_shipping_method', + 'price_component' => 'shipping', + 'callbacks' => array( + 'rate' => 'commerce_discount_test_shipping_service_rate', + ), + ); + + $shipping_services['commerce_discount_expensive_shipping'] = array( + 'title' => t('Expensive shipping service'), + 'description' => t('An expensive flat rate service.'), + 'display_title' => t('Expensive shipping'), + 'shipping_method' => 'commerce_discount_test_shipping_method', + 'price_component' => 'shipping', + 'callbacks' => array( + 'rate' => 'commerce_discount_test_shipping_service_rate', + ), + ); + + $shipping_services['commerce_discount_deluxe_shipping'] = array( + 'title' => t('Deluxe shipping service'), + 'description' => t('A deluxe flat rate service.'), + 'display_title' => t('Deluxe shipping'), + 'shipping_method' => 'commerce_discount_test_other_method', + 'price_component' => 'shipping', + 'callbacks' => array( + 'rate' => 'commerce_discount_test_shipping_service_rate', + ), + ); + + return $shipping_services; +} + +/** + * Shipping service callback. + * + * Returns a base price array for a shipping service + * calculated for the given order. + */ +function commerce_discount_test_shipping_service_rate($shipping_service, $order) { + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + switch ($shipping_service['name']) { + case 'commerce_discount_cheap_shipping': + $amount = 500; + break; + + case 'commerce_discount_decent_shipping': + $amount = 1500; + break; + + case 'commerce_discount_expensive_shipping': + $amount = 2500; + break; + + case 'commerce_discount_deluxe_shipping': + $amount = 5500; + break; + } + return array( + 'amount' => $amount, + 'currency_code' => $order_wrapper->commerce_order_total->currency_code->value(), + 'data' => array(), + ); +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_ui.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_ui.test new file mode 100644 index 00000000..dc436847 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_ui.test @@ -0,0 +1,272 @@ + 'Discounts', + 'description' => 'Test discounts UI and functionality', + 'group' => 'Commerce Discount UI', + ); + } + + /** + * Test the importing of commerce discounts. + */ + public function testCommerceDiscountImportUI() { + // Login store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount creation page. + $this->drupalGet('admin/commerce/discounts/import'); + $this->assertResponse(200, 'Store admin is allowed in the discounts import page'); + } + + /** + * Access to commerce discounts admin. + */ + public function testCommerceDiscountUIAccessDiscountsListing() { + // Login with customer. + $this->drupalLogin($this->store_customer); + // Check the access to the profiles listing. + $this->drupalGet('admin/commerce/discounts'); + $this->assertResponse(403, 'The store customer has no access to discounts administration.'); + + // Login with store admin. + $this->drupalLogin($this->store_admin); + // Check the access to the profiles listing. + $this->drupalGet('admin/commerce/discounts'); + $this->assertResponse(200, 'The store admin has access to discounts administration.'); + + // Check the message of no discounts available. + $this->assertText(t('No discounts found.'), "'No discounts found.' message is displayed"); + // Check the add customer profile link. + $this->assertRaw(l(t('Add discount'), 'admin/commerce/discounts/add'), "'Add discount' link is present in the page"); + } + + /** + * Test the add discount UI. + */ + public function testCommerceDiscountUIAddDiscount() { + // Login with normal user. + $this->drupalLogin($this->store_customer); + + // Access to the admin discount creation page. + $this->drupalGet('admin/commerce/discounts/add'); + + $this->assertResponse(403, 'Normal user is not able to add a discount using the admin interface'); + + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount creation page. + $this->drupalGet('admin/commerce/discounts/add'); + + $this->assertResponse(200, 'Store admin user is allowed to add a discount using the admin interface'); + + // Check the integrity of the add form. + $this->assertFieldByName('commerce_discount_type', NULL, 'Discount type field is present'); + $this->assertFieldByName('label', NULL, 'Label field is present'); + $this->assertFieldByName('component_title', NULL, 'Name field is present'); + $this->assertFieldByName('commerce_discount_fields[commerce_discount_offer][und][form][type]', NULL, 'Offer type field is present'); + $this->assertFieldByName('commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]', NULL, 'Amount field is present'); + $this->assertFieldByName('status', NULL, 'Status field is present'); + $this->assertFieldById('edit-submit', t('Save discount'), 'Save discount button is present'); + + // Try to save the product and check validation messages. + $this->drupalPost(NULL, array(), t('Save discount')); + + $this->assertText(t('Admin title field is required.'), 'Validation message for missing label.'); + $this->assertText(t('Machine-readable name field is required.'), 'Validation message for missing machine-name.'); + $this->assertText(t('Fixed amount field is required.'), 'Validation message for missing amount.'); + + // Load a clean discount add form. + $this->drupalGet('admin/commerce/discounts/add'); + // Create a discount. + $values = array( + 'label' => 'Order discount - fixed', + 'name' => 'order_discount_fixed', + 'component_title' => 'Order discount', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, + ); + $this->drupalPost(NULL, $values, t('Save discount')); + + // Load the discount and wrap it. + $discount = entity_load_single('commerce_discount', 1); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + + // Check the stored discount. + $this->assertEqual($discount->label, $values['label'], 'Label stored correctly.'); + $this->assertEqual($discount->name, 'discount_' . $values['name'], 'Name stored correctly.'); + $this->assertEqual($discount->export_status, 1, 'Active stored correctly.'); + $this->assertEqual($discount->component_title, $values['component_title'], 'Name for customer stored correctly.'); + $this->assertEqual($discount->status, 1, 'Enabled stored correctly.'); + + $this->assertEqual($discount_wrapper->commerce_discount_offer->getBundle(), 'fixed_amount', 'Offer type stored correctly.'); + $this->assertEqual($discount_wrapper->commerce_discount_offer->commerce_fixed_amount->amount->value(), 1277, 'Amount stored correctly.'); + + // Check the discounts listing. + $this->assertUrl('admin/commerce/discounts', array('query' => array('type' => 'order_discount')), 'Landing page after save is the order discounts list.'); + $this->assertText($values['label'], 'Label of the discount is present.'); + } + + /** + * Test the Edit discount UI. + */ + public function testCommerceDiscountUIEditDiscount() { + // Create a discount. + $discount = $this->createDiscount('order_discount', 'fixed_amount', 300); + + // Login with normal user. + $this->drupalLogin($this->store_customer); + + // Access to the admin discount edit page. + $this->drupalGet('admin/commerce/discounts/manage/' . $discount->name); + $this->assertResponse(403, 'Normal user is not able to edit a discount using the admin interface'); + + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount edit page. + $this->drupalGet('admin/commerce/discounts/manage/' . $discount->name); + $this->assertResponse(200, 'Store admin user is allowed to edit a discount using the admin interface'); + + // Check the integrity of the add form. + $this->assertFieldByName('commerce_discount_type', NULL, 'Discount type field is present'); + $this->assertFieldByName('label', NULL, 'Label field is present'); + $this->assertFieldByName('component_title', NULL, 'Name field is present'); + $this->assertFieldByName('commerce_discount_fields[commerce_discount_offer][und][form][type]', NULL, 'Offer type field is present'); + $this->assertFieldByName('commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]', NULL, 'Amount field is present'); + $this->assertFieldByName('status', NULL, 'Status field is present'); + $this->assertFieldById('edit-submit', t('Save discount'), 'Save discount button is present'); + $this->assertFieldById('edit-delete', t('Delete discount'), 'Delete discount button is present'); + + // Empty values for validation assertions. + $values = array( + 'label' => '', + 'name' => '', + 'component_title' => '', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => '', + ); + + // Try to save the product and check validation messages. + $this->drupalPost(NULL, $values, t('Save discount')); + + $this->assertText(t('Admin title field is required.'), 'Validation message for missing label.'); + $this->assertText(t('Machine-readable name field is required.'), 'Validation message for missing machine-name.'); + $this->assertText(t('Fixed amount field is required.'), 'Validation message for missing amount.'); + + // Discount new values. + $values = array( + 'label' => 'Order discount - fixed', + 'name' => 'order_discount_fixed', + 'component_title' => 'Order discount', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, + ); + $this->drupalPost(NULL, $values, t('Save discount')); + + // Load the discount and wrap it. + $discounts = entity_load('commerce_discount', array($discount->discount_id), $conditions = array(), $reset = TRUE); + $discount = reset($discounts); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + + // Check the stored discount. + $this->assertEqual($discount->label, $values['label'], 'Label stored correctly.'); + $this->assertEqual($discount->name, 'discount_' . $values['name'], 'Name stored correctly.'); + $this->assertEqual($discount->component_title, $values['component_title'], 'Name for customer stored correctly.'); + $this->assertEqual($discount->status, 1, 'Enabled stored correctly.'); + + $this->assertEqual($discount_wrapper->commerce_discount_offer->getBundle(), 'fixed_amount', 'Offer type stored correctly.'); + $this->assertEqual($discount_wrapper->commerce_discount_offer->commerce_fixed_amount->amount->value(), 1277, 'Amount stored correctly.'); + + // Check the discounts listing. + $this->assertUrl('admin/commerce/discounts', array('query' => array('type' => 'order_discount')), 'Landing page after save is the order discounts list.'); + $this->assertText($values['label'], 'Label of the discount is present.'); + } + + /** + * Test the delete discount UI. + */ + public function testCommerceDiscountUIDeleteDiscount() { + // Create a discount. + $discount = $this->createDiscount('order_discount', 'fixed_amount', 300); + + // Login with normal user. + $this->drupalLogin($this->store_customer); + + // Access to the admin discount edit page. + $this->drupalGet('admin/commerce/discounts/manage/' . $discount->name . '/delete'); + + $this->assertResponse(403, 'Normal user is not able to delete a discount using the admin interface'); + + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount edit page. + $this->drupalGet('admin/commerce/discounts/manage/' . $discount->name . '/delete'); + + $this->assertResponse(200, 'Store admin user is allowed to delete a discount using the admin interface'); + + // Check the integrity of the add form. + $this->pass('Test the discount delete confirmation form:'); + $this->assertTitle(t('Are you sure you want to delete the Commerce Discount !label?', array('!label' => $discount->label)) . ' | Drupal', 'The confirmation message is displayed'); + $this->assertText(t('This action cannot be undone'), "A warning notifying the user about the action can't be undone is displayed."); + $this->assertFieldById('edit-submit', t('Confirm'), 'Delete button is present'); + $this->assertText(t('Cancel'), 'Cancel is present'); + + // Try to save the product and check validation messages. + $this->drupalPost(NULL, array(), t('Confirm')); + + // Check the url after deleting and if the discount has been deleted in + // database. + $this->assertUrl('admin/commerce/discounts', array(), 'Landing page after deleting a discount is the discounts listing page'); + $this->assertRaw(t('Deleted %type %label.', array('%type' => 'Commerce Discount', '%label' => $discount->label)), "'Discount has been deleted' message is displayed"); + $this->assertRaw(t('No discounts found.', array('@link' => url('admin/commerce/discounts/add'))), 'Empty discount listing message is displayed'); + } + + /** + * Test disabled line item types. + */ + public function testCommerceDiscountUIDisabledLineItemTypes() { + // Create the 30% discount and $1 product. + $this->createDiscount('product_discount', 'percentage', 30, 'discount_30_off'); + $product = $this->createDummyProduct('TEST-PRODUCT', 'Test Product', 100); + + // Create the order and apply discount. + $order = $this->createDummyOrder($this->store_customer->uid, array($product->product_id => 1)); + $order_wrapper = commerce_cart_order_refresh($order); + commerce_order_calculate_total($order); + + // Ensure discount applied. + $line_item_wrapper = $order_wrapper->commerce_line_items->get(0); + $unit_price = $line_item_wrapper->commerce_unit_price->value(); + $this->assertEqual($unit_price['amount'], 70, 'Product line item unit price amount rounded properly for a 30% discount.'); + + // Login with store admin and turn off all line item types. + $this->drupalLogin($this->store_admin); + $this->drupalGet('admin/commerce/discounts/settings'); + $values = array( + 'commerce_discount_line_item_types[product_discount]' => FALSE, + 'commerce_discount_line_item_types[product]' => FALSE, + ); + $this->drupalPost(NULL, $values, t('Save configuration')); + + // Refresh the order and ensure the discount is no longer applicable. + $order_wrapper = commerce_cart_order_refresh($order); + $line_item_wrapper = $order_wrapper->commerce_line_items->get(0); + $unit_price = $line_item_wrapper->commerce_unit_price->value(); + $this->assertEqual($unit_price['amount'], 100, 'Product line item unit price is the original amount'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_usage.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_usage.test new file mode 100644 index 00000000..77ea6a03 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_usage.test @@ -0,0 +1,128 @@ + 'Discounts usage', + 'description' => 'Test discounts usage functionality', + 'group' => 'Commerce Discount', + ); + } + + /** + * {@inheritdoc} + */ + public function setUp() { + parent::setUp(); + $this->store_customer2 = $this->createStoreCustomer(); + } + + /** + * Test fixed order discounts. + */ + public function testCommerceDiscountUsageFixedOrderDiscount() { + // Testing fixed discount. + // Create a fixed order discount of $3 limited to one use. + $this->createUsageDiscount('order_discount', 'fixed_amount', 300, 1); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 700, 'Fixed order discount is deducted correctly on the first use.'); + + // Create another order to make sure the discount isn't applied again. + $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 1000, 'Fixed order discount is ignored after maximal usage.'); + } + + /** + * Test percentage order discounts. + */ + public function testCommerceDiscountUsagePercentageOrderDiscount() { + // Testing percentage discount. + // Create a percentage order discount of 5% limited to one use. + $this->createUsageDiscount('order_discount', 'percentage', 5, 1); + + // Create a completed order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 950, 'Percentage order discount is deducted correctly.'); + + // Create another order to make sure the discount isn't applied again. + $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was applied on the order total price. + $this->assertTrue($order_wrapper->commerce_order_total->amount->value() == 1000, 'Percentage order discount is ignored after maximal usage.'); + } + + /** + * Test fixed product discounts. + */ + public function testCommerceDiscountUsageFixedProductDiscount() { + $this->createUsageDiscount('product_discount', 'fixed_amount', 300, 1); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was added as a component to the line item. + $price = commerce_price_wrapper_value($order_wrapper->commerce_line_items->get(0), 'commerce_unit_price'); + $this->assertTrue($price['data']['components'][1]['price']['amount'] == -300, 'Fixed product discount is added as a price component to the line item.'); + commerce_order_save($order); + + // Create another order to make sure the discount isn't applied again. + $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was added as a component to the line item. + $price = commerce_price_wrapper_value($order_wrapper->commerce_line_items->get(0), 'commerce_unit_price'); + $this->assertTrue(count($price['data']['components']) === 1, 'Fixed product discount is ignored after maximal usage.'); + } + + /** + * Test percentage product discounts. + */ + public function testCommerceDiscountUsagePercentageProductDiscount() { + $this->createUsageDiscount('product_discount', 'percentage', 5, 1); + + // Create an order. + $order = $this->createDummyOrder($this->store_customer->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was added as a component to the line item. + $price = commerce_price_wrapper_value($order_wrapper->commerce_line_items->get(0), 'commerce_unit_price'); + $this->assertEqual($price['data']['components'][1]['price']['amount'], -50, 'Percentage product discount is added as a price component to the line item.'); + commerce_order_save($order); + + // Create another order to make sure the discount isn't applied again. + $order = $this->createDummyOrder($this->store_customer2->uid, array($this->product->product_id => 1), 'completed'); + // Recalculate discounts. + $order_wrapper = commerce_cart_order_refresh($order); + // Check if the discount was added as a component to the line item. + $price = commerce_price_wrapper_value($order_wrapper->commerce_line_items->get(0), 'commerce_unit_price'); + $this->assertTrue(count($price['data']['components']) === 1, 'Percentage product discount is ignored after maximal usage.'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_usage_ui.test b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_usage_ui.test new file mode 100644 index 00000000..f89db85b --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_discount/tests/commerce_discount_usage_ui.test @@ -0,0 +1,109 @@ + 'Discounts usage', + 'description' => 'Test discounts usage UI', + 'group' => 'Commerce Discount UI', + ); + } + + /** + * {@inheritdoc} + */ + public function setUp() { + parent::setUp(); + } + + /** + * Test usage specific elements in the add discount UI. + */ + public function testCommerceDiscountUsageUIAddDiscount() { + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount creation page. + $this->drupalGet('admin/commerce/discounts/add'); + + // Check the integrity of the add form. + $this->assertFieldByName('commerce_discount_fields[discount_usage_per_person][und][0][value]', NULL, 'Maximum usage per customer field is present'); + $this->assertFieldByName('commerce_discount_fields[discount_usage_limit][und][0][value]', NULL, 'Maximum overall usage field is present'); + + // Create a discount. + $values = array( + 'label' => 'Order discount - fixed', + 'name' => 'order_discount_fixed', + 'component_title' => 'Order discount', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, + 'commerce_discount_fields[discount_usage_limit][und][0][value]' => 5, + ); + $this->drupalPost(NULL, $values, t('Save discount')); + + // Load the discount and wrap it. + $discount = entity_load_single('commerce_discount', 1); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', $discount); + + // Check the usage fields of the stored discount. + $this->assertTrue($discount_wrapper->discount_usage_per_person->value() == 0, 'Discount uses field is empty.'); + $this->assertTrue($discount_wrapper->discount_usage_limit->value() == 5, 'Discount max uses stored correctly.'); + + // Check the discounts listing. + $this->assertText(t('@amount available', array('@amount' => 5)), 'Analytics - Max usage is shown.'); + $this->assertText(t('Used @amount times', array('@amount' => 0)), 'Analytics - Usage is shown.'); + } + + /** + * Test usage specific elements in the edit discount UI. + */ + public function testCommerceDiscountUsageUIEditDiscount() { + // Testing fixed discount. + // Create a fixed order discount of $3 limited to one use. + $discount = $this->createUsageDiscount('order_discount', 'fixed_amount', 300, 1); + + // Login with store admin. + $this->drupalLogin($this->store_admin); + + // Access to the admin discount edit page. + $this->drupalGet('admin/commerce/discounts/manage/' . $discount->name); + + // Check the integrity of the add form. + $this->assertFieldByName('commerce_discount_fields[discount_usage_per_person][und][0][value]', NULL, 'Maximum usage per customer field is present'); + $this->assertFieldByName('commerce_discount_fields[discount_usage_limit][und][0][value]', NULL, 'Maximum overall usage field is present'); + + // Change the discount values. + $values = array( + 'label' => 'Order discount - fixed', + 'name' => 'order_discount_fixed', + 'component_title' => 'Order discount', + 'commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]' => 12.77, + 'commerce_discount_fields[discount_usage_limit][und][0][value]' => 5, + ); + $this->drupalPost(NULL, $values, t('Save discount')); + + // Load the discount from the database and wrap it. + $discounts = entity_load('commerce_discount', array($discount->discount_id), $conditions = array(), $reset = TRUE); + $discount_wrapper = entity_metadata_wrapper('commerce_discount', reset($discounts)); + + // Check the usage fields of the stored discount. + $this->assertEqual($discount_wrapper->discount_usage_per_person->value(), 0, 'Discount uses field is empty.'); + $this->assertEqual($discount_wrapper->discount_usage_limit->value(), 5, 'Discount max uses stored correctly.'); + + // Check the discounts listing. + $this->assertText(t('@amount available', array('@amount' => 5)), 'Analytics - Max usage is shown.'); + $this->assertText(t('Used @amount times', array('@amount' => 0)), 'Analytics - Usage is shown.'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_extra_price_formatters/commerce_extra_price_formatters.info b/profiles/commerce_kickstart/modules/contrib/commerce_extra_price_formatters/commerce_extra_price_formatters.info index 6ec0b566..4d173c0a 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_extra_price_formatters/commerce_extra_price_formatters.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_extra_price_formatters/commerce_extra_price_formatters.info @@ -5,10 +5,7 @@ dependencies[] = commerce dependencies[] = commerce_price package = Commerce (contrib) - -; Information added by drush on 2015-08-20 +; Information added by drush on 2013-01-04 version = "7.x-1.1+7-dev" -core = "7.x" project = "commerce_extra_price_formatters" -datestamp = "1440110607" - +datestamp = "1357314508" \ No newline at end of file diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_checkout_panes.features.inc b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_checkout_panes.features.inc new file mode 100644 index 00000000..378f5b81 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_checkout_panes.features.inc @@ -0,0 +1,103 @@ + $pane) { + $options[$pane_id] = sprintf('%s (%s)', $pane['title'], $pane['name']); + } + + return $options; +} + +/** + * Implements hook_features_export(). + */ +function commerce_checkout_panes_features_export(array $data, array &$export, $module) { + $panes = commerce_checkout_panes(); + + foreach ($data as $pane_id) { + $export['features'][COMMERCE_CHECKOUT_PANES_INTEGRATION_NAME][$pane_id] = $pane_id; + $export['dependencies'][] = $panes[$pane_id]['module']; + } + + $export['dependencies'][] = 'commerce_checkout'; + + return array(); +} + +/** + * Implements hook_features_export_render(). + */ +function commerce_checkout_panes_features_export_render($module, array $data, $export = NULL) { + // Need to reset static cache, otherwise Features will not be able to check + // a state of components properly. + commerce_checkout_panes_reset(); + + $schema = drupal_get_schema('commerce_checkout_pane'); + $fields = array_fill_keys(array_keys($schema['fields']), NULL); + $panes = commerce_checkout_panes(); + $code = array(); + + $code[] = ' $panes = array();'; + + foreach ($data as $pane_id) { + if (isset($panes[$pane_id])) { + $code[] = ''; + $code[] = sprintf(' $panes[%s] = %s;', "'$pane_id'", features_var_export(array_intersect_key($panes[$pane_id], $fields), ' ')); + } + } + + $code[] = ''; + $code[] = ' return $panes;'; + + return array(COMMERCE_CHECKOUT_PANES_DEFAULT_HOOK => implode("\n", $code)); +} + +/** + * Implements hook_features_revert(). + */ +function commerce_checkout_panes_features_revert($module) { + $defaults = module_invoke($module, COMMERCE_CHECKOUT_PANES_DEFAULT_HOOK); + + if (!empty($defaults)) { + commerce_checkout_panes_reset(); + $existing = commerce_checkout_panes(); + + foreach ($defaults as $pane_id => $pane) { + $pane['saved'] = isset($existing[$pane_id]['saved']) ? $existing[$pane_id]['saved'] : FALSE; + + commerce_checkout_pane_save($pane); + } + } +} + +/** + * Implements hook_features_rebuild(). + */ +function commerce_checkout_panes_features_rebuild($module) { + commerce_checkout_panes_features_revert($module); +} + +/** + * Implements hook_features_disable_feature(). + */ +function commerce_checkout_panes_features_disable_feature($module) { + $defaults = module_invoke($module, COMMERCE_CHECKOUT_PANES_DEFAULT_HOOK); + + if (!empty($defaults)) { + foreach ($defaults as $pane_id => $pane) { + commerce_checkout_pane_reset($pane_id); + } + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_customer.features.inc b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_customer.features.inc index 1b538c9c..34354bda 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_customer.features.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_customer.features.inc @@ -20,7 +20,7 @@ function commerce_customer_features_export($data, &$export, $module_name = '') { foreach ($data as $type) { // Add module dependencies. $export['dependencies'][$info[$type]['module']] = $info[$type]['module']; - $export['features']['commerce_customer_type'][$type] = $type; + $export['features']['commerce_customer'][$type] = $type; // Fetch fields of the profile type and add them as dependency. $fields = field_info_instances('commerce_customer_profile', $type); @@ -50,7 +50,22 @@ function commerce_customer_features_export_options() { */ function commerce_customer_features_export_render($module, $data) { // Return nothing, since the appropriate code has to exist already. - return array(); + $info = commerce_customer_profile_types(); + $output = array(); + $output[] = ' $items = array('; + foreach ($data as $type) { + if (isset($info[$type]) && $item = $info[$type]) { + $output[] = " '{$type}' => array("; + foreach ($item as $key => $value) { + $output[] = " '{$key}' => " . features_var_export($value, ' ') . ","; + } + $output[] = " ),"; + } + } + $output[] = ' );'; + $output[] = ' return $items;'; + $output = implode("\n", $output); + return array('commerce_customer_profile_type_info' => $output); } /** diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.info b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.info index 7ed7ab33..9d94a9d1 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.info @@ -5,9 +5,9 @@ core = 7.x dependencies[] = features dependencies[] = commerce -; Information added by Drupal.org packaging script on 2015-07-21 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-11-13 +version = "7.x-1.3" core = "7.x" project = "commerce_features" -datestamp = "1437515562" +datestamp = "1510599186" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.module b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.module index a5addadf..f6635069 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_features.module @@ -10,43 +10,34 @@ */ function commerce_features_features_api() { $features = array(); + $path = drupal_get_path('module', 'commerce_features'); if (module_exists('commerce_product') && module_exists('commerce_product_ui')) { $features['commerce_product_type'] = array( 'name' => t('Commerce product types'), - 'feature_source' => TRUE, 'default_hook' => 'commerce_product_default_types', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_product_type.features.inc', ); } if (module_exists('commerce_tax')) { $features['commerce_tax_type'] = array( 'name' => t('Commerce tax types'), - 'feature_source' => TRUE, 'default_hook' => 'commerce_tax_default_types', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_tax_type.features.inc', ); $features['commerce_tax_rate'] = array( 'name' => t('Commerce tax rates'), - 'feature_source' => TRUE, 'default_hook' => 'commerce_tax_default_rates', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_tax_rate.features.inc', ); } if (module_exists('commerce_order') && module_exists('commerce_order_types')) { $features['commerce_order_type'] = array( 'name' => t('Commerce order types'), - 'features_source' => TRUE, 'default_hook' => 'commerce_order_default_types', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_order_type.features.inc', ); } if (module_exists('commerce_line_item') && module_exists('commerce_custom_product')) { $features['commerce_line_item_type'] = array( 'name' => t('Commerce line item types'), - 'feature_source' => TRUE, 'default_hook' => 'commerce_line_item_default_types', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_line_item_type.features.inc', ); } if (module_exists('commerce_coupon')) { @@ -54,26 +45,50 @@ function commerce_features_features_api() { if (version_compare($module_info['version'], '7.x-2', '<')) { $features['commerce_coupon_type'] = array( 'name' => t('Commerce coupon types'), - 'feature_source' => TRUE, 'default_hook' => 'commerce_coupon_default_types', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_coupon_type.features.inc', ); } } if (module_exists('commerce_customer')) { $features['commerce_customer'] = array( 'name' => t('Commerce customer profile types'), - 'features_source' => TRUE, 'default_hook' => 'commerce_customer_default_types', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_customer.features.inc', ); } if (module_exists('commerce_flat_rate')) { $features['commerce_flat_rate_services'] = array( 'name' => t('Commerce flat rate services'), - 'features_source' => TRUE, 'default_hook' => 'commerce_flat_rate_default_services', - 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_flat_rate_services.features.inc', + ); + } + if (module_exists('commerce_checkout')) { + $features['commerce_checkout_panes'] = array( + 'name' => t('Commerce checkout panes'), + 'default_hook' => 'commerce_checkout_panes_default', + 'default_file' => FEATURES_DEFAULTS_INCLUDED, + ); + } + + foreach ($features as $name => $integration) { + $features[$name] = $integration + array( + 'file' => "$path/$name.features.inc", + 'feature_source' => TRUE, + ); + } + if (module_exists('commerce_payment')) { + $features['commerce_payment_method'] = array( + 'name' => t('Commerce payment methods'), + 'feature_source' => TRUE, + 'default_hook' => 'commerce_payment_default_methods', + 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_payment_method.features.inc', + ); + } + if (module_exists('commerce_fees')) { + $features['commerce_fees_type'] = array( + 'name' => t('Commerce fees types'), + 'feature_source' => TRUE, + 'default_hook' => 'commerce_fees_default_types', + 'file' => drupal_get_path('module', 'commerce_features') . '/commerce_fees.features.inc', ); } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_fees.features.inc b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_fees.features.inc new file mode 100644 index 00000000..9391d3e3 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_fees.features.inc @@ -0,0 +1,97 @@ + $type) { + $feature_types[$key] = $type['display_title']; + } + } + return $feature_types; +} + +/** + * Implements hook_features_export_render(). + */ +function commerce_fees_type_features_export_render($module, $data, $export = NULL) { + $info = commerce_fees_types(); + $output = array(); + $output[] = ' $items = array('; + foreach ($data as $type) { + if (isset($info[$type]) && $fees_type = $info[$type]) { + $output[] = " '{$type}' => " . features_var_export($fees_type, ' ') . ","; + } + } + $output[] = ' );'; + $output[] = ' return $items;'; + $output = implode("\n", $output); + return array('commerce_fees_default_types' => $output); +} + +/** + * Implements hook_features_revert(). + */ +function commerce_fees_type_features_revert($module = NULL) { + // Get default fees types + if (module_hook($module, 'commerce_fees_default_types')) { + $default_types = module_invoke($module, 'commerce_fees_default_types'); + // Read the fees types from the database instead of calling all + $existing_types = commerce_fees_types(); + foreach ($default_types as $key => $type) { + // Add or update. + if (!isset($existing_types[$key])) { + $type['is_new'] = TRUE; + } + commerce_fees_save($type, TRUE, TRUE); + } + } + else { + drupal_set_message(t('Could not load default fees types.'), 'error'); + return FALSE; + } + + // Reset the static cache. + commerce_fees_reset(); + // Schedule a menu rebuild. + variable_set('menu_rebuild_needed', TRUE); + + return TRUE; +} + +/** + * Implements hook_features_rebuild(). + */ +function commerce_fees_type_features_rebuild($module) { + return commerce_fees_type_features_revert($module); +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_payment_method.features.inc b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_payment_method.features.inc new file mode 100644 index 00000000..ac4cc198 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_features/commerce_payment_method.features.inc @@ -0,0 +1,38 @@ + 1, CURLOPT_POSTFIELDS => $request_content, CURLOPT_RETURNTRANSFER => 1, - CURLOPT_SSL_VERIFYPEER => 0, + CURLOPT_SSL_VERIFYPEER => 1, CURLOPT_NOPROGRESS => 1, CURLOPT_FOLLOWLOCATION => 0, CURLOPT_FRESH_CONNECT => 1, @@ -583,6 +583,19 @@ public function request(&$request_state) { CURLOPT_HTTPHEADER => array_values($request_headers), ); + // Commerce First Data GGE4 requires SSL peer verification, which may prevent + // out of date servers from successfully processing API requests. If you get + // an error related to peer verification, you may need to download the CA + // certificate bundle file from http://curl.haxx.se/docs/caextract.html, + // place it in a safe location on your web server, and update your + // settings.php to set the commerce_firstdata_gge4_cacert variable to contain + // the absolute path of the file. + // Alternately, you may be able to update your php.ini to point to the file + // with the curl.cainfo setting. + if ($cert_path = variable_get('commerce_firstdata_gge4_cacert', FALSE)) { + $curl_options[CURLOPT_CAINFO] = $cert_path; + } + $ch = curl_init(); curl_setopt_array($ch, $curl_options); $raw_response = curl_exec($ch); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/commerce_message/LICENSE.txt old mode 100755 new mode 100644 diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.info b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.info index 1f252e36..e5aac410 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.info @@ -12,10 +12,11 @@ dependencies[] = message dependencies[] = message_notify files[] = includes/views/handlers/commerce_message_handler_area_add_message.inc +files[] = commerce_message.test -; Information added by Drupal.org packaging script on 2014-06-11 -version = "7.x-1.0-rc3" +; Information added by Drupal.org packaging script on 2017-06-26 +version = "7.x-1.0" core = "7.x" project = "commerce_message" -datestamp = "1402495128" +datestamp = "1498488844" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.module b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.module index 892bbb5e..0b3a5ff1 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.module @@ -25,6 +25,7 @@ function commerce_message_menu() { 'access callback' => 'commerce_order_access', 'access arguments' => array('view', 3), 'type' => MENU_LOCAL_TASK, + 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, 'weight' => 11, ); @@ -56,8 +57,10 @@ function commerce_message_module_implements_alter(&$implementations, $hook) { * * @link http://drupal.org/node/1272560 */ -function commerce_message_message_presave($message) { - if (!empty($message->mid) || $message->type != 'commerce_order_order_confirmation') { +function commerce_message_message_presave(Message $message) { + // Only support unsaved messages that re-use our order reference field. + $wrapper = entity_metadata_wrapper('message', $message); + if (!empty($message->mid) || !isset($wrapper->message_commerce_order)) { return; } @@ -70,14 +73,22 @@ function commerce_message_message_presave($message) { /** * Message callback; Show order summary. * - * @param $message + * @param Message $message * The Message entity. + * + * @return string + * The output of the View. */ function commerce_message_order_summary(Message $message) { $wrapper = entity_metadata_wrapper('message', $message); $view = views_get_view('commerce_cart_summary'); $view->set_arguments(array($wrapper->message_commerce_order->getIdentifier())); $view->hide_admin_links = TRUE; + + // Disable SQL query rewrite so this renders properly for token. + // @link https://www.drupal.org/node/1895418 + $view->display['default']->display_options['query']['options']['disable_sql_rewrite'] = TRUE; + return $view->preview(); } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.rules_defaults.inc b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.rules_defaults.inc index 8253d657..1b5410fb 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.rules_defaults.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.rules_defaults.inc @@ -217,6 +217,39 @@ function commerce_message_default_rules_configuration() { } }'); + $rules['rules_commerce_order_message_admin_order_notification'] = entity_import('rules_config', '{ "rules_commerce_order_message_admin_order_notification" : { + "LABEL" : "Commerce order message: admin order notification e-mail", + "PLUGIN" : "reaction rule", + "WEIGHT" : "3", + "OWNER" : "rules", + "REQUIRES" : [ "rules", "message_notify", "commerce_checkout" ], + "ON" : { "commerce_checkout_complete" : [] }, + "DO" : [ + { "entity_create" : { + "USING" : { + "type" : "message", + "param_type" : "commerce_order_admin_order_confirmation", + "param_user" : [ "commerce-order:owner" ] + }, + "PROVIDE" : { "entity_created" : { "entity_created" : "Created entity" } } + } + }, + { "data_set" : { + "data" : [ "entity-created:message-commerce-order" ], + "value" : [ "commerce-order" ] + } + }, + { "entity_save" : { "data" : [ "entity-created" ], "immediate" : 1 } }, + { "message_notify_process" : { + "message" : [ "entity-created" ], + "save_on_fail" : 0, + "save_on_success" : 0 + } + } + ] + } + }'); + return $rules; } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.test b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.test new file mode 100644 index 00000000..c119480e --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_message/commerce_message.test @@ -0,0 +1,560 @@ +resetAll(); + + $this->store_admin = $this->createStoreAdmin(); + + if (!$this->store_admin) { + $this->fail(t('Failed to create Store Admin user for test.')); + } + + // Set the default country to US. + variable_set('site_default_country', 'US'); + } + + /** + * Loads message entities referencing an order. + * + * @param object $order + * The commerce_order entity. + * + * @return Message[] + * Array of entities. + */ + protected function loadMessagesForOrder($order) { + $query = new EntityFieldQuery(); + $query->entityCondition('entity_type', 'message') + ->fieldCondition('message_commerce_order', 'target_id', $order->order_id) + ->propertyOrderBy('timestamp', 'ASC'); + $results = $query->execute(); + + if (!empty($results)) { + return entity_load('message', array_keys($results['message'])); + } + + return array(); + } + + /** + * Asserts if a Message entity's bundle matches. + * + * @param \Message $message + * The Message entity. + * @param string $bundle + * The bundle. + */ + protected function assertBundle(Message $message, $bundle) { + $this->assertEqual($bundle, $message->bundle(), t('Message type @expected expected, got: @actual', array( + '@expected' => $bundle, + '@actual' => $message->bundle(), + ) + )); + } +} + +/** + * Class CommerceMessageOrderHistoryTest + */ +class CommerceMessageOrderHistoryTest extends CommerceMessageTestBase { + + public static function getInfo() { + return array( + 'name' => 'Commerce Message order history', + 'description' => 'Tests messages as order history', + 'group' => 'Commerce Message', + 'dependencies' => array('rules'), + ); + } + + /** + * Test order history programmatically. + */ + public function testOrderHistory() { + $order = $this->createDummyOrder(); + commerce_order_status_update($order, 'pending'); + commerce_order_status_update($order, 'completed'); + RulesLog::logger()->checkLog(); + + $messages = $this->loadMessagesForOrder($order); + + $this->assertEqual(4, count($messages)); + + // Assert order created. + $message = reset($messages); + array_shift($messages); + $this->assertBundle($message, 'commerce_order_created'); + $this->assertEqual('Order has been created.', $message->getText(LANGUAGE_NONE)); + + // Assert product added to cart. + $message = reset($messages); + array_shift($messages); + $this->assertBundle($message, 'commerce_order_cart_add'); + $this->assertEqual('Product PROD-01 added to the cart.', $message->getText(LANGUAGE_NONE)); + + // Assert status updates. + $message = reset($messages); + array_shift($messages); + $this->assertBundle($message, 'commerce_order_state'); + $this->assertEqual('Status has been set to Pending (previously: Shopping cart).', $message->getText(LANGUAGE_NONE)); + + $message = reset($messages); + array_shift($messages); + $this->assertBundle($message, 'commerce_order_state'); + $this->assertEqual('Status has been set to Completed (previously: Pending).', $message->getText(LANGUAGE_NONE)); + } + + /** + * Test order history UI. + */ + public function testOrderHistoryUi() { + $order = $this->createDummyOrder(); + commerce_order_status_update($order, 'pending'); + commerce_order_status_update($order, 'completed'); + RulesLog::logger()->checkLog(); + + $this->drupalLogin($this->store_admin); + + $this->drupalGet('admin/commerce/orders/' . $order->order_id . '/history'); + $this->assertText('Order has been created.'); + $this->assertText('Product PROD-01 added to the cart.'); + $this->assertText('Status has been set to Pending (previously: Shopping cart).'); + $this->assertText('Status has been set to Completed (previously: Pending).'); + + $this->drupalLogout(); + $this->drupalGet('admin/commerce/orders/' . $order->order_id . '/history'); + $this->assertResponse(403, 'Anonymoous users cannot view order history.'); + } +} + +/** + * Class CommerceMessageOrderNotificationTest + * + * @see MailTestCase + */ +class CommerceMessageOrderNotificationTest extends CommerceMessageTestBase implements MailSystemInterface { + /** + * The most recent message that was sent through the test case. + */ + private static $sent_message; + + public static function getInfo() { + return array( + 'name' => 'Commerce Message order notification', + 'description' => 'Tests messages as order history', + 'group' => 'Commerce Message', + 'dependencies' => array('rules'), + ); + } + + public function setUp() { + parent::setUp(); + // Set MailTestCase (i.e. this class) as the SMTP library. + variable_set('mail_system', array('default-system' => 'CommerceMessageOrderNotificationTest')); + } + + /** + * Concatenate and wrap the e-mail body for plain-text mails. + * + * @see DefaultMailSystem + */ + public function format(array $message) { + // Join the body array into one string. + $message['body'] = implode("\n\n", $message['body']); + // Convert any HTML to plain-text. + $message['body'] = drupal_html_to_text($message['body']); + // Wrap the mail body for sending. + $message['body'] = drupal_wrap_mail($message['body']); + return $message; + } + + /** + * Send function that is called through the mail system. + */ + public function mail(array $message) { + self::$sent_message = $message; + } + + + /** + * Test the order message's content. + */ + public function testOrderNotificationMessageContent() { + $order = $this->createDummyOrder(); + $message = message_create('commerce_order_order_confirmation', array(), $this->store_admin); + $message->wrapper()->message_commerce_order = $order; + $message->save(); + $mid = $message->mid; + + // Reload the message to see it was saved. + $message = message_load($mid); + $this->assertTrue(!empty($message->mid), t('Message was saved to the database.')); + + $message = $message->buildContent(); + + global $language; + $url_options = array( + 'absolute' => TRUE, + 'language' => $language, + ); + + $this->assertEqual( + t('Order @order_id at @site', array( + '@order_id' => $order->order_id, + '@site' => variable_get('site_name', 'Drupal'), + )), + $message['message__message_text__0']['#markup']); + + $body = t('Thanks for your order @order_id at @site. + +If this is your first order with us, you will receive a separate e-mail with login instructions. You can view your order history with us at any time by logging into our website at: + +@login-url + +You can find the status of your current order at: + +@order-view + +Please contact us if you have any questions about your order.', array( + '@order_id' => $order->order_id, + '@site' => variable_get('site_name', 'Drupal'), + '@login-url' => url('user', $url_options), + '@order-view' => url('user/' . $order->uid . '/orders/' . $order->order_id, $url_options), + )); + $this->assertEqual($body, $message['message__message_text__1']['#markup']); + } + + /** + * Tests that the notification is generated on checkout complete. + */ + public function testOrderNotificationMessageCreation() { + $order = $this->createDummyOrder(); + commerce_checkout_complete($order); + + $messages = $this->loadMessagesForOrder($order); + foreach ($messages as $message) { + if ($message->bundle() == 'commerce_order_order_confirmation') { + $this->pass('Order that completed checkout had an order notification generated.'); + } + } + + $this->assertNotNull(self::$sent_message); + } +} + +/** + * Class CommerceMessageAdminOrderNotificationTest + * + * @see MailTestCase + */ +class CommerceMessageAdminOrderNotificationTest extends CommerceMessageTestBase implements MailSystemInterface { + /** + * The most recent message that was sent through the test case. + */ + private static $sent_message; + + public static function getInfo() { + return array( + 'name' => 'Commerce Message admin order notification', + 'description' => 'Tests messages as order history', + 'group' => 'Commerce Message', + 'dependencies' => array('rules'), + ); + } + + public function setUp() { + parent::setUp(); + // Set MailTestCase (i.e. this class) as the SMTP library. + variable_set('mail_system', array('default-system' => 'CommerceMessageAdminOrderNotificationTest')); + } + + /** + * Concatenate and wrap the e-mail body for plain-text mails. + * + * @see DefaultMailSystem + */ + public function format(array $message) { + // Join the body array into one string. + $message['body'] = implode("\n\n", $message['body']); + // Convert any HTML to plain-text. + $message['body'] = drupal_html_to_text($message['body']); + // Wrap the mail body for sending. + $message['body'] = drupal_wrap_mail($message['body']); + return $message; + } + + /** + * Send function that is called through the mail system. + */ + public function mail(array $message) { + self::$sent_message = $message; + } + + + /** + * Test the order message's content. + */ + public function testOrderNotificationMessageContent() { + $order = $this->createDummyOrder(); + $message = message_create('commerce_order_admin_order_confirmation', array(), $this->store_admin); + $message->wrapper()->message_commerce_order = $order; + $message->save(); + $mid = $message->mid; + + // Reload the message to see it was saved. + $message = message_load($mid); + $this->assertTrue(!empty($message->mid), t('Message was saved to the database.')); + + $message = $message->buildContent(); + + global $language; + $url_options = array( + 'absolute' => TRUE, + 'language' => $language, + ); + + $this->assertEqual( + t('Order @order_id at @site', array( + '@order_id' => $order->order_id, + '@site' => variable_get('site_name', 'Drupal'), + )), + $message['message__message_text__0']['#markup']); + + $body = t('A new order (@order_id) has been placed at @site. +Here is a link to the order: + +@order-view', array( + '@order_id' => $order->order_id, + '@site' => variable_get('site_name', 'Drupal'), + '@login-url' => url('user', $url_options), + '@order-view' => url('user/' . $order->uid . '/orders/' . $order->order_id, $url_options), + )); + $this->assertEqual($body, $message['message__message_text__1']['#markup']); + } + + /** + * Tests that the notification is generated on checkout complete. + */ + public function testOrderNotificationMessageCreation() { + $order = $this->createDummyOrder(); + commerce_checkout_complete($order); + + $messages = $this->loadMessagesForOrder($order); + foreach ($messages as $message) { + if ($message->bundle() == 'commerce_order_admin_order_confirmation') { + $this->pass('Order that completed checkout had an admin order notification generated.'); + } + } + + $this->assertNotNull(self::$sent_message); + } +} + +class CommerceMessageTokenTest extends CommerceMessageTestBase { + + public static function getInfo() { + return array( + 'name' => 'Commerce Message order summary token', + 'description' => 'Tests the order summary token', + 'group' => 'Commerce Message', + ); + } + + public function testOrderSummaryToken() { + $order = $this->createDummyOrder(); + $message = message_create('commerce_order_order_confirmation', array(), $this->store_admin); + $message->wrapper()->message_commerce_order = $order; + $message->save(); + + $this->assertTrue(isset($message->arguments['!order-summary'])); + + $message = message_create('commerce_order_admin_order_confirmation', array(), $this->store_admin); + $message->wrapper()->message_commerce_order = $order; + $message->save(); + + $this->assertTrue(isset($message->arguments['!order-summary'])); + } + + public function testTokenCustomMessageType() { + $message_type = message_type_create('foo', array('message_text' => array(LANGUAGE_NONE => array(array('value' => 'Example text.\n\n!order-summary'))))); + $message_type->save(); + + $message = message_create('foo', array(), $this->store_admin); + $message->save(); + + $this->assertFalse(isset($message->arguments['!order-summary'])); + + // Attach field to message type. + $fields['message_commerce_order']['field'] = array( + 'type' => 'entityreference', + 'module' => 'entityreference', + 'cardinality' => '1', + 'translatable' => FALSE, + 'settings' => array( + 'target_type' => 'commerce_order', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array(), + 'sort' => array( + 'type' => 'property', + 'property' => 'order_id', + 'direction' => 'ASC', + ), + ), + ), + 'locked' => TRUE, + ); + $fields['message_commerce_order']['instances'][] = array( + 'entity_type' => 'message', + 'bundles' => array('foo'), + 'label' => 'Order', + 'required' => TRUE, + 'widget' => array( + 'type' => 'entityreference_autocomplete', + 'module' => 'entityreference', + 'settings' => array( + 'match_operator' => 'CONTAINS', + 'size' => '60', + 'path' => '', + ), + ), + 'settings' => array(), + 'display' => array( + 'default' => array( + 'label' => 'above', + 'type' => 'entityreference_label', + 'settings' => array( + 'link' => FALSE, + ), + 'module' => 'entityreference', + 'weight' => 0, + ), + ), + ); + foreach ($fields as $field_name => $info) { + $field = $info['field']; + $field += array( + 'field_name' => $field_name, + ); + if (!field_info_field($field_name)) { + field_create_field($field); + } + + foreach ($info['instances'] as $instance) { + foreach ($instance['bundles'] as $bundle) { + $instance['bundle'] = $bundle; + unset($instance['bundles']); + $instance['field_name'] = $field_name; + if (!field_info_instance($instance['entity_type'], $instance['field_name'], $instance['bundle'])) { + field_create_instance($instance); + } + } + } + } + + $order = $this->createDummyOrder(); + $message = message_create('foo', array(), $this->store_admin); + $message->wrapper()->message_commerce_order = $order; + $message->save(); + + $this->assertTrue(isset($message->arguments['!order-summary'])); + + } + + public function testCloneHasToken() { + $this->drupalLogin($this->store_admin); + $edit = array( + 'name' => 'commerce_order_order_confirmation_cloned_', + 'description' => 'Commerce Order: order confirmation (cloned)', + ); + $this->drupalPost('admin/structure/messages/manage/commerce_order_order_confirmation/clone', $edit, t('Save message type')); + + if (!message_type_load('commerce_order_order_confirmation_cloned_')) { + $this->fail('Failed to clone the message type'); + } + + $this->drupalGet('admin/structure/messages/manage/commerce_order_order_confirmation_cloned_/fields'); + $this->assertText('message_commerce_order'); + + } +} + +class CommerceMessageOrderSummaryTest extends CommerceMessageTestBase { + public static function getInfo() { + return array( + 'name' => 'Commerce Message order summary token', + 'description' => 'Tests the order summary token', + 'group' => 'Commerce Message', + ); + } + + public function testViewAsOrderOwner() { + $original_user = $GLOBALS['user']; + + $customer = $this->createStoreCustomer(); + $order = $this->createDummyOrder($customer->uid); + $message = message_create('commerce_order_order_confirmation', array(), $customer); + $message->wrapper()->message_commerce_order = $order; + $message->save(); + + $GLOBALS['user'] = $customer; + $this->assertIdentical($GLOBALS['user']->uid, $customer->uid); + $summary = commerce_message_order_summary($message); + // The view-dom-id-* class is dynamic each time, so we need to check for + // the order total area class in our returned markup. + $this->assertTrue(strpos($summary, 'commerce-order-handler-area-order-total') !== FALSE); + + $GLOBALS['user'] = $this->store_admin; + $this->assertIdentical($GLOBALS['user']->uid, $this->store_admin->uid); + $summary = commerce_message_order_summary($message); + $this->assertTrue(strpos($summary, 'commerce-order-handler-area-order-total') !== FALSE); + + // Now there is a chance a payment gateway's IPN returns when there is not + // and active session. That means it'll run as anonymous and ruin our fun. + // Here we test SQL rewrite is disabled so our messages work. + $GLOBALS['user'] = drupal_anonymous_user(); + $this->assertIdentical($GLOBALS['user']->uid, 0); + $summary = commerce_message_order_summary($message); + $this->assertTrue(strpos($summary, 'commerce-order-handler-area-order-total') !== FALSE); + + // Reset just in case. + $GLOBALS['user'] = $original_user; + + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/commerce_message.message.inc b/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/commerce_message.message.inc index df6e18e2..e8496b93 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/commerce_message.message.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/commerce_message.message.inc @@ -202,6 +202,31 @@ function commerce_message_default_message_type() { "rdf_mapping" : [] }'); + $items['commerce_order_admin_order_confirmation'] = entity_import('message_type', '{ + "name" : "commerce_order_admin_order_confirmation", + "description" : "Commerce Order: admin order confirmation", + "argument_keys" : [], + "argument" : [], + "category" : "message_type", + "data" : { "purge" : { "override" : 0, "enabled" : 0, "quota" : "", "days" : "" } }, + "language" : "", + "arguments" : null, + "message_text" : { "und" : [ + { + "value" : "Order @{message:message-commerce-order:order-number} at [site:name]", + "format" : null, + "safe_value" : "Order @{message:message-commerce-order:order-number} at [site:name]" + }, + { + "value" : "A new order (@{message:message-commerce-order:order-number}) has been placed at [site:name].\r\nHere is a link to the order:\r\n\r\n[message:message-commerce-order:view-url]", + "format" : "commerce_order_message", + "safe_value" : "A new order (@{message:message-commerce-order:order-number}) has been placed at [site:name].\r\nHere is a link to the order:\r\n\r\n[message:message-commerce-order:view-url]" + } + ] + }, + "rdf_mapping" : [] + }'); + return $items; } @@ -212,9 +237,10 @@ function commerce_message_default_message_type() { function commerce_message_default_message_type_alter(&$items) { if (module_exists('locale')) { $languages = locale_language_list(); + $default_messages = array_keys(commerce_message_default_message_type()); foreach ($languages as $langcode => $langname) { foreach ($items as $message_type => $item) { - if ($item->module != 'commerce_message') { + if (!in_array($message_type, $default_messages)) { continue; } if (isset($items[$message_type]->message_text[LANGUAGE_NONE])) { @@ -261,6 +287,7 @@ function commerce_message_message_field_refresh() { 'commerce_order_user_comment', 'commerce_order_admin_comment', 'commerce_order_order_confirmation', + 'commerce_order_admin_order_confirmation', ); $fields['message_commerce_order']['instances'][] = array( 'entity_type' => 'message', @@ -563,6 +590,8 @@ function commerce_message_message_form_validate($form, &$form_state) { * Submit callback for commerce_message_message_form(). */ function commerce_message_message_form_submit($form, &$form_state) { + // Update date to current one + $form['#entity']->timestamp = REQUEST_TIME; // Notify field widgets. field_attach_submit('message', $form['#entity'], $form['content'], $form_state); entity_save('message', $form['#entity']); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/views/commerce_message.views_default.inc b/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/views/commerce_message.views_default.inc index 0b8d789e..c284b302 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/views/commerce_message.views_default.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_message/includes/views/commerce_message.views_default.inc @@ -263,17 +263,19 @@ function commerce_message_views_default_views() { 'commerce_order_message' => 'commerce_order_message', ); - /* Display: Entity content */ - $handler = $view->new_display('entity_view', 'Entity content', 'order_view'); - $handler->display->display_options['defaults']['pager'] = FALSE; - $handler->display->display_options['pager']['type'] = 'some'; - $handler->display->display_options['pager']['options']['items_per_page'] = '4'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['entity_type'] = 'commerce_order'; - $handler->display->display_options['bundles'] = array( - 0 => 'commerce_order', - ); - $handler->display->display_options['show_title'] = 1; + if (module_exists('eva')) { + /* Display: Entity content */ + $handler = $view->new_display('entity_view', 'Entity content', 'order_view'); + $handler->display->display_options['defaults']['pager'] = FALSE; + $handler->display->display_options['pager']['type'] = 'some'; + $handler->display->display_options['pager']['options']['items_per_page'] = '4'; + $handler->display->display_options['pager']['options']['offset'] = '0'; + $handler->display->display_options['entity_type'] = 'commerce_order'; + $handler->display->display_options['bundles'] = array( + 0 => 'commerce_order', + ); + $handler->display->display_options['show_title'] = 1; + } /* Display: Block */ $handler = $view->new_display('block', 'Block', 'block_1'); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/PATCHES.txt b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/PATCHES.txt index 29bb797d..e71b2e11 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/PATCHES.txt +++ b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/PATCHES.txt @@ -1,4 +1,4 @@ The following patches have been applied to this project: -- https://www.drupal.org/files/commerce_products_source_migration-1931302-2.patch +- https://www.drupal.org/files/issues/reference_fields_should-2701333-3.patch -This file was automatically generated by Drush Make (http://drupal.org/project/drush). \ No newline at end of file +This file was automatically generated by Drush Make (http://drupal.org/project/drush). diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/README.txt b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/README.txt index 5e9d8edf..f41460a4 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/README.txt +++ b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/README.txt @@ -1,16 +1,18 @@ -Commerce Migrate is a general-purpose migration framework extending Migrate Module -for bringing store information into Drupal Commerce. +Commerce Migrate is a general-purpose migration framework extending Migrate +Module for bringing store information into Drupal Commerce. -- Migrate destination field handlers for commerce fields (reference fields, price field) +- Migrate destination field handlers for commerce fields (reference fields, + price field) - Migrate destination plugin for commerce product types. -Commerce Migrate depends on Migrate Extras for Entity API and Address Field integration. + Commerce Migrate depends on Migrate Extras for Entity API and Address Field + integration. Ubercart migration ------------------ Commerce Migrate Ubercart has moved to its own project, http://drupal.org/project/commerce_migrate_ubercart -It can migrate 6.x and 7.x Ubercart stores from either the existing Drupal database -or a remote database. +It can migrate 6.x and 7.x Ubercart stores from either the existing Drupal +database or a remote database. Price fields ------------ @@ -41,4 +43,3 @@ The Migrate handbook page at http://drupal.org/node/415260 http://cyrve.com/import http://www.gizra.com/content/data-migration-part-1 http://www.gizra.com/content/data-migration-part-2 - diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.info b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.info index db5164ac..cca541de 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.info @@ -7,13 +7,14 @@ dependencies[] = migrate_extras dependencies[] = commerce_product ; Destination plugins +files[] = plugins/destinations/commerce_license.inc files[] = plugins/destinations/commerce_product_type.inc files[] = plugins/destinations/commerce_product.inc files[] = plugins/destinations/fields.inc -; Information added by drupal.org packaging script on 2012-12-06 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2015-11-14 +version = "7.x-1.2" core = "7.x" project = "commerce_migrate" -datestamp = "1354758712" +datestamp = "1447468741" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.module b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.module index 99af93f2..da245c0c 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate.module @@ -1,6 +1,6 @@ 2, + 'groups' => array( + 'commerce_example' => array( + 'title' => t('Commerce Example Imports'), + ), + ), + 'migrations' => array( + 'CommerceExampleProduct' => array( + 'class_name' => 'CommerceMigrateExampleProductMigration', + 'group' => 'commerce_example', + ), + 'CommerceExampleProductDisplay' => array( + 'class_name' => 'CommerceMigrateExampleDisplayNodeMigration', + 'group' => 'commerce_example', + 'dependencies' => array( + 'CommerceExampleProduct', + ), + ), + ), + ); + + return $api; +} + +/** + * A simple base class that contains things common to all + * CommerceMigrateExample classes. + */ +abstract class CommerceMigrateExampleMigration extends Migration { + public function __construct($arguments = array()) { + // Always call the parent constructor first for basic setup + parent::__construct($arguments); + } + + /** + * Provide the names of the incoming CSV file columns. + */ + function csvcolumns() { + $columns[0] = array('SKU', 'SKU'); + $columns[1] = array('Title', 'Title'); + $columns[2] = array('Price', 'Price'); + $columns[3] = array('Image', 'Image'); + $columns[4] = array('Description', 'Description'); + return $columns; + } +} + +/** + * Import Products into the "product" product type. + * + * This simple migration assumes that a product type called 'product' + * already exists, and has the sku, title, commerce_price, and field_image + * fields. + */ +class CommerceMigrateExampleProductMigration extends CommerceMigrateExampleMigration { + public function __construct($arguments = array()) { + parent::__construct($arguments); + $this->description = t('Import products from CSV file (with no header).'); + + // Create a map object for tracking the relationships between source rows + $this->map = new MigrateSQLMap($this->machineName, + array( + // The 'SKU' field in the CSV file is the key. + 'SKU' => array('type' => 'varchar', + 'length' => 24, + 'not null' => TRUE, + 'description' => 'SKU', + ), + ), + // Rather than specifying the type directly here, we would probably use + // arguments, but instead this just specifies the 'product' product type + // to make it obvious what's going on. + MigrateDestinationEntityAPI::getKeySchema('commerce_product', 'product') + ); + + // Create a MigrateSource object, which manages retrieving the input data. + $csv_file = drupal_get_path('module', 'commerce_migrate_example') . '/commerce_migrate_example.csv'; + $this->source = new MigrateSourceCSV($csv_file, $this->csvcolumns()); + + // Again here we're hardwiring the product type to 'product'. + $this->destination = new MigrateDestinationEntityAPI('commerce_product', 'product'); + + $this->addFieldMapping('sku', 'SKU'); + $this->addFieldMapping('title', 'Title'); + $this->addFieldMapping('commerce_price', 'Price'); + $this->addFieldMapping('field_image', 'Image'); + $this->addFieldMapping('field_image:file_class') + ->defaultValue('MigrateFileUri'); + $this->addFieldMapping('field_image:source_dir') + ->defaultValue(drupal_get_path('module', 'commerce_migrate_example') . '/images'); + } +} + +/** + * Import nodes of type 'product_display' from the same CSV file. + * + * This is hard-wired to the node type 'product_display' with a + * product reference field of type field_product. + */ +class CommerceMigrateExampleDisplayNodeMigration extends CommerceMigrateExampleMigration { + public function __construct($arguments = array()) { + parent::__construct($arguments); + $this->description = t('Import product display nodes from CSV file (with no header).'); + $this->dependencies = array('CommerceExampleProduct'); + + // Create a map object for tracking the relationships between source rows + $this->map = new MigrateSQLMap($this->machineName, + array( + 'SKU' => array('type' => 'varchar', + 'length' => 24, + 'not null' => TRUE, + 'description' => 'SKU', + ), + ), + MigrateDestinationNode::getKeySchema() + ); + + // Create a MigrateSource object, which manages retrieving the input data. + $csv_file = drupal_get_path('module', 'commerce_migrate_example') . '/commerce_migrate_example.csv'; + $this->source = new MigrateSourceCSV($csv_file, $this->csvcolumns()); + + $this->destination = new MigrateDestinationNode('product_display'); + + // For a multivalued import, see the field_migrate_example_country mapping + // in the Migrate Example in beer.inc. + // Here we do a single SKU per product node. + $this->addFieldMapping('field_product', 'SKU')->sourceMigration('CommerceExampleProduct'); + + $this->addFieldMapping('title', 'Title'); + $this->addFieldMapping('body', 'Description'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate_example/commerce_migrate_example.module b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate_example/commerce_migrate_example.module new file mode 100644 index 00000000..a4abe2da --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/commerce_migrate_example/commerce_migrate_example.module @@ -0,0 +1,2 @@ + $field_name, @@ -245,8 +252,8 @@ class MigrateDestinationCommerceProductType extends MigrateDestination { 'type' => 'image', 'settings' => array('image_style' => 'large', 'image_link' => ''), 'weight' => -1, - ), - 'teaser' => array( + ), + 'teaser' => array( 'label' => 'hidden', 'type' => 'image', 'settings' => array('image_style' => 'medium', 'image_link' => 'content'), @@ -257,6 +264,7 @@ class MigrateDestinationCommerceProductType extends MigrateDestination { field_create_instance($instance); } } + /** * Implementation of __toString(). * @@ -264,6 +272,6 @@ class MigrateDestinationCommerceProductType extends MigrateDestination { * Description of the destination being migrated into */ public function __toString() { - return 'Creates commerce product types'; + return 'Creates commerce product types'; } } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/plugins/destinations/fields.inc b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/plugins/destinations/fields.inc index 2562de1f..fc3149ca 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_migrate/plugins/destinations/fields.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_migrate/plugins/destinations/fields.inc @@ -2,76 +2,41 @@ /** * @file - * Support for processing commerce fields (product reference, customer profile reference, price) + * Support for processing commerce fields (product reference, customer profile + * reference, price) */ -class MigrateCommerceCustomerProfileReferenceFieldHandler extends MigrateFieldHandler { +class MigrateCommerceCustomerProfileReferenceFieldHandler extends MigrateSimpleFieldHandler { public function __construct() { + parent::__construct(array( + 'value_key' => 'profile_id', + 'skip_empty' => TRUE, + )); $this->registerTypes(array('commerce_customer_profile_reference')); } - public function prepare($entity, array $field_info, array $instance, array $values) { - $migration = Migration::currentMigration(); - $arguments = (isset($values['arguments']))? $values['arguments']: array(); - $language = $this->getFieldLanguage($entity, $field_info, $arguments); - // Setup the standard Field API array for saving. - $delta = 0; - foreach (array_filter($values) as $value) { - $return[$language][$delta]['profile_id'] = $value; - $delta++; - } - if (!isset($return)) { - $return = NULL; - } - return $return; - } } -class MigrateCommerceLineItemReferenceFieldHandler extends MigrateFieldHandler { +class MigrateCommerceLineItemReferenceFieldHandler extends MigrateSimpleFieldHandler { public function __construct() { + parent::__construct(array( + 'value_key' => 'line_item_id', + 'skip_empty' => TRUE, + )); $this->registerTypes(array('commerce_line_item_reference')); } - public function prepare($entity, array $field_info, array $instance, array $values) { - $migration = Migration::currentMigration(); - $arguments = (isset($values['arguments']))? $values['arguments']: array(); - $language = $this->getFieldLanguage($entity, $field_info, $arguments); - // Setup the standard Field API array for saving. - $delta = 0; - foreach (array_filter($values) as $value) { - $return[$language][$delta]['line_item_id'] = $value; - $delta++; - } - if (!isset($return)) { - $return = NULL; - } - return $return; - } } -class MigrateCommerceProductReferenceFieldHandler extends MigrateFieldHandler { +class MigrateCommerceProductReferenceFieldHandler extends MigrateSimpleFieldHandler { public function __construct() { + parent::__construct(array( + 'value_key' => 'product_id', + 'skip_empty' => TRUE, + )); $this->registerTypes(array('commerce_product_reference')); } - public function prepare($entity, array $field_info, array $instance, array $values) { - $migration = Migration::currentMigration(); - $arguments = (isset($values['arguments']))? $values['arguments']: array(); - $language = $this->getFieldLanguage($entity, $field_info, $arguments); - // Setup the standard Field API array for saving. - $delta = 0; - if(!is_array(reset($values))) { - $values = array($values); - } - foreach (array_filter($values) as $value) { - $return[$language][$delta]['product_id'] = reset($value); - $delta++; - } - if (!isset($return)) { - $return = NULL; - } - return $return; - } } class MigrateCommercePriceFieldHandler extends MigrateFieldHandler { diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_moneybookers/PATCHES.txt b/profiles/commerce_kickstart/modules/contrib/commerce_moneybookers/PATCHES.txt index 2eaca867..9f97ebf0 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_moneybookers/PATCHES.txt +++ b/profiles/commerce_kickstart/modules/contrib/commerce_moneybookers/PATCHES.txt @@ -1,4 +1,4 @@ The following patches have been applied to this project: - http://drupal.org/files/commerce_moneybookers-disable_payment_method_by_default-1962226-3.patch -This file was automatically generated by Drush Make (http://drupal.org/project/drush). \ No newline at end of file +This file was automatically generated by Drush Make (http://drupal.org/project/drush). diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.info b/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.info index fdaec056..0d2dfb89 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.info @@ -10,9 +10,9 @@ core = 7.x package = Commerce (contrib) configure = admin/config/services/nostotagging -; Information added by drupal.org packaging script on 2013-09-10 -version = "7.x-1.0" +; Information added by Drupal.org packaging script on 2016-01-07 +version = "7.x-1.1" core = "7.x" project = "commerce_nosto_tagging" -datestamp = "1378843042" +datestamp = "1452154140" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.module b/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.module index 4344917b..bdb2cd7a 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_nosto_tagging/commerce_nosto_tagging.module @@ -836,18 +836,20 @@ function _commerce_nosto_tagging_get_commerce_product_image_url($commerce_produc */ function _commerce_nosto_tagging_get_commerce_product_availability($commerce_product) { if (module_exists('commerce_stock') && isset($commerce_product->commerce_stock)) { - $remaining_stock = 0; $out_of_stock = FALSE; // Commerce Stock 1.x-branch if (function_exists('commerce_stock_product_check_out_of_stock')) { + $remaining_stock = 0; $out_of_stock = commerce_stock_product_check_out_of_stock($commerce_product->product_id, 1, $remaining_stock); } // Commerce Stock 2.x-branch elseif (function_exists('commerce_stock_check_product_checkout_rule')) { - $stock_state = TRUE; + $stock_state = 0; $message = NULL; - $out_of_stock_status = commerce_stock_check_product_checkout_rule($commerce_product, 1, $stock_state, $message); - $out_of_stock = $stock_state; + commerce_stock_check_product_checkout_rule($commerce_product, 1, $stock_state, $message); + if ($stock_state == 1 || $stock_state == 2) { + $out_of_stock = TRUE; + } } if ($out_of_stock) { return COMMERCE_NOSTO_TAGGING_PRODUCT_OUT_OF_STOCK; diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/LICENSE.txt old mode 100755 new mode 100644 diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.info b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.info index 8f3cd1bf..59fa5a59 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.info @@ -10,9 +10,9 @@ core = 7.x ; Simple tests ; files[] = tests/commerce_paypal.test -; Information added by Drupal.org packaging script on 2014-01-14 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2017-06-19 +version = "7.x-2.4" core = "7.x" project = "commerce_paypal" -datestamp = "1389740908" +datestamp = "1497908944" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.module b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.module index 87678336..5e659c15 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/commerce_paypal.module @@ -91,18 +91,42 @@ function commerce_paypal_process_ipn($payment_method = NULL, $debug_ipn = array( $host = 'https://www.paypal.com/cgi-bin/webscr'; } - // Process the HTTP request to validate the IPN. - $response = drupal_http_request($host, array('method' => 'POST', 'data' => implode('&', $variables))); + // Setup the cURL request. + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $host); + curl_setopt($ch, CURLOPT_VERBOSE, 0); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, implode('&', $variables)); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_NOPROGRESS, 1); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); + + // Commerce PayPal requires SSL peer verification, which may prevent out of + // date servers from successfully processing API requests. If you get an error + // related to peer verification, you may need to download the CA certificate + // bundle file from http://curl.haxx.se/docs/caextract.html, place it in a + // safe location on your web server, and update your settings.php to set the + // commerce_paypal_cacert variable to contain the absolute path of the file. + // Alternately, you may be able to update your php.ini to point to the file + // with the curl.cainfo setting. + if (variable_get('commerce_paypal_cacert', FALSE)) { + curl_setopt($ch, CURLOPT_CAINFO, variable_get('commerce_paypal_cacert', '')); + } + + $response = curl_exec($ch); // If an error occurred during processing, log the message and exit. - if (property_exists($response, 'error')) { - watchdog('commerce_paypal', 'Attempt to validate IPN failed with error @code: @error', array('@code' => $response->code, '@error' => $response->error), WATCHDOG_ERROR); + if ($error = curl_error($ch)) { + watchdog('commerce_paypal', 'Attempt to validate IPN failed with cURL error: @error', array('@error' => $error), WATCHDOG_ERROR); return FALSE; } + curl_close($ch); - // If the IPN was invalid, log a message and exit. - if ($response->data == 'INVALID') { - watchdog('commerce_paypal', 'Invalid IPN received and ignored.', array(), WATCHDOG_ALERT); + // inspect IPN validation result and act accordingly + if (strcmp ($response, "INVALID") == 0) { + // If the IPN was invalid, log a message and exit. + watchdog('commerce_paypal', 'Invalid IPN received and ignored. Response: @response', array('@response' => $response), WATCHDOG_ALERT); return FALSE; } } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.info b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.info index f053f001..7e965d81 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.info @@ -8,9 +8,9 @@ dependencies[] = commerce_order dependencies[] = commerce_paypal core = 7.x -; Information added by Drupal.org packaging script on 2014-01-14 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2017-06-19 +version = "7.x-2.4" core = "7.x" project = "commerce_paypal" -datestamp = "1389740908" +datestamp = "1497908944" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.module b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.module index f6ea1b86..d179591b 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/ec/commerce_paypal_ec.module @@ -875,7 +875,7 @@ function commerce_paypal_ec_paypal_ipn_process($order, $payment_method, &$ipn) { } // Exit when we don't get a payment status we recognize. - if (!in_array($ipn['payment_status'], array('Failed', 'Voided', 'Pending', 'Completed', 'Refunded'))) { + if (!in_array($ipn['payment_status'], array('Failed', 'Voided', 'Pending', 'Completed', 'Refunded', 'Denied'))) { commerce_payment_redirect_pane_previous_page($order); return FALSE; } @@ -908,6 +908,24 @@ function commerce_paypal_ec_paypal_ipn_process($order, $payment_method, &$ipn) { $transaction = commerce_payment_transaction_new('paypal_ec', $order->order_id); $transaction->instance_id = $payment_method['instance_id']; } + elseif (in_array($ipn['payment_status'], array('Completed','Denied')) && $ipn['payment_type'] === 'echeck') { + // E-checks use the same ipn transaction id, with an updated status. Check + // for existing transaction with a status that's not the same. + // Ensure there is an existing transaction. + $transaction = commerce_paypal_payment_transaction_load($ipn['txn_id']); + if (! $transaction) { + watchdog('commerce_paypal_ec', 'IPN for Order @order_number ignored: transaction not found.', array('@order_number' => $order->order_number), WATCHDOG_NOTICE); + return FALSE; + } + + // The e-check status has updated, so change the transaction details. + if ($ipn['payment_status'] == 'Completed') { + $transaction->message = '' . t('eCheck payment successful') . ''; + } + else { + $transaction->message = '' . t('eCheck payment denied') . ''; + } + } else { // In other circumstances, exit the processing, because we handle those // cases directly during API response processing. @@ -953,6 +971,11 @@ function commerce_paypal_ec_paypal_ipn_process($order, $payment_method, &$ipn) { $transaction->status = COMMERCE_PAYMENT_STATUS_SUCCESS; $transaction->message .= t('Refund for transaction @txn_id', array('@txn_id' => $ipn['parent_txn_id'])); break; + + case 'Denied' : + $transaction->status = COMMERCE_PAYMENT_STATUS_FAILURE; + $transaction->message .= t("The payment has been denied. This happens only if the payment was previously pending."); + break; } // Save the transaction information. @@ -1049,7 +1072,7 @@ function commerce_paypal_ec_set_express_checkout($payment_method, $order, $flow) if (module_exists('commerce_shipping')) { // If we have a shipping address, pass it to PayPal and do not allow the // customer to set a new one at PayPal. - if (!empty($order_wrapper->commerce_customer_shipping->commerce_customer_address)) { + if (isset($order_wrapper->commerce_customer_shipping) && !empty($order_wrapper->commerce_customer_shipping->commerce_customer_address)) { $shipping_address = $order_wrapper->commerce_customer_shipping->commerce_customer_address->value(); // Ensure there's a name_line. @@ -1383,7 +1406,9 @@ function commerce_paypal_ec_customer_profile($order, $profile_type, $response, $ ); // Prepare an addressfield array to set to the customer profile. - $address = addressfield_default_values(); + $field = field_info_field('commerce_customer_address'); + $instance = field_info_instance('commerce_customer_profile', 'commerce_customer_address', $profile_type); + $address = addressfield_default_values($field, $instance); // Use the first name and last name if the profile is a billing profile. if ($profile_type == 'billing') { diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.info b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.info index 8b4ea845..6acd0c70 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.info @@ -11,9 +11,9 @@ core = 7.x ; Simple tests ; files[] = tests/commerce_paypal_wps.test -; Information added by Drupal.org packaging script on 2014-01-14 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2017-06-19 +version = "7.x-2.4" core = "7.x" project = "commerce_paypal" -datestamp = "1389740908" +datestamp = "1497908944" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.module b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.module index 3d34fa70..5ed1a0e7 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/payflow/commerce_payflow.module @@ -1447,6 +1447,7 @@ function commerce_payflow_link_result_message($result) { case 0: return t('Transaction approved.'); case 1: + return t('Account authentication error. Please contact an administrator to resolve this issue.'); case 5: case 26: return t('The Payflow hosted checkout page is not configured for use. Please contact an administrator to resolve this issue.'); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/commerce_paypal_wpp.info b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/commerce_paypal_wpp.info index e986ac66..8c1055e4 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/commerce_paypal_wpp.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/commerce_paypal_wpp.info @@ -11,9 +11,9 @@ core = 7.x ; Simple tests ; files[] = tests/commerce_paypal_wps.test -; Information added by Drupal.org packaging script on 2014-01-14 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2017-06-19 +version = "7.x-2.4" core = "7.x" project = "commerce_paypal" -datestamp = "1389740908" +datestamp = "1497908944" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/includes/commerce_paypal_wpp.admin.inc b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/includes/commerce_paypal_wpp.admin.inc index 9325ac80..ee7e3498 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/includes/commerce_paypal_wpp.admin.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wpp/includes/commerce_paypal_wpp.admin.inc @@ -98,10 +98,21 @@ function commerce_paypal_wpp_capture_form_submit($form, &$form_state) { $order = $form_state['order']; $payment_method = $form_state['payment_method']; $authorization_valid = TRUE; + $reauth_needed = TRUE; + + // Find a previous successful reauthorization. This is needed in edge cases + // where reauthorization was successful but capture failed. + foreach ($transaction->payload as $key => $payload) { + $is_reauth = strpos($key, 'reauthorization'); + if ($is_reauth && $payload['ACK'] == 'Success') { + $reauth_needed = FALSE; + break; + } + } // If the original authorization was more than 3 days ago, PayPal's honor // period is over and a reauthorization is required before capturing. - if (REQUEST_TIME - $transaction->created > 86400 * 3) { + if (REQUEST_TIME - $transaction->created > 86400 * 3 && $reauth_needed) { // Build a name-value pair array for the reauthorization. $nvp = array( 'METHOD' => 'DoReauthorization', @@ -112,7 +123,7 @@ function commerce_paypal_wpp_capture_form_submit($form, &$form_state) { // Submit the reauthorization request. $response = commerce_paypal_api_request($payment_method, $nvp, $order); - $transaction->payload[REQUEST_TIMESTAMP . '-reauthorization'] = $response; + $transaction->payload[REQUEST_TIME . '-reauthorization'] = $response; // If the response contains an authorization ID... if (!empty($response['AUTHORIZATIONID'])) { diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.info b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.info index a2da517d..307a135b 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.info @@ -11,9 +11,9 @@ core = 7.x ; Simple tests ; files[] = tests/commerce_paypal_wps.test -; Information added by Drupal.org packaging script on 2014-01-14 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2017-06-19 +version = "7.x-2.4" core = "7.x" project = "commerce_paypal" -datestamp = "1389740908" +datestamp = "1497908944" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.module b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.module index 7b761f8e..6eb51376 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_paypal/modules/wps/commerce_paypal_wps.module @@ -350,10 +350,15 @@ function commerce_paypal_wps_paypal_ipn_process($order, $payment_method, &$ipn) // Create the new profile now. $profile = commerce_customer_profile_new('billing', $order->uid); + // Prepare an addressfield array to set to the customer profile. + $field = field_info_field('commerce_customer_address'); + $instance = field_info_instance('commerce_customer_profile', 'commerce_customer_address', 'billing'); + $address = addressfield_default_values($field, $instance); + // Add the address value. $profile_wrapper = entity_metadata_wrapper('commerce_customer_profile', $profile); - $profile_wrapper->commerce_customer_address = array_merge(addressfield_default_values(), array( + $profile_wrapper->commerce_customer_address = array_merge($address, array( 'country' => $ipn['residence_country'], 'name_line' => $ipn['first_name'] . ' ' . $ipn['last_name'], 'first_name' => $ipn['first_name'], @@ -472,7 +477,7 @@ function commerce_paypal_wps_order_form($form, &$form_state, $order, $settings) $form['#action'] = commerce_paypal_wps_server_url($settings['server']); foreach ($data as $name => $value) { - if (!empty($value)) { + if (isset($value)) { $form[$name] = array('#type' => 'hidden', '#value' => $value); } } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.info b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.info index 64c0d0b9..fe7f1d84 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.info @@ -8,9 +8,7 @@ dependencies[] = commerce_product_reference dependencies[] = physical core = 7.x - -; Information added by drush on 2015-08-20 -version = "" +; Information added by drush on 2016-10-22 +version = "7.x-1.x-dev" project = "commerce_physical" -datestamp = "1440110605" - +datestamp = "1477171345" \ No newline at end of file diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.inline_conditions.inc b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.inline_conditions.inc new file mode 100644 index 00000000..21564626 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.inline_conditions.inc @@ -0,0 +1,75 @@ + t('Total order weight'), + 'entity type' => 'commerce_order', + 'callbacks' => array( + 'configure' => 'commerce_physical_order_weight_comparison_configure', + ), + ); + + return $conditions; +} + + /** + * Configuration callback for commerce_physical_order_weight_comparison_configure. + * + * @param array $settings + * An array of rules condition settings. + * + * @return array + * A form element array. + */ +function commerce_physical_order_weight_comparison_configure($settings) { + $form = array(); + + // Ensure the settings array contains default values. + $settings += array( + 'operator' => '>=', + 'value' => '', + 'unit' => '', + ); + + $form['operator'] = array( + '#type' => 'select', + '#multiple' => FALSE, + '#options' => commerce_numeric_comparison_operator_options_list(), + '#title' => t('Operator'), + '#title_display' => 'invisible', + '#default_value' => $settings['operator'], + '#require' => TRUE, + ); + + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Value'), + '#title_display' => 'invisible', + '#default_value' => $settings['value'], + '#size' => 5, + '#required' => TRUE, + '#element_validate' => array('element_validate_number'), + ); + + $form['unit'] = array( + '#type' => 'select', + '#multiple' => FALSE, + '#options' => physical_weight_unit_options(), + '#title' => t('Weight unit'), + '#title_display' => 'invisible', + '#default_value' => $settings['unit'], + '#require' => TRUE, + ); + + return $form; +} diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.module b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.module index dde39e28..c5b040d0 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.module @@ -2,52 +2,95 @@ /** * @file - * Provides API support for working with physical product types in Drupal Commerce. + * API for working with physical product types in Drupal Commerce. */ /** * Determines the weight field to use for a given entity. * - * @param $entity_type + * @param string $entity_type * The type of entity passed to the function. - * @param $entity + * @param object $entity * The actual entity whose weight field name should be determined. * - * @return + * @return string * The name of the field to use on the entity to find a weight value or NULL * if none was found. */ function commerce_physical_entity_weight_field_name($entity_type, $entity) { + + $field_name = commerce_physical_entity_field_name($entity_type, $entity, 'physical_weight'); + + // Allow other modules to specify a different field name. + drupal_alter('commerce_physical_entity_weight_field_name', $field_name, $entity_type, $entity); + + return $field_name; +} + +/** + * Determines the dimensions field to use for a given entity. + * + * @param string $entity_type + * The type of entity passed to the function. + * @param object $entity + * The actual entity whose weight field name should be determined. + * + * @return string + * The name of the field to use on the entity to find a weight value or NULL + * if none was found. + */ +function commerce_physical_entity_dimensions_field_name($entity_type, $entity) { + + $field_name = commerce_physical_entity_field_name($entity_type, $entity, 'physical_dimensions'); + + // Allow other modules to specify a different field name. + drupal_alter('commerce_physical_entity_dimensions_field_name', $field_name, $entity_type, $entity); + + return $field_name; +} + +/** + * Determines the field of a certain type to use for a given entity. + * + * @param string $entity_type + * The type of entity passed to the function. + * @param object $entity + * The actual entity whose weight field name should be determined. + * @param string $field_type + * The field type to use. + * + * @return string + * The name of the field to use on the entity to find a weight value or NULL + * if none was found. + */ +function commerce_physical_entity_field_name($entity_type, $entity, $field_type) { $bundle = field_extract_bundle($entity_type, $entity); $field_name = NULL; - // Look for the first weight field available for the entity. + // Look for the first field available for the entity. foreach (field_info_instances($entity_type, $bundle) as $instance_name => $instance) { // Load the field info for the current instance. $field = field_info_field($instance['field_name']); // If it's of the proper type... - if ($field['type'] == 'physical_weight') { + if ($field['type'] == $field_type) { // Save its name and exit the loop. $field_name = $instance_name; break; } } - // Allow other modules to specify a different field name. - drupal_alter('commerce_physical_entity_weight_field_name', $field_name, $entity_type, $entity); - return $field_name; } /** * Determines the weight to use for a product line item on an order. * - * @param $line_item + * @param commerce_line_item $line_item * A product line item whose weight should be determined. * - * @return + * @return array * A weight field value array representing the weight of the product line item * or NULL if none was found. */ @@ -80,15 +123,57 @@ function commerce_physical_product_line_item_weight($line_item) { return $weight; } +/** + * Determines the dimensions of a product line item on an order. + * + * @param commerce_line_item $line_item + * A product line item whose dimensions should be determined. + * + * @return array + * An array of dimensions field value arrays. There'll be one entry in the + * array per product, with the entry being an array of that product's + * dimensions. If this line item contains no products with dimensions, an + * empty array will be returned. + */ +function commerce_physical_product_line_item_dimensions($line_item) { + $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); + $dimensions = array(); + + // If the line item references a valid product... + if (!empty($line_item_wrapper->commerce_product)) { + $product = $line_item_wrapper->commerce_product->value(); + + if (!empty($product)) { + // If the product has a valid dimensions field... + $field_name = commerce_physical_entity_dimensions_field_name('commerce_product', $product); + + if (!empty($field_name) && !empty($product->{$field_name})) { + $product_wrapper = entity_metadata_wrapper('commerce_product', $product); + + // Add dimension values per product in the line item. + for ($i = 0; $i < $line_item_wrapper->quantity->value(); $i++) { + $dimensions[] = $product_wrapper->{$field_name}->value(); + } + } + } + } + + // Allow other modules to alter the weight if necessary. + drupal_alter('commerce_physical_product_line_item_dimensions', $dimensions, $line_item); + + return $dimensions; +} + + /** * Determines the weight of an entire order. * - * @param $order + * @param commerce_order $order * The order object whose weight value should be calculated. - * @param $unit + * @param string $unit * The unit of measurement to use for the returned weight of the order. * - * @return + * @return array * A weight field value array representing the total weight of the order using * the specified unit of measurement or NULL if no weight could be determined. */ @@ -99,7 +184,7 @@ function commerce_physical_order_weight($order, $unit = 'lb') { // Loop over each line item on the order. foreach ($order_wrapper->commerce_line_items as $delta => $line_item_wrapper) { // Get the weight value of product line items. - if (in_array($line_item_wrapper->type->value(), commerce_product_line_item_types())) { + if (in_array($line_item_wrapper->getBundle(), commerce_product_line_item_types())) { $line_item_weight = commerce_physical_product_line_item_weight($line_item_wrapper->value()); // Add it to the running total converting it to the required weight unit. @@ -123,87 +208,16 @@ function commerce_physical_order_weight($order, $unit = 'lb') { } -/** - * Determines the dimensions field to use for a given entity. - * - * @param $entity_type - * The type of entity passed to the function. - * @param $entity - * The actual entity whose dimensions field name should be determined. - * - * @return - * The name of the field to use on the entity to find a dimensions value or - * NULL if none was found. - */ -function commerce_physical_entity_dimensions_field_name($entity_type, $entity) { - $bundle = field_extract_bundle($entity_type, $entity); - $field_name = NULL; - - // Look for the first dimensions field available for the entity. - foreach (field_info_instances($entity_type, $bundle) as $instance_name => $instance) { - // Load the field info for the current instance. - $field = field_info_field($instance['field_name']); - - // If it's of the proper type... - if ($field['type'] == 'physical_dimensions') { - // Save its name and exit the loop. - $field_name = $instance_name; - break; - } - } - - // Allow other modules to specify a different field name. - drupal_alter('commerce_physical_entity_dimensions_field_name', $field_name, $entity_type, $entity); - - return $field_name; -} - -/** - * Determines the dimensions to use for a product line item on an order. - * - * @param $line_item - * A product line item whose single quantity dimensions should be determined. - * - * @return - * A dimensions field value array representing the dimensions of a single - * product referenced by the line item or NULL if no dimensions were found. - */ -function commerce_physical_product_line_item_dimensions($line_item) { - $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item); - $dimensions = NULL; - - // If the line item references a valid product... - if (!empty($line_item_wrapper->commerce_product)) { - $product = $line_item_wrapper->commerce_product->value(); - - if (!empty($product)) { - // If the product has a valid dimensions field... - $field_name = commerce_physical_entity_dimensions_field_name('commerce_product', $product); - - if (!empty($field_name) && !empty($product->{$field_name})) { - // Extract the dimensions value from the product. - $product_wrapper = entity_metadata_wrapper('commerce_product', $product); - $dimensions = $product_wrapper->{$field_name}->value(); - } - } - } - - // Allow other modules to alter the volume if necessary. - drupal_alter('commerce_physical_product_line_item_dimensions', $dimensions, $line_item); - - return $dimensions; -} - /** * Determines the volume of an entire order. * - * @param $order + * @param commerce_order $order * The order object whose volume should be calculated. - * @param $unit + * @param string $unit * The unit of measurement to convert dimensions to before calculating the * volume of the order in the related cubic unit. * - * @return + * @return array * A volume value array with keys representing the total 'volume' of the order * in the 'unit' specified or NULL if no volume could be determined. */ @@ -216,6 +230,9 @@ function commerce_physical_order_volume($order, $unit = 'in') { // Get the dimensions value of product line items. if (in_array($line_item_wrapper->type->value(), commerce_product_line_item_types())) { $line_item_dimensions = commerce_physical_product_line_item_dimensions($line_item_wrapper->value()); + // Each product in a line item has the same dimensions, so we index into + // only the first product. + $line_item_dimensions = reset($line_item_dimensions); // Add it to the running total converting it to the required weight unit. if (!physical_field_is_empty($line_item_dimensions, array('type' => 'physical_dimensions'))) { @@ -242,13 +259,57 @@ function commerce_physical_order_volume($order, $unit = 'in') { return $volume; } + +/** + * Determines the dimensions of each product in an entire order. + * + * Other code can then use this data to figure out things like what the maximum + * dimensions of any product in the order is, or what size shipping container + * everything will fit into. + * + * @param commerce_order $order + * The order object whose dimensions should be returned. + * @param string $unit + * The unit of measurement to use for the returned dimensions. + * + * @return array + * An array of dimension arrays. One per product in the order. + * weight field value array representing the total weight of the order using + * the specified unit of measurement or NULL if no weight could be determined. + */ +function commerce_physical_order_dimensions($order, $unit = 'cm') { + $order_wrapper = entity_metadata_wrapper('commerce_order', $order); + + $order_dimensions = array(); + + // Loop over each line item on the order. + foreach ($order_wrapper->commerce_line_items as $delta => $line_item_wrapper) { + // Get the weight value of product line items. + if (in_array($line_item_wrapper->type->value(), commerce_product_line_item_types())) { + $line_item_dimensions = commerce_physical_product_line_item_dimensions($line_item_wrapper->value()); + + $order_dimensions = array_merge($order_dimensions, $line_item_dimensions); + } + } + + // Now ensure that all dimensions supplied are in the requested units. + foreach ($order_dimensions as $key => $dimensions) { + $order_dimensions[$key] = physical_dimensions_convert($dimensions, $unit); + } + + // Allow other modules to alter the weight if necessary. + drupal_alter('commerce_physical_order_dimensions', $order_dimensions, $order, $unit); + + return $order_dimensions; +} + /** * Determines whether or not a line item should be considered shippable. * - * @param $line_item + * @param commerce_line_item $line_item * The line item object whose shippability is being determined. * - * @return + * @return bool * Boolean indicating whether or not the given line item represents something * shippable; defaults to FALSE unless the line item represents a product line * item with a discernible weight. @@ -275,10 +336,10 @@ function commerce_physical_line_item_shippable($line_item) { /** * Determines whether or not an order should be considered shippable. * - * @param $order + * @param commerce_order $order * The order object whose shippability should be determined. * - * @return + * @return bool * Boolean indicating whether or not the given order is shippable; defaults to * FALSE unless any line item on the order is determined to be shippable. */ @@ -302,14 +363,13 @@ function commerce_physical_order_shippable($order) { } /** - * Determines the name of the shipping customer profile reference field for the - * given order. + * Name of the shipping customer profile reference field for the given order. * - * @param $order + * @param commerce_order $order * The order whose shipping customer profile reference field name should be * determined. * - * @return + * @return string * The name of the field to use on the order to find shipping information or * NULL if none was found; defaults to commerce_customer_shipping if available * or another customer profile reference if not (preferring profiles other @@ -348,10 +408,10 @@ function commerce_physical_order_shipping_field_name($order) { /** * Determines the name of the phone number field of a customer profile. * - * @param $profile + * @param commerce_cutomer_profile $profile * The customer profile whose phone number field name should be determined. * - * @return + * @return string * The name of the field to use on the customer profile to find a phone number * or NULL if none was found. Defaults to field_phone or field_phone_number if * available; otherwise it's up to you to alter it in a custom module since we @@ -375,13 +435,12 @@ function commerce_physical_customer_profile_phone_number_field_name($profile) { } /** - * Determines whether or not a shipping customer profile should be considered as - * a residential address. + * Whether or not a shipping customer profile is a residential address. * - * @param $profile + * @param commerce_customer_profile $profile * The customer profile whose residential status should be determined. * - * @return + * @return bool * Boolean indicating whether or not the given profile has a residential * address; defaults to TRUE unless otherwise determined by a custom module. */ diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.rules.inc b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.rules.inc new file mode 100644 index 00000000..807867e3 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_physical/commerce_physical.rules.inc @@ -0,0 +1,186 @@ + t("Order total weight comparison"), + 'parameter' => array( + 'commerce_order' => array( + 'type' => 'commerce_order', + 'label' => t('Order'), + ), + 'operator' => array( + 'type' => 'text', + 'label' => t('Operator'), + 'description' => t('The comparison operator.'), + 'options list' => 'commerce_numeric_comparison_operator_options_list', + 'restriction' => 'input', + ), + 'value' => array( + 'type' => 'decimal', + 'label' => t('Value'), + ), + 'unit' => array( + 'type' => 'text', + 'label' => t('Weight unit'), + 'options list' => 'physical_weight_unit_options', + 'restriction' => 'input', + 'default value' => 'kg', + ), + ), + 'group' => t('Commerce Physical'), + ); + + $conditions['commerce_physical_rules_order_max_dimension_comparison'] = array( + 'label' => t("Maximum product dimension comparison"), + 'parameter' => array( + 'commerce_order' => array( + 'type' => 'commerce_order', + 'label' => t('Order'), + ), + 'operator' => array( + 'type' => 'text', + 'label' => t('Operator'), + 'description' => t('The comparison operator.'), + 'options list' => 'commerce_numeric_comparison_operator_options_list', + 'restriction' => 'input', + ), + 'value' => array( + 'type' => 'decimal', + 'label' => t('Value'), + ), + 'unit' => array( + 'type' => 'text', + 'label' => t('Dimension unit'), + 'options list' => 'physical_dimension_unit_options', + 'restriction' => 'input', + 'default value' => 'cm', + ), + ), + 'group' => t('Commerce Physical'), + ); + + $conditions['commerce_physical_rules_order_is_shippable'] = array( + 'label' => t("The order contains shippable products"), + 'parameter' => array( + 'commerce_order' => array( + 'type' => 'commerce_order', + 'label' => t('Order'), + ), + ), + 'group' => t('Commerce Physical'), + ); + + $conditions['commerce_physical_rules_line_item_is_shippable'] = array( + 'label' => t("The line item is a shippable product"), + 'parameter' => array( + 'commerce_line_item' => array( + 'type' => 'commerce_line_item', + 'label' => t('Line Item'), + ), + ), + 'group' => t('Commerce Physical'), + ); + + return $conditions; +} + + +/** + * Fetches the max. dimension in the order and compares it with a given value. + * + * Calculates the maximum single dimension of any product in the order and + * performs a comparison on it. + */ +function commerce_physical_rules_order_max_dimension_comparison($order, $operator, $value, $unit) { + + $max_dimension = 0; + + $dimension_keys = array( + 'length', + 'width', + 'height', + ); + + // Get the dimensions of every product in the order. + foreach (commerce_physical_order_dimensions($order, $unit) as $dimension) { + + // Check each of length / width / height. + foreach ($dimension_keys as $dimension_key) { + + // If this dimension's bigger than the current max, it's the new max. + if ($dimension[$dimension_key] > $max_dimension) { + $max_dimension = $dimension[$dimension_key]; + } + } + } + + switch ($operator) { + case '<': + return $max_dimension < $value; + + case '<=': + return $max_dimension <= $value; + + case '==': + return $max_dimension == $value; + + case '>=': + return $max_dimension >= $value; + + case '>': + return $max_dimension > $value; + } + + return FALSE; +} + +/** + * Calculates the order's total weight and performs a comparison on it. + */ +function commerce_physical_rules_order_weight_comparison($order, $operator, $value, $unit) { + + $order_weight = commerce_physical_order_weight($order, $unit); + + switch ($operator) { + case '<': + return $order_weight['weight'] < $value; + + case '<=': + return $order_weight['weight'] <= $value; + + case '==': + return $order_weight['weight'] == $value; + + case '>=': + return $order_weight['weight'] >= $value; + + case '>': + return $order_weight['weight'] > $value; + } + + return FALSE; +} + +/** + * Rules condition: check if the order contains shippable products. + */ +function commerce_physical_rules_order_is_shippable($order) { + return commerce_physical_order_shippable($order); +} + +/** + * Rules condition: check if the line item is a shippable product. + */ +function commerce_physical_rules_line_item_is_shippable($line_item) { + return commerce_physical_line_item_shippable($line_item); +} \ No newline at end of file diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_search_api/commerce_search_api.facetapi_defaults.inc b/profiles/commerce_kickstart/modules/contrib/commerce_search_api/commerce_search_api.facetapi_defaults.inc index eb734d51..efc28110 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_search_api/commerce_search_api.facetapi_defaults.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_search_api/commerce_search_api.facetapi_defaults.inc @@ -1,12 +1,17 @@ 'Configure the generated product display index.', 'page callback' => 'drupal_get_form', 'page arguments' => array('commerce_search_api_admin_settings_form'), - 'access callback' => 'commerce_search_api_admin_settings_access', - 'access arguments' => array('administer site configuration'), + 'access arguments' => array('configure store'), 'type' => MENU_NORMAL_ITEM, 'file' => 'includes/commerce_search_api.admin.inc', ); return $items; } -/** - * Access calback for the index admin settings form. - */ -function commerce_search_api_admin_settings_access($permission) { - return search_api_index_load('product_display') && user_access($permission); -} - /** * Implements hook_default_search_api_index(). * * Create an automatic product display index. */ function commerce_search_api_default_search_api_index() { + // Don't generate a default Search Index if unnecessary. + if (!variable_get('commerce_search_api_provide_default_index', TRUE)) { + return; + } + module_load_include('inc', 'commerce_search_api', 'includes/commerce_search_api.callbacks'); $server = search_api_server_load('frontend'); if (empty($server)) { $servers = search_api_server_load_multiple(FALSE); @@ -52,256 +50,10 @@ function commerce_search_api_default_search_api_index() { } $server = reset($servers); } - $items['product_display'] = commerce_search_api_generate_product_display_index($server, 'product_display'); + $items[COMMERCE_SEARCH_API_INDEX] = commerce_search_api_generate_product_display_index($server, COMMERCE_SEARCH_API_INDEX); return $items; } -/** - * Generate a SearchApiIndex with common defaults configuration. - * - * @param SearchApiServer $server - * The server the generated index will resides on. - * - * @param $index_machine_name - * The machine name of the generated index. - * - * @return SearchApiIndex - * The generated SearchApiIndex. - */ -function commerce_search_api_generate_product_display_index(SearchApiServer $server, $index_machine_name) { - $product_reference_fields = commerce_info_fields('commerce_product_reference', 'node'); - // We only generate an index if there are product display types. - if (empty($product_reference_fields) || !isset($server->machine_name)) { - return entity_create('search_api_index', array()); - } - $title = 'title'; - // Check if we should index the translated title or not. - if (module_exists('title') && $title_field = title_field_replacement_info('node', 'title')) { - $title = $title_field['field']['field_name']; - } - // We prepend temp_ to the machine name to prevent Search API from caching - // the wrong fields when calling the getFields() method. - $values = array( - 'name' => t('Product display'), - 'machine_name' => 'temp_' . $index_machine_name, - 'server' => $server->machine_name, - 'item_type' => 'node', - 'enabled' => 1, - 'read_only' => 0, - 'options' => array( - 'index_directly' => 1, - 'cron_limit' => 50, - 'fields' => array( - 'nid' => array( - 'type' => 'integer', - ), - 'search_api_language' => array( - 'type' => 'string', - ), - 'type' => array( - 'type' => 'string', - ), - $title => array( - 'type' => 'string', - ), - 'created' => array( - 'type' => 'date', - ), - 'changed' => array( - 'type' => 'date', - ), - 'status' => array( - 'type' => 'integer', - ), - 'search_api_aggregation_1' => array( - 'type' => 'text', - ), - ), - 'data_alter_callbacks' => array( - 'commerce_search_api_product_display_filter' => array( - 'status' => 1, - 'weight' => -10, - ), - 'commerce_search_api_alter_product_status' => array( - 'status' => 1, - 'weight' => -9, - ), - 'search_api_alter_add_aggregation' => array( - 'status' => 1, - 'weight' => 0, - 'settings' => array( - 'fields' => array( - 'search_api_aggregation_1' => array( - 'name' => t('Title (Fulltext)'), - 'type' => 'fulltext', - 'fields' => array( - $title, - ), - 'description' => t('A Fulltext aggregation of the title field.'), - ), - ), - ), - ), - ), - ), - ); - // If a product reference field is called field_product, take it. - if (isset($product_reference_fields['field_product'])) { - $product_reference_field = $product_reference_fields['field_product']; - } - // Else, take the first one. - else { - $product_reference_field = reset($product_reference_fields); - } - $type = $product_reference_field['cardinality'] != 1 ? 'list
' . t('Please verify you have supplied all required information or contact us to resolve the issue.') . ''; } else { - // If live shipping rate recalculation is required, check if we can show shipping options. + // If live shipping rate recalculation is required, check if we can show + // shipping options. if (commerce_shipping_recalculate_services($form, NULL, TRUE) && empty($form_state['recalculate'])) { $message = t('Please supply all of the required information requested above to reveal your shipping options.'); } @@ -160,7 +160,9 @@ function commerce_shipping_pane_checkout_form($form, &$form_state, $checkout_pan } /** - * Ajax callback: Returns the shipping details form elements that match the + * Ajax callback. + * + * Returns the shipping details form elements that match the * currently selected shipping service. */ function commerce_shipping_pane_service_details_refresh($form, $form_state) { @@ -178,20 +180,6 @@ function commerce_shipping_recalculate_services_refresh($form, $form_state) { * Validate callback for recalculating shipping services. */ function commerce_shipping_recalculate_services_validate($form, &$form_state) { - - // Load latest version of the order. - $order = commerce_order_load($form_state['order']->order_id); - // Check if the order is still on the same checkout step. - $checkout_page = $form_state['checkout_page']; - if ($form_state['order']->changed < $order->changed || !commerce_checkout_page_access($checkout_page, $order)) { - // Clear all errors. - form_clear_error(); - watchdog('access denied', check_plain($_GET['q']), NULL, WATCHDOG_WARNING); - drupal_set_message(t('You are not authorized to access this command.'), 'error'); - $form_state['rebuild'] = TRUE; - return FALSE; - } - // Call all validation callbacks. $recalculate = commerce_shipping_recalculate_services($form, $form_state); @@ -210,7 +198,8 @@ function commerce_shipping_recalculate_services_validate($form, &$form_state) { $form_state['rebuild'] = TRUE; } - // Store the validation result so that it can be examined in the submit handler. + // Store the validation result so that it can be examined + // in the submit handler. $form_state['recalculate'] = $recalculate; return TRUE; @@ -261,8 +250,8 @@ function commerce_shipping_recalculate_services_submit($form, &$form_state) { $profile = $wrapper->{$source_field_name}->value(); } elseif (!empty($form_state['order']->data['profiles'][$source_id])) { - // Otherwise fallback to the customer profile referenced in the order - // data array. + // Otherwise fallback to the customer profile referenced + // in the order data array. $profile = commerce_customer_profile_load($form_state['order']->data['profiles'][$source_id]); } @@ -275,9 +264,14 @@ function commerce_shipping_recalculate_services_submit($form, &$form_state) { } // Unset any cached addressfield data for this customer profile. - foreach ($form_state['addressfield'] as $key => $value) { - if (strpos($key, 'commerce_customer_profile|' . $type) === 0) { - unset($form_state['addressfield'][$key]); + foreach (field_read_fields(array('type' => 'addressfield')) as $field) { + if (isset($form_state['input']['customer_profile_' . $type][$field['field_name']])) { + foreach ($form_state['input']['customer_profile_' . $type][$field['field_name']][LANGUAGE_NONE][0] as $key => &$value) { + if ($key == 'country') { + continue; + } + $value = ''; + } } } } @@ -298,10 +292,12 @@ function commerce_shipping_recalculate_services_submit($form, &$form_state) { // Save the order and rebuild the form to reflect the updated customer data. if ($rebuild) { // Avoid overwriting an already updated order. - $stored_order = commerce_order_load($order->order_id); + $stored_order = entity_load_unchanged('commerce_order', $order->order_id); + if ($stored_order->changed <= $order->changed) { commerce_order_save($order); } + $form_state['rebuild'] = TRUE; } } @@ -342,9 +338,9 @@ function commerce_shipping_pane_checkout_form_validate($form, &$form_state, $che if ($callback = commerce_shipping_service_callback($shipping_service, 'details_form_validate')) { $result = $callback($pane_form['service_details'], $pane_values['service_details'], $shipping_service, $order, array($checkout_pane['pane_id'], 'service_details')); - // To prevent payment method validation routines from having to return TRUE - // explicitly, only return FALSE if it was specifically returned. Otherwise - // default to TRUE. + // To prevent payment method validation routines from having to return + // TRUE explicitly, only return FALSE if it was specifically returned. + // Otherwise default to TRUE. return $result === FALSE ? FALSE : TRUE; } } @@ -406,7 +402,9 @@ function commerce_shipping_pane_checkout_form_submit($form, &$form_state, $check } /** - * Checkout pane callback: show the selected shipping service on the review pane. + * Checkout pane callback. + * + * Show the selected shipping service on the review pane. */ function commerce_shipping_pane_review($form, $form_state, $checkout_pane, $order) { $order_wrapper = entity_metadata_wrapper('commerce_order', $order); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/commerce_shipping_ui.admin.inc b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/commerce_shipping_ui.admin.inc index 1f2d705f..80450e97 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/commerce_shipping_ui.admin.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/commerce_shipping_ui.admin.inc @@ -57,7 +57,7 @@ function commerce_shipping_ui_overview($type, $method = NULL) { array( 'data' => $empty_text, 'colspan' => 2, - ) + ), ); } @@ -67,7 +67,7 @@ function commerce_shipping_ui_overview($type, $method = NULL) { /** * Builds an overview of a shipping method for display to an administrator. * - * @param $variables + * @param array $variables * An array of variables used to generate the display; by default includes the * shipping_method key with a value of the shipping method info array. * @@ -87,7 +87,7 @@ function theme_shipping_method_admin_overview($variables) { /** * Builds an overview of a shipping service for display to an administrator. * - * @param $variables + * @param array $variables * An array of variables used to generate the display; by default includes the * shipping_service key with a value of the shipping service info array. * @@ -112,7 +112,11 @@ function commerce_shipping_ui_rate_calculation_rules() { $content['enabled']['title']['#markup'] = '
' . t('Enabled shipping rate calculation rules') . '
'; - $conditions = array('event' => 'commerce_shipping_calculate_rate', 'plugin' => 'reaction rule', 'active' => TRUE); + $conditions = array( + 'event' => 'commerce_shipping_calculate_rate', + 'plugin' => 'reaction rule', + 'active' => TRUE, + ); $content['enabled']['rules'] = RulesPluginUI::overviewTable($conditions, $options); $content['enabled']['rules']['#empty'] = t('There are no active shipping rate calculation rules.'); diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/commerce_shipping.views.inc b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/commerce_shipping.views.inc index 2205dfaf..eeda8393 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/commerce_shipping.views.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/commerce_shipping.views.inc @@ -5,9 +5,8 @@ * Defines Views integration for Commerce Shipping. */ - /** - * Implements hook_views_data_alter() + * Implements hook_views_data_alter(). */ function commerce_shipping_views_data_alter(&$data) { // Add a relationship to the order table to join to a representative shipping diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/handlers/commerce_shipping_handler_relationship_shipping_line_item_representative.inc b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/handlers/commerce_shipping_handler_relationship_shipping_line_item_representative.inc index 3e4c979e..c5b1f6a8 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/handlers/commerce_shipping_handler_relationship_shipping_line_item_representative.inc +++ b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/includes/views/handlers/commerce_shipping_handler_relationship_shipping_line_item_representative.inc @@ -6,14 +6,15 @@ */ class commerce_shipping_handler_relationship_shipping_line_item_representative extends views_handler_relationship { - function label() { + + public function label() { if (!isset($this->options['label'])) { return $this->ui_name(); } return $this->options['label']; } - function query() { + public function query() { // Get the JOIN type from the relationship settings. $join_type = empty($this->options['required']) ? 'LEFT' : 'INNER'; @@ -40,4 +41,5 @@ class commerce_shipping_handler_relationship_shipping_line_item_representative e $alias = 'commerce_order_shipping_line_item_representiative'; $this->alias = $this->query->add_relationship($alias, $join, 'commerce_line_item', $this->relationship); } + } diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.info b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.info index 16cc4590..39927ff5 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.info +++ b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.info @@ -5,9 +5,9 @@ dependencies[] = commerce dependencies[] = commerce_shipping core = 7.x -; Information added by Drupal.org packaging script on 2015-04-08 -version = "7.x-2.2" +; Information added by Drupal.org packaging script on 2017-11-28 +version = "7.x-2.3" core = "7.x" project = "commerce_shipping" -datestamp = "1428479882" +datestamp = "1511853188" diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.module b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.module index 0c75e74a..dcfa75a6 100644 --- a/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.module +++ b/profiles/commerce_kickstart/modules/contrib/commerce_shipping/modules/commerce_shipping_example.module @@ -5,7 +5,6 @@ * Defines an example shipping method for testing and development. */ - /** * Implements hook_commerce_shipping_method_info(). */ @@ -44,7 +43,9 @@ function commerce_shipping_example_commerce_shipping_service_info() { } /** - * Shipping service callback: returns a base price array for a shipping service + * Shipping service callback. + * + * Returns a base price array for a shipping service * calculated for the given order. */ function commerce_shipping_example_service_rate($shipping_service, $order) { @@ -100,7 +101,9 @@ function commerce_shipping_example_service_details_form_validate($details_form, } /** - * Shipping service callback: increases the shipping line item's unit price if + * Shipping service callback. + * + * Increases the shipping line item's unit price if * express delivery was selected. */ function commerce_shipping_example_service_details_form_submit($details_form, $details_values, $line_item) { diff --git a/profiles/commerce_kickstart/modules/contrib/commerce_yotpo/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/commerce_yotpo/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/commerce_yotpo/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + +'. t('CTools Javascript Widgets') .'
'; + // Show examples of ctools javascript widgets. + $output .= '' . t('CTools Javascript Widgets') . '
'; - // Create a drop down menu + // Create a drop down menu. $links = array(); $links[] = array('title' => t('Link 1'), 'href' => $_GET['q']); $links[] = array('title' => t('Link 2'), 'href' => $_GET['q']); @@ -201,16 +201,16 @@ function ctools_ajax_sample_page() { $output .= '' . t('Drop Down Menu') . '
'; $output .= theme('ctools_dropdown', array('title' => t('Click to Drop Down'), 'links' => $links)); - // Create a collapsible div + // Create a collapsible div. $handle = t('Click to Collapse'); $content = 'Nulla ligula ante, aliquam at adipiscing egestas, varius vel arcu. Etiam laoreet elementum mi vel consequat. Etiam scelerisque lorem vel neque consequat quis bibendum libero congue. Nulla facilisi. Mauris a elit a leo feugiat porta. Phasellus placerat cursus est vitae elementum.'; - $output .= ''. t('Collapsible Div') .'
'; + $output .= '' . t('Collapsible Div') . '
'; $output .= theme('ctools_collapsible', array('handle' => $handle, 'content' => $content, 'collapsed' => FALSE)); - // Create a jump menu + // Create a jump menu. ctools_include('jump-menu'); $form = drupal_get_form('ctools_ajax_sample_jump_menu_form'); - $output .= ''. t('Jump Menu') .'
'; + $output .= '' . t('Jump Menu') . '
'; $output .= drupal_render($form); return array('markup' => array('#markup' => $output)); @@ -225,7 +225,8 @@ function ctools_ajax_sample_hello($js = NULL) { ctools_include('ajax'); $commands = array(); $commands[] = ajax_command_html('#ctools-sample', $output); - print ajax_render($commands); // this function exits. + // This function exits. + print ajax_render($commands); exit; } else { @@ -234,7 +235,7 @@ function ctools_ajax_sample_hello($js = NULL) { } /** - * Nix a row from a table and restripe. + * Nix a row from a table and restripe. */ function ctools_ajax_sample_tablenix($js, $row) { if (!$js) { @@ -272,7 +273,7 @@ function ctools_ajax_sample_login($js = NULL) { $output = array(); $inplace = ctools_ajax_text_button(t('remain here'), 'ctools_ajax_sample/nojs/login/inplace', t('Go to your account')); $account = ctools_ajax_text_button(t('your account'), 'ctools_ajax_sample/nojs/login/user', t('Go to your account')); - $output[] = ctools_modal_command_display(t('Login Success'), ''); + $output[] = ctools_modal_command_display(t('Login Success'), ''); } print ajax_render($output); exit; @@ -283,7 +284,7 @@ function ctools_ajax_sample_login($js = NULL) { */ function ctools_ajax_sample_login_success($js, $action) { if (!$js) { - // we should never be here out of ajax context + // We should never be here out of ajax context. return MENU_NOT_FOUND; } @@ -291,11 +292,11 @@ function ctools_ajax_sample_login_success($js, $action) { ctools_add_js('ajax-responder'); $commands = array(); if ($action == 'inplace') { - // stay here + // Stay here. $commands[] = ctools_ajax_command_reload(); } else { - // bounce bounce + // Bounce bounce. $commands[] = ctools_ajax_command_redirect('user'); } print ajax_render($commands); @@ -318,18 +319,18 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { 'show back' => TRUE, 'show cancel' => TRUE, 'show return' => FALSE, - 'next callback' => 'ctools_ajax_sample_wizard_next', + 'next callback' => 'ctools_ajax_sample_wizard_next', 'finish callback' => 'ctools_ajax_sample_wizard_finish', 'cancel callback' => 'ctools_ajax_sample_wizard_cancel', - // this controls order, as well as form labels + // This controls order, as well as form labels. 'order' => array( 'start' => t('Choose animal'), ), - // here we map a step to a form id. + // Here we map a step to a form id. 'forms' => array( - // e.g. this for the step at wombat/create + // e.g. this for the step at wombat/create. 'start' => array( - 'form id' => 'ctools_ajax_sample_start' + 'form id' => 'ctools_ajax_sample_start', ), ), ); @@ -341,7 +342,6 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { // in creation. // // We skip all this here by just using an id of 1. - $object_id = 1; if (empty($step)) { @@ -406,7 +406,7 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { $commands[] = ajax_command_html('#ctools-sample', $animal); $commands[] = ctools_modal_command_dismiss(); } - else if (!empty($form_state['cancel'])) { + elseif (!empty($form_state['cancel'])) { // If cancelling, return to the activity. $commands[] = ctools_modal_command_dismiss(); } @@ -420,7 +420,7 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { if ($output === FALSE || !empty($form_state['complete'])) { return $animal; } - else if (!empty($form_state['cancel'])) { + elseif (!empty($form_state['cancel'])) { drupal_goto('ctools_ajax_sample'); } else { @@ -430,11 +430,11 @@ function ctools_ajax_sample_animal($js = NULL, $step = NULL) { } // --------------------------------------------------------------------------- -// Themes - +// Themes. /** * Theme function for main rendered output. */ + function theme_ctools_ajax_sample_container($vars) { $output = '';
$output .= $vars['content'];
@@ -445,7 +445,6 @@ function theme_ctools_ajax_sample_container($vars) {
// ---------------------------------------------------------------------------
// Stuff needed for our little wizard.
-
/**
* Get a list of our animals and associated forms.
*
@@ -453,6 +452,7 @@ function theme_ctools_ajax_sample_container($vars) {
* which is often how it will work in the real world. If using CTools, what
* you would probably really have, here, is a set of plugins for each animal.
*/
+
function ctools_ajax_sample_animals() {
return array(
'sheep' => array(
@@ -478,10 +478,10 @@ function ctools_ajax_sample_animals() {
// ---------------------------------------------------------------------------
// Wizard caching helpers.
-
/**
* Store our little cache so that we can retain data from form to form.
*/
+
function ctools_ajax_sample_cache_set($id, $object) {
ctools_include('object-cache');
ctools_object_cache_set('ctools_ajax_sample', $id, $object);
@@ -495,7 +495,7 @@ function ctools_ajax_sample_cache_get($id) {
$object = ctools_object_cache_get('ctools_ajax_sample', $id);
if (!$object) {
// Create a default object.
- $object = new stdClass;
+ $object = new stdClass();
$object->type = 'unknown';
$object->name = '';
}
@@ -513,12 +513,12 @@ function ctools_ajax_sample_cache_clear($id) {
// ---------------------------------------------------------------------------
// Wizard in-between helpers; what to do between or after forms.
-
/**
* Handle the 'next' click on the add/edit pane form wizard.
*
* All we need to do is store the updated pane in the cache.
*/
+
function ctools_ajax_sample_wizard_next(&$form_state) {
ctools_ajax_sample_cache_set($form_state['object_id'], $form_state['object']);
}
@@ -542,10 +542,10 @@ function ctools_ajax_sample_wizard_cancel(&$form_state) {
// ---------------------------------------------------------------------------
// Wizard forms for our simple info collection wizard.
-
/**
* Wizard start form. Choose an animal.
*/
+
function ctools_ajax_sample_start($form, &$form_state) {
$form_state['title'] = t('Choose animal');
@@ -713,7 +713,7 @@ function ctools_ajax_sample_show_raptor($object) {
}
/**
- * Helper function to provide a sample jump menu form
+ * Helper function to provide a sample jump menu form.
*/
function ctools_ajax_sample_jump_menu_form() {
$url = url('ctools_ajax_sample/jumped');
@@ -723,7 +723,7 @@ function ctools_ajax_sample_jump_menu_form() {
}
/**
- * Provide a message to the user that the jump menu worked
+ * Provide a message to the user that the jump menu worked.
*/
function ctools_ajax_sample_jump_menu_page() {
$return_link = l(t('Return to the examples page.'), 'ctools_ajax_sample');
@@ -732,7 +732,7 @@ function ctools_ajax_sample_jump_menu_page() {
}
/**
- * Provide a form for an example ajax modal button
+ * Provide a form for an example ajax modal button.
*/
function ctools_ajax_sample_ajax_button_form() {
$form = array();
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info
index 185d8b64..094d2788 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info
@@ -5,9 +5,9 @@ package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.x-1.9"
+; Information added by Drupal.org packaging script on 2018-02-04
+version = "7.x-1.13"
core = "7.x"
project = "ctools"
-datestamp = "1440020680"
+datestamp = "1517704095"
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.install b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.install
index b4512f2a..dcf87e73 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.install
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.install
@@ -1,5 +1,9 @@
type == 'custom') {
- if(!isset($pane->configuration['name'])) {
+ if (!isset($pane->configuration['name'])) {
$name_of_pane = $pane->subtype;
}
else {
@@ -80,7 +80,7 @@ function ctools_custom_content_panels_dashboard_blocks(&$vars) {
'description' => t('Custom content panes are basic HTML you enter that can be reused in all of your panels.'),
);
- // Load all mini panels and their displays.
+ // Load all mini panels and their displays.
ctools_include('export');
$items = ctools_export_crud_load_all('ctools_custom_content');
$count = 0;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc
index 467dc580..c7933bcb 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content.inc
@@ -1,5 +1,9 @@
'ctools_custom_content',
'access' => 'administer custom content',
@@ -17,4 +21,3 @@ $plugin = array(
'handler' => 'ctools_custom_content_ui',
);
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
index 56fe4b21..e56f7a7e 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_custom_content/plugins/export_ui/ctools_custom_content_ui.class.php
@@ -2,7 +2,7 @@
class ctools_custom_content_ui extends ctools_export_ui {
- function edit_form(&$form, &$form_state) {
+ public function edit_form(&$form, &$form_state) {
// Correct for an error that came in because filter format changed.
if (is_array($form_state['item']->settings['body'])) {
$form_state['item']->settings['format'] = $form_state['item']->settings['body']['format'];
@@ -23,6 +23,22 @@ function edit_form(&$form, &$form_state) {
'#title' => t('Title'),
);
+ $form['title_heading'] = array(
+ '#title' => t('Title heading'),
+ '#type' => 'select',
+ '#default_value' => isset($form_state['item']->settings['title_heading']) ? $form_state['item']->settings['title_heading'] : 'h2',
+ '#options' => array(
+ 'h1' => t('h1'),
+ 'h2' => t('h2'),
+ 'h3' => t('h3'),
+ 'h4' => t('h4'),
+ 'h5' => t('h5'),
+ 'h6' => t('h6'),
+ 'div' => t('div'),
+ 'span' => t('span'),
+ ),
+ );
+
$form['body'] = array(
'#type' => 'text_format',
'#title' => t('Body'),
@@ -38,17 +54,18 @@ function edit_form(&$form, &$form_state) {
);
}
- function edit_form_submit(&$form, &$form_state) {
+ public function edit_form_submit(&$form, &$form_state) {
parent::edit_form_submit($form, $form_state);
// Since items in our settings are not in the schema, we have to do these manually:
$form_state['item']->settings['title'] = $form_state['values']['title'];
+ $form_state['item']->settings['title_heading'] = $form_state['values']['title_heading'];
$form_state['item']->settings['body'] = $form_state['values']['body']['value'];
$form_state['item']->settings['format'] = $form_state['values']['body']['format'];
$form_state['item']->settings['substitute'] = $form_state['values']['substitute'];
}
- function list_form(&$form, &$form_state) {
+ public function list_form(&$form, &$form_state) {
parent::list_form($form, $form_state);
$options = array('all' => t('- All -'));
@@ -65,7 +82,7 @@ function list_form(&$form, &$form_state) {
);
}
- function list_filter($form_state, $item) {
+ public function list_filter($form_state, $item) {
if ($form_state['values']['category'] != 'all' && $form_state['values']['category'] != $item->category) {
return TRUE;
}
@@ -73,7 +90,7 @@ function list_filter($form_state, $item) {
return parent::list_filter($form_state, $item);
}
- function list_sort_options() {
+ public function list_sort_options() {
return array(
'disabled' => t('Enabled, title'),
'title' => t('Title'),
@@ -83,21 +100,25 @@ function list_sort_options() {
);
}
- function list_build_row($item, &$form_state, $operations) {
- // Set up sorting
+ public function list_build_row($item, &$form_state, $operations) {
+ // Set up sorting.
switch ($form_state['values']['order']) {
case 'disabled':
$this->sorts[$item->name] = empty($item->disabled) . $item->admin_title;
break;
+
case 'title':
$this->sorts[$item->name] = $item->admin_title;
break;
+
case 'name':
$this->sorts[$item->name] = $item->name;
break;
+
case 'category':
$this->sorts[$item->name] = $item->category;
break;
+
case 'storage':
$this->sorts[$item->name] = $item->type . $item->admin_title;
break;
@@ -117,7 +138,7 @@ function list_build_row($item, &$form_state, $operations) {
);
}
- function list_table_header() {
+ public function list_table_header() {
return array(
array('data' => t('Name'), 'class' => array('ctools-export-ui-name')),
array('data' => t('Title'), 'class' => array('ctools-export-ui-title')),
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/README.txt b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/README.txt
index 42edcdc9..2f9b0fff 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/README.txt
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/README.txt
@@ -11,4 +11,4 @@ There are a number of ways to profit from this:
2. There is a sample panel. You can access it at /ctools_plugin_example/xxxx
to see how it works.
-3. There is Advanced Help at admin/advanced_help/ctools_plugin_example.
\ No newline at end of file
+3. There is Advanced Help at admin/advanced_help/ctools_plugin_example.
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info
index d378641e..77c311f7 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info
@@ -8,9 +8,9 @@ dependencies[] = page_manager
dependencies[] = advanced_help
core = 7.x
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.x-1.9"
+; Information added by Drupal.org packaging script on 2018-02-04
+version = "7.x-1.13"
core = "7.x"
project = "ctools"
-datestamp = "1440020680"
+datestamp = "1517704095"
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.module b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.module
index 01d53382..a9a6080b 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.module
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.module
@@ -1,9 +1,8 @@
.pages_default.inc
+ * .pages_default.inc.
*/
function ctools_plugin_example_ctools_plugin_api($module, $api) {
// @todo -- this example should explain how to put it in a different file.
@@ -71,7 +70,8 @@ function ctools_plugin_example_ctools_plugin_api($module, $api) {
}
/**
- * Just provide an explanation page for the admin section
+ * Just provide an explanation page for the admin section.
+ *
* @return unknown_type
*/
function ctools_plugin_example_explanation_page() {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc
index 10a76193..bbabf227 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.pages_default.inc
@@ -6,7 +6,7 @@
*/
/**
- * Default panels pages for CTools Plugin Example
+ * Default panels pages for CTools Plugin Example.
*
* To pick up this file, your module needs to implement
* hook_ctools_plugin_api() - See ctools_plugin_example_ctools_plugin_api() in
@@ -23,12 +23,10 @@
* @return
* Array of pages, normally exported from Panels.
*/
-
function ctools_plugin_example_default_page_manager_pages() {
- // begin exported panel.
-
- $page = new stdClass;
+ // Begin exported panel.
+ $page = new stdClass();
$page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
$page->api_version = 1;
$page->name = 'ctools_plugin_example';
@@ -37,31 +35,31 @@ function ctools_plugin_example_default_page_manager_pages() {
$page->admin_description = 'This panel provides no functionality to a working Drupal system. It\'s intended to display the various sample plugins provided by the CTools Plugin Example module. ';
$page->path = 'ctools_plugin_example/%sc';
$page->access = array(
- 'logic' => 'and',
+ 'logic' => 'and',
);
$page->menu = array(
- 'type' => 'normal',
- 'title' => 'CTools plugin example',
- 'name' => 'navigation',
- 'weight' => '0',
- 'parent' => array(
- 'type' => 'none',
- 'title' => '',
+ 'type' => 'normal',
+ 'title' => 'CTools plugin example',
'name' => 'navigation',
'weight' => '0',
- ),
+ 'parent' => array(
+ 'type' => 'none',
+ 'title' => '',
+ 'name' => 'navigation',
+ 'weight' => '0',
+ ),
);
$page->arguments = array(
- 'sc' => array(
- 'id' => 2,
- 'identifier' => 'simplecontext-arg',
- 'name' => 'simplecontext_arg',
- 'settings' => array(),
- ),
+ 'sc' => array(
+ 'id' => 2,
+ 'identifier' => 'simplecontext-arg',
+ 'name' => 'simplecontext_arg',
+ 'settings' => array(),
+ ),
);
$page->conf = array();
$page->default_handlers = array();
- $handler = new stdClass;
+ $handler = new stdClass();
$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
$handler->api_version = 1;
$handler->name = 'page_ctools_panel_context';
@@ -70,44 +68,44 @@ function ctools_plugin_example_default_page_manager_pages() {
$handler->handler = 'panel_context';
$handler->weight = 0;
$handler->conf = array(
- 'title' => 'Panel',
- 'no_blocks' => FALSE,
- 'css_id' => '',
- 'css' => '',
- 'contexts' => array(
- '0' => array(
- 'name' => 'simplecontext',
- 'id' => 1,
- 'identifier' => 'Configured simplecontext (not from argument)',
- 'keyword' => 'configured_simplecontext',
- 'context_settings' => array(
- 'sample_simplecontext_setting' => 'default simplecontext setting',
- ),
- ),
- ),
- 'relationships' => array(
- '0' => array(
- 'context' => 'argument_simplecontext_arg_2',
- 'name' => 'relcontext_from_simplecontext',
- 'id' => 1,
- 'identifier' => 'Relcontext from simplecontext (from relationship)',
- 'keyword' => 'relcontext',
- ),
- ),
- 'access' => array(
- 'logic' => 'and',
- ),
+ 'title' => 'Panel',
+ 'no_blocks' => FALSE,
+ 'css_id' => '',
+ 'css' => '',
+ 'contexts' => array(
+ '0' => array(
+ 'name' => 'simplecontext',
+ 'id' => 1,
+ 'identifier' => 'Configured simplecontext (not from argument)',
+ 'keyword' => 'configured_simplecontext',
+ 'context_settings' => array(
+ 'sample_simplecontext_setting' => 'default simplecontext setting',
+ ),
+ ),
+ ),
+ 'relationships' => array(
+ '0' => array(
+ 'context' => 'argument_simplecontext_arg_2',
+ 'name' => 'relcontext_from_simplecontext',
+ 'id' => 1,
+ 'identifier' => 'Relcontext from simplecontext (from relationship)',
+ 'keyword' => 'relcontext',
+ ),
+ ),
+ 'access' => array(
+ 'logic' => 'and',
+ ),
);
- $display = new panels_display;
+ $display = new panels_display();
$display->layout = 'threecol_33_34_33_stacked';
$display->layout_settings = array();
$display->panel_settings = array(
- 'style' => 'rounded_corners',
- 'style_settings' => array(
- 'default' => array(
- 'corner_location' => 'pane',
- ),
- ),
+ 'style' => 'rounded_corners',
+ 'style_settings' => array(
+ 'default' => array(
+ 'corner_location' => 'pane',
+ ),
+ ),
);
$display->cache = array();
$display->title = 'CTools plugin example panel';
@@ -115,7 +113,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$display->title_pane = 1;
$display->content = array();
$display->panels = array();
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-1';
$pane->panel = 'left';
$pane->type = 'no_context_content_type';
@@ -135,7 +133,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 0;
$display->content['new-1'] = $pane;
$display->panels['left'][0] = 'new-1';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-2';
$pane->panel = 'left';
$pane->type = 'custom';
@@ -148,10 +146,10 @@ function ctools_plugin_example_default_page_manager_pages() {
'settings' => array(
'greater_than' => '1',
'arg_length' => '4',
- ),
+ ),
'context' => 'argument_simplecontext_arg_2',
- ),
- ),
+ ),
+ ),
);
$pane->configuration = array(
'title' => 'Long Arg Visibility Block',
@@ -166,7 +164,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 1;
$display->content['new-2'] = $pane;
$display->panels['left'][1] = 'new-2';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-3';
$pane->panel = 'left';
$pane->type = 'custom';
@@ -179,10 +177,10 @@ function ctools_plugin_example_default_page_manager_pages() {
'settings' => array(
'greater_than' => '0',
'arg_length' => '4',
- ),
+ ),
'context' => 'argument_simplecontext_arg_2',
- ),
- ),
+ ),
+ ),
);
$pane->configuration = array(
'title' => 'Short Arg Visibility',
@@ -197,7 +195,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 2;
$display->content['new-3'] = $pane;
$display->panels['left'][2] = 'new-3';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-4';
$pane->panel = 'middle';
$pane->type = 'simplecontext_content_type';
@@ -241,7 +239,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 0;
$display->content['new-4'] = $pane;
$display->panels['middle'][0] = 'new-4';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-5';
$pane->panel = 'middle';
$pane->type = 'simplecontext_content_type';
@@ -285,7 +283,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 1;
$display->content['new-5'] = $pane;
$display->panels['middle'][1] = 'new-5';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-6';
$pane->panel = 'middle';
$pane->type = 'custom';
@@ -309,7 +307,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 2;
$display->content['new-6'] = $pane;
$display->panels['middle'][2] = 'new-6';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-7';
$pane->panel = 'right';
$pane->type = 'relcontext_content_type';
@@ -353,7 +351,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$pane->position = 0;
$display->content['new-7'] = $pane;
$display->panels['right'][0] = 'new-7';
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-8';
$pane->panel = 'top';
$pane->type = 'custom';
@@ -378,12 +376,11 @@ function ctools_plugin_example_default_page_manager_pages() {
$handler->conf['display'] = $display;
$page->default_handlers[$handler->name] = $handler;
- // end of exported panel.
+ // End of exported panel.
$pages['ctools_plugin_example_demo_page'] = $page;
- // begin exported panel
-
- $page = new stdClass;
+ // Begin exported panel.
+ $page = new stdClass();
$page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
$page->api_version = 1;
$page->name = 'ctools_plugin_example_base';
@@ -396,7 +393,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$page->arguments = array();
$page->conf = array();
$page->default_handlers = array();
- $handler = new stdClass;
+ $handler = new stdClass();
$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
$handler->api_version = 1;
$handler->name = 'page_ctools_plugin_example_base_panel_context';
@@ -405,14 +402,14 @@ function ctools_plugin_example_default_page_manager_pages() {
$handler->handler = 'panel_context';
$handler->weight = 0;
$handler->conf = array(
- 'title' => 'Panel',
- 'no_blocks' => FALSE,
- 'css_id' => '',
- 'css' => '',
- 'contexts' => array(),
- 'relationships' => array(),
+ 'title' => 'Panel',
+ 'no_blocks' => FALSE,
+ 'css_id' => '',
+ 'css' => '',
+ 'contexts' => array(),
+ 'relationships' => array(),
);
- $display = new panels_display;
+ $display = new panels_display();
$display->layout = 'onecol';
$display->layout_settings = array();
$display->panel_settings = array();
@@ -421,7 +418,7 @@ function ctools_plugin_example_default_page_manager_pages() {
$display->hide_title = FALSE;
$display->content = array();
$display->panels = array();
- $pane = new stdClass;
+ $pane = new stdClass();
$pane->pid = 'new-1';
$pane->panel = 'middle';
$pane->type = 'custom';
@@ -443,9 +440,8 @@ function ctools_plugin_example_default_page_manager_pages() {
$display->panels['middle'][0] = 'new-1';
$handler->conf['display'] = $display;
$page->default_handlers[$handler->name] = $handler;
- // end exported panel.
-
+ // End exported panel.
$pages['base_page'] = $page;
return $pages;
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/arg_length.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/arg_length.inc
index 2a09eea1..3b5d8636 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/arg_length.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/arg_length.inc
@@ -59,7 +59,8 @@ function ctools_plugin_example_arg_length_ctools_access_check($conf, $context) {
*/
function ctools_plugin_example_arg_length_ctools_access_summary($conf, $context) {
return t('Simpletext argument must be !comp @length characters',
- array('!comp' => $conf['greater_than'] ? 'greater than' : 'less than or equal to',
- '@length' => $conf['arg_length']));
+ array(
+ '!comp' => $conf['greater_than'] ? 'greater than' : 'less than or equal to',
+ '@length' => $conf['arg_length'],
+ ));
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/example_role.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/example_role.inc
index bbe364c1..75721e8b 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/example_role.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/access/example_role.inc
@@ -4,7 +4,7 @@
* @file
* Plugin to provide access control based upon role membership.
* This is directly from the ctools module, but serves as a good
- * example of an access plugin
+ * example of an access plugin.
*/
/**
@@ -73,4 +73,3 @@ function ctools_plugin_example_example_role_ctools_access_summary($conf, $contex
}
return format_plural(count($names), '@identifier must have role "@roles"', '@identifier can be one of "@roles"', array('@roles' => implode(', ', $names), '@identifier' => $context->identifier));
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc
index 51c7c601..7fb732c6 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/arguments/simplecontext_arg.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Sample plugin to provide an argument handler for a simplecontext.
*
* Given any argument to the page, simplecontext will get it
@@ -18,14 +17,12 @@
*/
$plugin = array(
'title' => t("Simplecontext arg"),
- // keyword to use for %substitution
+ // Keyword to use for %substitution.
'keyword' => 'simplecontext',
'description' => t('Creates a "simplecontext" from the arg.'),
'context' => 'simplecontext_arg_context',
- // 'settings form' => 'simplecontext_arg_settings_form',
-
// placeholder_form is used in panels preview, for example, so we can
- // preview without getting the arg from a URL
+ // preview without getting the arg from a URL.
'placeholder form' => array(
'#type' => 'textfield',
'#description' => t('Enter the simplecontext arg'),
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc
index 3c02ab84..48ce0f5c 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/no_context_content_type.inc
@@ -5,7 +5,6 @@
* "No context" sample content type. It operates with no context at all. It would
* be basically the same as a 'custom content' block, but it's not even that
* sophisticated.
- *
*/
/**
@@ -33,7 +32,7 @@ $plugin = array(
'icon' => 'icon_example.png',
'category' => array(t('CTools Examples'), -9),
- // this example does not provide 'admin info', which would populate the
+ // This example does not provide 'admin info', which would populate the
// panels builder page preview.
);
@@ -56,7 +55,7 @@ function no_context_content_type_render($subtype, $conf, $args, $context) {
$ctools_help = theme('advanced_help_topic', array('module' => 'ctools', 'topic' => 'plugins', 'type' => 'title'));
$ctools_plugin_example_help = theme('advanced_help_topic', array('module' => 'ctools_plugin_example', 'topic' => 'Chaos-Tools--CTools--Plugin-Examples', 'type' => 'title'));
- // The title actually used in rendering
+ // The title actually used in rendering.
$block->title = check_plain("No-context content type");
$block->content = t("
Welcome to the CTools Plugin Example demonstration content type.
@@ -84,7 +83,6 @@ function no_context_content_type_render($subtype, $conf, $args, $context) {
* Note that if we had not provided an entry for this in hook_content_types,
* this could have had the default name
* ctools_plugin_example_no_context_content_type_edit_form.
- *
*/
function no_context_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc
index bf54dce6..ced64117 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/relcontext_content_type.inc
@@ -1,6 +1,5 @@
array(t('CTools Examples'), -9),
'edit form' => 'relcontext_edit_form',
- // this example does not provide 'admin info', which would populate the
+ // This example does not provide 'admin info', which would populate the
// panels builder page preview.
-
);
/**
@@ -60,7 +58,7 @@ function relcontext_content_type_render($subtype, $conf, $args, $context) {
In our case, the configuration form (\$conf) has just one field, 'config_item_1;
and it's configured with:
");
- if (!empty($conf)) {
+ if (!empty($conf)) {
$block->content .= 'displays = array();
$pages['ctools_plugin_example'] = $page;
-
return $pages;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc
index 62246210..087d5ecf 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/relationships/relcontext_from_simplecontext.inc
@@ -1,9 +1,7 @@
'Space separated list of exportables you want to view.',
),
'options' => array(
- 'indent' => 'The string to use for indentation when dispalying the exportable export code. Defaults to \'\'.',
+ 'indent' => 'The string to use for indentation when displaying the exportable export code. Defaults to \'\'.',
'no-colour' => 'Remove any colour formatting from export string output. Ideal if you are sending the output of this command to a file.',
'module' => $module_text,
'all' => $all_text,
@@ -140,13 +140,14 @@ function ctools_drush_help($section) {
switch ($section) {
case 'meta:ctools:title':
return dt('CTools commands');
+
case 'meta:entity:summary':
return dt('CTools drush commands.');
}
}
/**
- * Drush callback: export
+ * Drush callback: export.
*/
function ctools_drush_export($module = 'foo') {
$error = FALSE;
@@ -338,7 +339,7 @@ function _ctools_drush_selection_screen(array $tables = array()) {
$build[$table_choice]['count'] = count($multi_select);
$selections[$table_choice] = array();
foreach ($multi_select as $key) {
- $selections[$table_choice][$key] = $key;
+ $selections[$table_choice][$key] = $key;
}
}
}
@@ -445,6 +446,7 @@ function ctools_drush_export_info() {
}
}
}
+
/**
* Drush callback: Acts as the hub for all op commands to keep
* all arg handling etc in one place.
@@ -457,17 +459,20 @@ function ctools_drush_export_op_command() {
switch ($command['command']) {
case 'ctools-export-view':
$op = 'view';
- break;
+ break;
+
case 'ctools-export-revert':
// Revert is same as deleting. As any objects in the db are deleted.
$op = 'delete';
- break;
+ break;
+
case 'ctools-export-enable':
$op = 'enable';
- break;
+ break;
+
case 'ctools-export-disable':
$op = 'disable';
- break;
+ break;
}
if (!$op) {
@@ -475,7 +480,7 @@ function ctools_drush_export_op_command() {
}
if (drush_get_option('all', FALSE)) {
- $info = _ctools_drush_export_info('', TRUE);
+ $info = _ctools_drush_export_info(array(), TRUE);
$exportable_info = $info['exportables'];
$all = drush_confirm(dt('Are you sure you would like to !op all exportables on the system?',
@@ -512,7 +517,6 @@ function ctools_drush_export_op_command() {
* @param $op
* @param $table_name
* @param $exportables
- *
*/
function ctools_drush_export_op($op = '', $table_name = '', $exportables = NULL) {
$objects = ctools_export_crud_load_multiple($table_name, array_keys($exportables));
@@ -538,7 +542,7 @@ function ctools_drush_export_op($op = '', $table_name = '', $exportables = NULL)
* @param $object_names
*
* @return
- * Array of exportable objects (filtered if necessary, by name etc..) or FALSE if not.
+ * Array of exportable objects (filtered if necessary, by name etc..) or FALSE if not.
*/
function _ctools_drush_export_op_command_logic($op = '', $table_name = NULL, array $object_names = array()) {
if (!$table_name) {
@@ -644,7 +648,7 @@ function _ctools_drush_export_info(array $table_names = array(), $load = FALSE)
return array('exportables' => $exportables, 'schemas' => $schemas);
}
-/*
+/**
* View a single object.
*
* @param $table_name
@@ -662,7 +666,7 @@ function _ctools_drush_export_view($table_name, $object) {
}
}
-/*
+/**
* Revert a single object.
*
* @param $table_name
@@ -681,7 +685,7 @@ function _ctools_drush_export_delete($table_name, $object) {
}
}
-/*
+/**
* Enable a single object.
*
* @param $table_name
@@ -701,7 +705,7 @@ function _ctools_drush_export_enable($table_name, $object) {
}
}
-/*
+/**
* Disable a single object.
*
* @param $table_name
@@ -723,9 +727,9 @@ function _ctools_drush_export_disable($table_name, $object) {
/**
* Filter a nested array of exportables by export module.
*
- * @param $exportables array
+ * @param array $exportables
* Passed by reference. A nested array of exportables, keyed by table name.
- * @param $export_module string
+ * @param string $export_module
* The name of the export module providing the exportable.
*/
function _ctools_drush_export_module_filter($exportables, $export_module) {
@@ -778,7 +782,7 @@ function _ctools_drush_object_is_disabled($object) {
/**
* Determine if an object is enabled.
*
- * @see _ctools_drush_object_is_disabled.
+ * @see _ctools_drush_object_is_disabled()
*/
function _ctools_drush_object_is_enabled($object) {
return (empty($object->disabled)) ? TRUE : FALSE;
@@ -835,7 +839,7 @@ function _ctools_drush_object_is_not_code_only($object) {
* Array of exportables to count.
*
* @return
- * Array of count data containing the following:
+ * Array of count data containing the following:
* 'total' - A total count of all exportables.
* 'exportables' - An array of exportable counts per table.
*/
@@ -867,26 +871,32 @@ function _ctools_drush_filter_exportables($exportables, $filter) {
// Show enabled exportables only.
case 'enabled':
$eval = '_ctools_drush_object_is_disabled';
- break;
+ break;
+
// Show disabled exportables only.
case 'disabled':
$eval = '_ctools_drush_object_is_enabled';
- break;
+ break;
+
// Show overridden exportables only.
case 'overridden':
$eval = '_ctools_drush_object_is_not_overridden';
- break;
+ break;
+
// Show database only exportables.
case 'database':
$eval = '_ctools_drush_object_is_not_db_only';
- break;
+ break;
+
// Show code only exportables.
case 'code':
$eval = '_ctools_drush_object_is_not_code_only';
- break;
+ break;
+
// Do nothing.
case 'all':
break;
+
default:
drush_log(dt('Invalid filter option. Available options are: enabled, disabled, overridden, database, and code.'), 'error');
return;
@@ -983,33 +993,42 @@ class shellColours {
'light_gray' => '47',
);
+ /**
+ *
+ */
private function __construct() {}
- // Returns coloured string
+ /**
+ * Returns coloured string.
+ */
public static function getColouredOutput($string, $foreground_colour = NULL, $background_colour = NULL) {
$coloured_string = "";
- // Check if given foreground colour found
+ // Check if given foreground colour found.
if ($foreground_colour) {
$coloured_string .= "\033[" . self::$foreground_colours[$foreground_colour] . "m";
}
- // Check if given background colour found
+ // Check if given background colour found.
if ($background_colour) {
$coloured_string .= "\033[" . self::$background_colours[$background_colour] . "m";
}
- // Add string and end colouring
- $coloured_string .= $string . "\033[0m";
+ // Add string and end colouring.
+ $coloured_string .= $string . "\033[0m";
return $coloured_string;
}
- // Returns all foreground colour names
+ /**
+ * Returns all foreground colour names.
+ */
public static function getForegroundColours() {
return array_keys(self::$foreground_colours);
}
- // Returns all background colour names
+ /**
+ * Returns all background colour names.
+ */
public static function getBackgroundColours() {
return array_keys(self::$background_colours);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/help/export.html b/profiles/commerce_kickstart/modules/contrib/ctools/help/export.html
index ce24cad9..573c98a6 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/help/export.html
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/help/export.html
@@ -154,7 +154,7 @@ Bulk export callback to provide a list of exportable objects to be chosen for bulk exporting. Defaults to $module . '_' . $table . '_list' if the function exists. If it is not, a default listing function will be provided that will make a best effort to list the titles. See ctools_export_default_list().
to hook code callback
-Function used to generate an export for the bulk export process. This is only necessary if the export is more complicated than simply listing the fields. Defaults to $module . '_' . $table . '_to_hook_code'.
+Function used to generate an export for the bulk export process. This is only necessary if the export is more complicated than simply listing the fields. Defaults to $module . '_' . $table . '_to_hook_code'.
boolean
Explicitly indicate if a table field contains a boolean or not. The Schema API does not model the
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/help/modal.html b/profiles/commerce_kickstart/modules/contrib/ctools/help/modal.html
index ea823a0d..761fd2e3 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/help/modal.html
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/help/modal.html
@@ -82,7 +82,7 @@ modalSize: an array of data to control the sizing of the modal. It can contain:
If 'cache' is TRUE, then this value specifies the cache table where the cached plugin information will be stored.
classes
Defaults to: array()
-An array of class identifiers(i.e. plugin array keys) which a plugin of this type uses to provide classes to the CTools autoloader. For example, if classes is set to array('class'), then CTools will search each $plugin['class'] for a class to autoload. Depending of the plugin structure, a class identifier may be either:
+An array of class identifiers(i.e. plugin array keys) which a plugin of this type uses to provide classes to the CTools autoloader. For example, if classes is set to array('class'), then CTools will search each $plugin['class'] for a class to autoload. Depending of the plugin structure, a class identifier may be either:
defaults
Defaults to: array()
An array of defaults that should be added to each plugin; this can be used to ensure that every plugin has the basic data necessary. These defaults will not ovewrite data supplied by the plugin. This could also be a function name, in which case the callback will be used to provide defaults. NOTE, however, that the callback-based approach is deprecated as it is redundant with the 'process' callback, and as such will be removed in later versions. Consequently, you should only use the array form for maximum cross-version compatibility.
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/action-links.theme.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/action-links.theme.inc
index 3a2398a1..f53f59c8 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/action-links.theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/action-links.theme.inc
@@ -1,4 +1,5 @@
' . $links . '';
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/ajax.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/ajax.inc
index 96f5068f..4d72d0c6 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/ajax.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/ajax.inc
@@ -1,6 +1,10 @@
'attr',
- 'selector' => $selector,
- 'name' => $name,
- 'value' => $value,
- );
- }
+ 'command' => 'attr',
+ 'selector' => $selector,
+ 'name' => $name,
+ 'value' => $value,
+ );
+}
/**
* Force a client-side redirect.
@@ -154,4 +158,3 @@ function ctools_ajax_render_error($error = '') {
print ajax_render($commands);
exit;
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/cache.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/cache.inc
index 3918683b..67d97fa3 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/cache.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/cache.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Plugins to handle cache-indirection.
*
* Simple plugin management to allow clients to more tightly control where
@@ -150,7 +149,7 @@ function ctools_cache_operation($mechanism, $key, $op, $object = NULL) {
*/
function ctools_cache_find_plugin($mechanism) {
if (strpos($mechanism, '::') !== FALSE) {
- // use explode(2) to ensure that the data can contain double
+ // Use explode(2) to ensure that the data can contain double
// colons, just in case.
list($name, $data) = explode('::', $mechanism, 2);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/cleanstring.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/cleanstring.inc
index 56b3e36f..11ffceff 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/cleanstring.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/cleanstring.inc
@@ -1,5 +1,4 @@
$length) {
- $string = drupal_substr($string, 0, $length + 1); // leave one more character
- if ($last_break = strrpos($string, $separator)) { // space exists AND is not on position 0
+ // Leave one more character.
+ $string = drupal_substr($string, 0, $length + 1);
+ // Space exists AND is not on position 0.
+ if ($last_break = strrpos($string, $separator)) {
$string = substr($string, 0, $last_break);
}
else {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/collapsible.theme.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/collapsible.theme.inc
index f7bbbb37..d19efd8a 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/collapsible.theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/collapsible.theme.inc
@@ -76,4 +76,3 @@ function theme_ctools_collapsible_remembered($vars) {
return $output;
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.inc
index ae1c6073..49c35650 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.inc
@@ -86,7 +86,7 @@ function ctools_content_process(&$plugin, $info) {
/**
* Fetch metadata on a specific content_type plugin.
*
- * @param $content type
+ * @param mixed $content
* Name of a panel content type.
*
* @return
@@ -146,7 +146,7 @@ function ctools_content_get_subtypes($type) {
if (is_array($function)) {
$subtypes = $function;
}
- else if (function_exists($function)) {
+ elseif (function_exists($function)) {
// Cast to array to prevent errors from non-array returns.
$subtypes = (array) $function($plugin);
}
@@ -155,6 +155,11 @@ function ctools_content_get_subtypes($type) {
// Walk through the subtypes and ensure minimal settings are
// retained.
foreach ($subtypes as $id => $subtype) {
+ // Ensure that the 'subtype_id' value exists.
+ if (!isset($subtype['subtype_id'])) {
+ $subtypes[$id]['subtype_id'] = $id;
+ }
+
// Use exact name since this is a modify by reference.
ctools_content_prepare_subtype($subtypes[$id], $plugin);
}
@@ -202,6 +207,13 @@ function ctools_content_get_subtype($type, $subtype_id) {
}
if ($subtype) {
+ // Ensure that the 'subtype_id' value exists. This is also done in
+ // ctools_content_get_subtypes(), but it wouldn't be called if the plugin
+ // provides the subtype through its own function.
+ if (!isset($subtype['subtype_id'])) {
+ $subtype['subtype_id'] = $subtype_id;
+ }
+
ctools_content_prepare_subtype($subtype, $plugin);
}
return $subtype;
@@ -217,6 +229,7 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
}
}
+ // Trigger hook_ctools_content_subtype_alter().
drupal_alter('ctools_content_subtype', $subtype, $plugin);
}
@@ -241,8 +254,8 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
* Any incoming content, if this display is a wrapper.
*
* @return
- * The content as rendered by the plugin. This content should be an array
- * with the following possible keys:
+ * The content as rendered by the plugin, or NULL.
+ * This content should be an object with the following possible properties:
* - title: The safe to render title of the content.
* - title_heading: The title heading.
* - content: The safe to render HTML content.
@@ -294,7 +307,7 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
$content->subtype = $subtype;
}
- // Override the title if configured to
+ // Override the title if configured to.
if (!empty($conf['override_title'])) {
// Give previous title as an available substitution here.
$keywords['%title'] = empty($content->title) ? '' : $content->title;
@@ -304,12 +317,12 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
}
if (!empty($content->title)) {
- // Perform substitutions
+ // Perform substitutions.
if (!empty($keywords) || !empty($context)) {
$content->title = ctools_context_keyword_substitute($content->title, $keywords, $context);
}
- // Sterilize the title
+ // Sterilize the title.
$content->title = filter_xss_admin($content->title);
// If a link is specified, populate.
@@ -320,7 +333,7 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
else {
$url = $content->title_link;
}
- // set defaults so we don't bring up notices
+ // Set defaults so we don't bring up notices.
$url += array('href' => '', 'attributes' => array(), 'query' => array(), 'fragment' => '', 'absolute' => NULL, 'html' => TRUE);
$content->title = l($content->title, $url['href'], $url);
}
@@ -342,7 +355,7 @@ function ctools_content_editable($type, $subtype, $conf) {
}
$function = FALSE;
-
+
if (!empty($subtype['check editable'])) {
$function = ctools_plugin_get_function($subtype, 'check editable');
}
@@ -373,7 +386,7 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
if (is_array($type)) {
$plugin = $type;
}
- else if (is_string($type)) {
+ elseif (is_string($type)) {
$plugin = ctools_get_content_type($type);
}
else {
@@ -391,10 +404,10 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
return $function($subtype, $conf, $pane_context);
}
- else if (isset($plugin['admin title'])) {
+ elseif (isset($plugin['admin title'])) {
return $plugin['admin title'];
}
- else if (isset($plugin['title'])) {
+ elseif (isset($plugin['title'])) {
return $plugin['title'];
}
}
@@ -429,7 +442,7 @@ function ctools_content_get_defaults($plugin, $subtype) {
if (isset($plugin['defaults'])) {
$defaults = $plugin['defaults'];
}
- else if (isset($subtype['defaults'])) {
+ elseif (isset($subtype['defaults'])) {
$defaults = $subtype['defaults'];
}
if (isset($defaults)) {
@@ -438,7 +451,7 @@ function ctools_content_get_defaults($plugin, $subtype) {
return $return;
}
}
- else if (is_array($defaults)) {
+ elseif (is_array($defaults)) {
return $defaults;
}
}
@@ -472,7 +485,7 @@ function ctools_content_admin_info($type, $subtype, $conf, $context = NULL) {
if (empty($output) || !is_object($output)) {
$output = new stdClass();
- // replace the _ with " " for a better output
+ // Replace the _ with " " for a better output.
$subtype = check_plain(str_replace("_", " ", $subtype));
$output->title = $subtype;
$output->content = t('No info available.');
@@ -481,7 +494,7 @@ function ctools_content_admin_info($type, $subtype, $conf, $context = NULL) {
}
/**
- * Add the default FAPI elements to the content type configuration form
+ * Add the default FAPI elements to the content type configuration form.
*/
function ctools_content_configure_form_defaults($form, &$form_state) {
$plugin = $form_state['plugin'];
@@ -598,7 +611,7 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_na
if (!empty($subtype['add form'])) {
_ctools_content_create_form_info($form_info, $subtype['add form'], $subtype, $subtype, $op);
}
- else if (!empty($plugin['add form'])) {
+ elseif (!empty($plugin['add form'])) {
_ctools_content_create_form_info($form_info, $plugin['add form'], $plugin, $subtype, $op);
}
}
@@ -608,7 +621,7 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_na
if (!empty($subtype['edit form'])) {
_ctools_content_create_form_info($form_info, $subtype['edit form'], $subtype, $subtype, $op);
}
- else if (!empty($plugin['edit form'])) {
+ elseif (!empty($plugin['edit form'])) {
_ctools_content_create_form_info($form_info, $plugin['edit form'], $plugin, $subtype, $op);
}
}
@@ -627,7 +640,7 @@ function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype,
if (empty($subtype['title'])) {
$title = t('Configure');
}
- else if ($op == 'add') {
+ elseif ($op == 'add') {
$title = t('Configure new !subtype_title', array('!subtype_title' => $subtype['title']));
}
else {
@@ -642,7 +655,7 @@ function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype,
),
);
}
- else if (is_array($info)) {
+ elseif (is_array($info)) {
$form_info['order'] = array();
$form_info['forms'] = array();
$count = 0;
@@ -693,7 +706,7 @@ function ctools_content_get_available_types($contexts = NULL, $has_content = FAL
foreach ($plugins as $id => $plugin) {
foreach (ctools_content_get_subtypes($plugin) as $subtype_id => $subtype) {
- // exclude items that require content if we're saying we don't
+ // Exclude items that require content if we're saying we don't
// provide it.
if (!empty($subtype['requires content']) && !$has_content) {
continue;
@@ -733,7 +746,6 @@ function ctools_content_get_available_types($contexts = NULL, $has_content = FAL
* Get an array of all content types that can be fed into the
* display editor for the add content list, regardless of
* availability.
- *
*/
function ctools_content_get_all_types() {
$plugins = ctools_get_content_types();
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.menu.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.menu.inc
index f7f93406..4e1c2f08 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.menu.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.menu.inc
@@ -62,9 +62,8 @@ function ctools_content_autocomplete_entity($entity_type, $string = '') {
}
}
-/*
- * Use well known/tested entity reference code to build our search query
- * From EntityReference_SelectionHandler_Generic class
+/**
+ * Use EntityReference_SelectionHandler_Generic class to build our search query.
*/
function _ctools_buildQuery($entity_type, $entity_info, $match = NULL, $match_operator = 'CONTAINS') {
$base_table = $entity_info['base table'];
@@ -125,7 +124,7 @@ function _ctools_getReferencableEntities($entity_type, $entity_info, $match = NU
global $user;
$account = $user;
$options = array();
- // We're an entity ID, return the id
+ // We're an entity ID, return the id.
if (is_numeric($match) && $match_operator == '=') {
if ($entity = array_shift(entity_load($entity_type, array($match)))) {
if (isset($entity_info['access callback']) && function_exists($entity_info['access callback'])) {
@@ -143,10 +142,10 @@ function _ctools_getReferencableEntities($entity_type, $entity_info, $match = NU
// If you don't have access, or an access callback or a valid entity, just
// Return back the Entity ID.
return array(
- $match => array(
+ $match => array(
'label' => $match,
'bundle' => NULL,
- ),
+ ),
);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.plugin-type.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.plugin-type.inc
index a0debc3e..0364a927 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.plugin-type.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/content.plugin-type.inc
@@ -14,4 +14,4 @@ function ctools_content_plugin_type(&$items) {
'path' => drupal_get_path('module', 'ctools') . '/includes',
),
);
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-access-admin.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-access-admin.inc
index 76643cf6..d8c4f3b1 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-access-admin.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-access-admin.inc
@@ -245,10 +245,10 @@ function ctools_access_admin_form_submit($form, &$form_state) {
// --------------------------------------------------------------------------
// AJAX menu entry points.
-
/**
* AJAX callback to add a new access test to the list.
*/
+
function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
ctools_include('ajax');
ctools_include('modal');
@@ -263,7 +263,7 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
ctools_ajax_render_error();
}
- // Separate the fragment into 'module' and 'argument'
+ // Separate the fragment into 'module' and 'argument'.
if (strpos($fragment, '-') === FALSE) {
$module = $fragment;
$argument = NULL;
@@ -279,7 +279,7 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
list($access, $contexts) = $function($argument);
- // Make sure we have the logged in user context
+ // Make sure we have the logged in user context.
if (!isset($contexts['logged-in-user'])) {
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
}
@@ -306,6 +306,9 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
);
$output = ctools_modal_form_wrapper('ctools_access_ajax_edit_item', $form_state);
+ $access = $form_state['access'];
+ $access['plugins'][$id] = $form_state['test'];
+
if (!isset($output[0])) {
$function = $module . '_ctools_access_set';
if (function_exists($function)) {
@@ -333,7 +336,7 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
ctools_ajax_render_error();
}
- // Separate the fragment into 'module' and 'argument'
+ // Separate the fragment into 'module' and 'argument'.
if (strpos($fragment, '-') === FALSE) {
$module = $fragment;
$argument = NULL;
@@ -353,7 +356,7 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
ctools_ajax_render_error();
}
- // Make sure we have the logged in user context
+ // Make sure we have the logged in user context.
if (!isset($contexts['logged-in-user'])) {
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
}
@@ -367,12 +370,14 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
'contexts' => $contexts,
'title' => t('Edit criteria'),
'ajax' => TRUE,
- 'ajax' => TRUE,
'modal' => TRUE,
'modal return' => TRUE,
);
$output = ctools_modal_form_wrapper('ctools_access_ajax_edit_item', $form_state);
+ $access = $form_state['access'];
+ $access['plugins'][$id] = $form_state['test'];
+
if (!isset($output[0])) {
$function = $module . '_ctools_access_set';
if (function_exists($function)) {
@@ -452,7 +457,7 @@ function ctools_access_ajax_delete($fragment = NULL, $id = NULL) {
ajax_render_error();
}
- // Separate the fragment into 'module' and 'argument'
+ // Separate the fragment into 'module' and 'argument'.
if (strpos($fragment, '-') === FALSE) {
$module = $fragment;
$argument = NULL;
@@ -472,7 +477,7 @@ function ctools_access_ajax_delete($fragment = NULL, $id = NULL) {
unset($access['plugins'][$id]);
}
- // re-cache
+ // re-cache.
$function = $module . '_ctools_access_set';
if (function_exists($function)) {
$function($argument, $access);
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-task-handler.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-task-handler.inc
index 21ceea5d..b0f9474d 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-task-handler.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context-task-handler.inc
@@ -31,6 +31,7 @@
* If TRUE then this renderer owns the page and can use theme('page')
* for no blocks; if false, output is returned regardless of any no
* blocks settings.
+ *
* @return
* Either the output or NULL if there was output, FALSE if no handler
* accepted the task. If $page is FALSE then the $info block is returned instead.
@@ -84,7 +85,7 @@ function ctools_context_handler_get_render_handler($task, $subtask, $handlers, $
*/
function ctools_context_handler_default_test($handler, $base_contexts, $args) {
ctools_include('context');
- // Add my contexts
+ // Add my contexts.
$contexts = ctools_context_handler_get_handler_contexts($base_contexts, $handler);
// Test.
@@ -128,7 +129,7 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
'contexts' => $contexts,
'task' => $task,
'subtask' => $subtask,
- 'handler' => $handler
+ 'handler' => $handler,
);
drupal_alter('ctools_render', $info, $page, $context);
@@ -141,12 +142,15 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
switch ($info['response code']) {
case 403:
return MENU_ACCESS_DENIED;
+
case 404:
return MENU_NOT_FOUND;
+
case 410:
drupal_add_http_header('Status', '410 Gone');
drupal_exit();
break;
+
case 301:
case 302:
case 303:
@@ -162,7 +166,7 @@ function ctools_context_handler_render_handler($task, $subtask, $handler, $conte
'fragment' => $info['fragment'],
);
drupal_goto($info['destination'], $options, $info['response code']);
- // @todo -- should other response codes be supported here?
+ // @todo -- should other response codes be supported here?
}
}
@@ -241,7 +245,7 @@ function ctools_task_handler_default_contextual_link($handler, $plugin, $context
if (is_array($plugin['tab operation'])) {
$trail = $plugin['tab operation'];
}
- else if (function_exists($plugin['tab operation'])) {
+ elseif (function_exists($plugin['tab operation'])) {
$trail = $plugin['tab operation']($handler, $contexts, $args);
}
}
@@ -251,7 +255,8 @@ function ctools_task_handler_default_contextual_link($handler, $plugin, $context
'href' => $path,
'title' => $title,
'query' => drupal_get_destination(),
- ));
+ ),
+ );
return $links;
}
@@ -259,7 +264,12 @@ function ctools_task_handler_default_contextual_link($handler, $plugin, $context
/**
* Called to execute actions that should happen before a handler is rendered.
*/
-function ctools_context_handler_pre_render($handler, $contexts, $args) { }
+function ctools_context_handler_pre_render($handler, $contexts, $args) {
+ foreach (module_implements('ctools_context_handler_pre_render') as $module) {
+ $function = $module . '_ctools_context_handler_pre_render';
+ $function($handler, $contexts, $args);
+ }
+}
/**
* Compare arguments to contexts for selection purposes.
@@ -320,7 +330,6 @@ function ctools_context_handler_summary($task, $subtask, $handler) {
// the task handler, for example) but sometimes we need them separately
// (when a task has contexts loaded and is trying out the task handlers,
// for example). Therefore there are two paths we can take to getting contexts.
-
/**
* Load the contexts for a task, using arguments.
*
@@ -368,7 +377,7 @@ function ctools_context_handler_get_all_contexts($task, $subtask, $handler) {
* expects things in a certain, kind of clunky format.
*/
function ctools_context_handler_get_handler_object($handler) {
- $object = new stdClass;
+ $object = new stdClass();
$object->name = $handler->name;
$object->contexts = isset($handler->conf['contexts']) ? $handler->conf['contexts'] : array();
$object->relationships = isset($handler->conf['relationships']) ? $handler->conf['relationships'] : array();
@@ -382,7 +391,7 @@ function ctools_context_handler_get_handler_object($handler) {
* arguments from the task.
*/
function ctools_context_handler_get_task_object($task, $subtask, $handler) {
- $object = new stdClass;
+ $object = new stdClass();
$object->name = !empty($handler->name) ? $handler->name : 'temp';
$object->base_contexts = ctools_context_handler_get_base_contexts($task, $subtask, TRUE);
$object->arguments = ctools_context_handler_get_task_arguments($task, $subtask);
@@ -456,7 +465,7 @@ function ctools_context_handler_edit_criteria($form, &$form_state) {
ctools_modal_add_plugin_js(ctools_get_access_plugins());
ctools_include('context-access-admin');
$form_state['module'] = (isset($form_state['module'])) ? $form_state['module'] : 'page_manager_task_handler';
- // Encode a bunch of info into the argument so we can get our cache later
+ // Encode a bunch of info into the argument so we can get our cache later.
$form_state['callback argument'] = $form_state['task_name'] . '*' . $form_state['handler']->name;
$form_state['access'] = $form_state['handler']->conf['access'];
$form_state['no buttons'] = TRUE;
@@ -472,7 +481,7 @@ function ctools_context_handler_edit_criteria($form, &$form_state) {
}
/**
- * Submit handler for rules selection
+ * Submit handler for rules selection.
*/
function ctools_context_handler_edit_criteria_submit(&$form, &$form_state) {
$form_state['handler']->conf['access']['logic'] = $form_state['values']['logic'];
@@ -537,4 +546,3 @@ function ctools_context_handler_edit_context_submit(&$form, &$form_state) {
unset($form_state['page']->context_cache[$cache_name]);
}
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.inc
index 1f9c1e45..0fc62080 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Contains code related to the ctools system of 'context'.
*
* Context, originally from Panels, is a method of packaging objects into
@@ -28,28 +27,104 @@
* of the context is important.
*/
class ctools_context {
- var $type = NULL;
- var $data = NULL;
- // The title of this object.
- var $title = '';
- // The title of the page if this object exists
- var $page_title = '';
- // The identifier (in the UI) of this object
- var $identifier = '';
- var $argument = NULL;
- var $keyword = '';
- var $original_argument = NULL;
- var $restrictions = array();
- var $empty = FALSE;
-
- function ctools_context($type = 'none', $data = NULL) {
- $this->type = $type;
- $this->data = $data;
+ /**
+ * @var string|array
+ * A string naming this specific context type. The values 'any' and 'none'
+ * are special:
+ * - 'any': used in is_type() to match any other type.
+ * - 'none': used to signal the type is not defined.
+ */
+ public $type;
+
+ /**
+ * @var mixed
+ * The data payload for this context object.
+ */
+ public $data;
+
+ /**
+ * @var string
+ * The title of this object.
+ */
+ public $title;
+
+ /**
+ * @var string
+ * The title of the page if this object exists
+ */
+ public $page_title;
+
+ /**
+ * @var string
+ * The identifier (in the UI) of this object.
+ */
+ public $identifier;
+
+ /**
+ * @var
+ */
+ public $argument;
+
+ /**
+ * @var string
+ */
+ public $keyword;
+
+ /**
+ * @var
+ */
+ public $original_argument;
+
+ /**
+ * @var array
+ */
+ public $restrictions;
+
+ /**
+ * @var bool
+ */
+ public $empty;
+
+ /**
+ * The ctools_context constructor.
+ *
+ * @param string $type
+ * The type name of this context. Should be unique. Use the machine_name
+ * conventions: lowercase, short, underscores and no spaces.
+ * @param mixed $data
+ * The data payload, if required for this context.
+ */
+ public function __construct($type = 'none', $data = NULL) {
+ $this->type = $type;
+ $this->data = $data;
$this->title = t('Unknown context');
+ $this->page_title = '';
+ $this->identifier = '';
+ $this->keyword = '';
+ $this->restrictions = array();
+ $this->empty = FALSE;
+ // Other vars are NULL.
}
- function is_type($type) {
- if ($type == 'any' || $this->type == 'any') {
+ /**
+ * Determine whether this object is of type @var $type .
+ *
+ * Both the internal value ($this->type) and the supplied value ($type) can
+ * be a string or an array of strings, and if one or both are arrays the match
+ * succeeds if at least one common element is found.
+ *
+ * Type names
+ *
+ * @param string|array $type
+ * 'type' can be:
+ * - 'any' to match all types (this is true of the internal value too).
+ * - an array of type name strings, when more than one type is acceptable.
+ *
+ * @return bool
+ * True if the type matches, False otherwise.
+ */
+ public function is_type($type) {
+ if ($type === 'any' || $this->type === 'any') {
return TRUE;
}
@@ -58,32 +133,71 @@ class ctools_context {
return (bool) array_intersect($a, $b);
}
- function get_argument() {
+ /**
+ * Return the argument.
+ *
+ * @return mixed
+ * The value of $argument.
+ */
+ public function get_argument() {
return $this->argument;
}
- function get_original_argument() {
+ /**
+ * Return the value of argument (or arg) variable as it was passed in.
+ *
+ * For example see ctools_plugin_load_function() and ctools_terms_context().
+ *
+ * @return mixed
+ * The original arg value.
+ */
+ public function get_original_argument() {
if (!is_null($this->original_argument)) {
return $this->original_argument;
}
return $this->argument;
}
- function get_keyword() {
+ /**
+ * Return the keyword.
+ *
+ * @return mixed
+ * The value of $keyword.
+ */
+ public function get_keyword() {
return $this->keyword;
}
- function get_identifier() {
+ /**
+ * Return the identifier.
+ *
+ * @return mixed
+ * The value of $identifier.
+ */
+ public function get_identifier() {
return $this->identifier;
}
- function get_title() {
+ /**
+ * Return the title.
+ *
+ * @return mixed
+ * The value of $title.
+ */
+ public function get_title() {
return $this->title;
}
- function get_page_title() {
+ /**
+ * Return the page title.
+ *
+ * @return mixed
+ * The value of $page_title.
+ */
+ public function get_page_title() {
return $this->page_title;
}
+
}
/**
@@ -91,39 +205,57 @@ class ctools_context {
* match a required context type.
*/
class ctools_context_required {
- var $keywords = '';
+ /**
+ * @var array
+ * Keyword strings associated with the context.
+ */
+ public $keywords;
/**
* If set, the title will be used in the selector to identify
* the context. This is very useful when multiple contexts
* are required to inform the user will be used for what.
*/
- var $title = NULL;
+ public $title;
/**
* Test to see if this context is required.
*/
- var $required = TRUE;
+ public $required = TRUE;
/**
* If TRUE, skip the check in ctools_context_required::select()
* for contexts whose names may have changed.
*/
- var $skip_name_check = FALSE;
+ public $skip_name_check = FALSE;
/**
+ * The ctools_context_required constructor.
+ *
+ * Note: Constructor accepts a variable number of arguments, with optional
+ * type-dependent args at the end of the list and one required argument,
+ * the title. Note in particular that skip_name_check MUST be passed in as
+ * a boolean (and not, for example, as an integer).
*
- * @param $title
- * The first parameter should be the 'title' of the context for use
- * in UYI selectors when multiple contexts qualify.
- * @param ...
+ * @param string $title
+ * The title of the context for use in UI selectors when multiple contexts
+ * qualify.
+ * @param string $keywords
* One or more keywords to use for matching which contexts are allowed.
+ * @param array $restrictions
+ * Array of context restrictions.
+ * @param bool $skip_name_check
+ * If True, skip the check in select() for contexts whose names may have
+ * changed.
*/
- function ctools_context_required($title) {
+ public function __construct($title) {
+ // If it was possible, using variadic syntax this should be:
+ // __construct($title, string ...$keywords, array $restrictions = NULL, bool $skip = NULL)
+ // but that form isn't allowed.
$args = func_get_args();
$this->title = array_shift($args);
- // If we have a boolean value at the end for $skip_name_check, store it
+ // If we have a boolean value at the end for $skip_name_check, store it.
if (is_bool(end($args))) {
$this->skip_name_check = array_pop($args);
}
@@ -133,20 +265,44 @@ class ctools_context_required {
$this->restrictions = array_pop($args);
}
- if (count($args) == 1) {
+ if (count($args) === 1) {
$args = array_shift($args);
}
$this->keywords = $args;
}
- function filter($contexts) {
+ /**
+ * Filter the contexts to determine which apply in the current environment.
+ *
+ * A context passes the filter if:
+ * - the context matches 'type' of the required keywords (uses
+ * ctools_context::is_type(), so includes 'any' matches, etc).
+ * - AND if restrictions are present, there are some common elements between
+ * the requirement and the context.
+ *
+ * @param array $contexts
+ * An array of ctools_context objects (or something which will cast to an
+ * array of them). The contexts to apply the filter on.
+ *
+ * @return array
+ * An array of context objects, keyed with the same keys used for $contexts,
+ * which pass the filter.
+ *
+ * @see ctools_context::is_type()
+ */
+ public function filter($contexts) {
$result = array();
- // See which of these contexts are valid
+ /**
+ * See which of these contexts are valid.
+ * @var ctools_context $context
+ */
foreach ((array) $contexts as $cid => $context) {
if ($context->is_type($this->keywords)) {
+
// Compare to see if our contexts were met.
if (!empty($this->restrictions) && !empty($context->restrictions)) {
+
foreach ($this->restrictions as $key => $values) {
// If we have a restriction, the context must either not have that
// restriction listed, which means we simply don't know what it is,
@@ -155,11 +311,16 @@ class ctools_context_required {
if (!is_array($values)) {
$values = array($values);
}
- if (!empty($context->restrictions[$key]) && !array_intersect($values, $context->restrictions[$key])) {
+
+ if (!empty($context->restrictions[$key])
+ && !array_intersect($values, $context->restrictions[$key])
+ ) {
+ // Break out to check next context; this one fails the filter.
continue 2;
}
}
}
+ // This context passes the filter.
$result[$cid] = $context;
}
}
@@ -167,7 +328,28 @@ class ctools_context_required {
return $result;
}
- function select($contexts, $context) {
+ /**
+ * Select one context from the list of contexts, accounting for changed IDs.
+ *
+ * Fundamentally, this returns $contexts[$context] or FALSE if that does not
+ * exist. Additional logic accounts for changes in context names and dealing
+ * with a $contexts parameter that is not an array.
+ *
+ * If we had requested a $context but that $context doesn't exist in our
+ * context list, there is a good chance that what happened is the context
+ * IDs changed. Look for another context that satisfies our requirements,
+ * unless $skip_name_check is set.
+ *
+ * @param ctools_context|array $contexts
+ * A context, or an array of ctools_context.
+ * @param string $context
+ * A context ID.
+ *
+ * @return bool|ctools_context
+ * The matching ctools_context, or False if no such context was found.
+ */
+ public function select($contexts, $context) {
+ // Easier to deal with a standalone object as a 1-element array of objects.
if (!is_array($contexts)) {
if (is_object($contexts) && $contexts instanceof ctools_context) {
$contexts = array($contexts->id => $contexts);
@@ -177,11 +359,12 @@ class ctools_context_required {
}
}
- // If we had requested a $context but that $context doesn't exist
- // in our context list, there is a good chance that what happened
- // is our context IDs changed. See if there's another context
- // that satisfies our requirements.
- if (!$this->skip_name_check && !empty($context) && !isset($contexts[$context])) {
+ // If we had requested a $context but that $context doesn't exist in our
+ // context list, there is a good chance that what happened is the context
+ // IDs changed. Check for another context that satisfies our requirements.
+ if (!$this->skip_name_check
+ && !empty($context) && !isset($contexts[$context])
+ ) {
$choices = $this->filter($contexts);
// If we got a hit, take the first one that matches.
@@ -196,6 +379,7 @@ class ctools_context_required {
}
return $contexts[$context];
}
+
}
/**
@@ -203,28 +387,73 @@ class ctools_context_required {
* can produce empty contexts to use as placeholders.
*/
class ctools_context_optional extends ctools_context_required {
- var $required = FALSE;
- function ctools_context_optional() {
- $args = func_get_args();
- call_user_func_array(array($this, 'ctools_context_required'), $args);
- }
/**
- * Add the 'empty' context which is possible for optional
+ * {@inheritdoc}
*/
- function add_empty(&$contexts) {
+ public $required = FALSE;
+
+ /**
+ * Add the 'empty' context to the existing set.
+ *
+ * @param array &$contexts
+ * An array of ctools_context objects.
+ */
+ public function add_empty(&$contexts) {
$context = new ctools_context('any');
- $context->title = t('No context');
+ $context->title = t('No context');
$context->identifier = t('No context');
$contexts['empty'] = $context;
}
- function filter($contexts) {
+ /**
+ * Filter the contexts to determine which apply in the current environment.
+ *
+ * As for ctools_context_required, but we add the empty context to those
+ * passed in so the check is optional (i.e. if nothing else matches, the
+ * empty context will, and so there will always be at least one matched).
+ *
+ * @param array $contexts
+ * An array of ctools_context objects (or something which will cast to an
+ * array of them). The contexts to apply the filter on.
+ *
+ * @return array
+ * An array of context objects, keyed with the same keys used for $contexts,
+ * which pass the filter.
+ *
+ * @see ctools_context::is_type()
+ */
+ public function filter($contexts) {
+ /**
+ * @todo We are assuming here that $contexts is actually an array, whereas
+ * ctools_context_required::filter only requires $contexts is convertible
+ * to an array.
+ */
$this->add_empty($contexts);
return parent::filter($contexts);
}
- function select($contexts, $context) {
+ /**
+ * Select and return one context from the list of applicable contexts.
+ *
+ * Fundamentally, this returns $contexts[$context] or the empty context if
+ * that does not exist.
+ *
+ * @param array $contexts
+ * The applicable contexts to check.
+ * @param string $context
+ * The context id to check for.
+ *
+ * @return bool|ctools_context
+ * The matching ctools_context, or False if no such context was found.
+ *
+ * @see ctools_context_required::select()
+ */
+ public function select($contexts, $context) {
+ /**
+ * @todo We are assuming here that $contexts is actually an array, whereas
+ * ctools_context_required::select permits ctools_context objects as well.
+ */
$this->add_empty($contexts);
if (empty($context)) {
return $contexts['empty'];
@@ -234,11 +463,12 @@ class ctools_context_optional extends ctools_context_required {
// Don't flip out if it can't find the context; this is optional, put
// in an empty.
- if ($result == FALSE) {
+ if ($result === FALSE) {
$result = $contexts['empty'];
}
return $result;
}
+
}
/**
@@ -253,20 +483,20 @@ class ctools_context_optional extends ctools_context_required {
* Since multiple contexts can be required, this function will accept either
* an array of all required contexts, or just a single required context object.
*
- * @param $contexts
+ * @param array $contexts
* A keyed array of all available contexts.
- * @param $required
- * A ctools_context_required or ctools_context_optional object, or an array
- * of such objects.
+ * @param array|ctools_context_required|ctools_context_optional $required
+ * A *_required or *_optional object, or an array of such objects, which
+ * define the selection condition.
*
- * @return
+ * @return array
* A keyed array of contexts that match the filter.
*/
function ctools_context_filter($contexts, $required) {
if (is_array($required)) {
$result = array();
- foreach ($required as $r) {
- $result = array_merge($result, _ctools_context_filter($contexts, $r));
+ foreach ($required as $item) {
+ $result = array_merge($result, _ctools_context_filter($contexts, $item));
}
return $result;
}
@@ -274,6 +504,21 @@ function ctools_context_filter($contexts, $required) {
return _ctools_context_filter($contexts, $required);
}
+/**
+ * Helper function for ctools_context_filter().
+ *
+ * Used to transform the required context during the merge into the final array.
+ *
+ * @internal This function DOES NOT form part of the CTools API.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context_required|ctools_context_optional $required
+ * A ctools_context_required or ctools_context_optional object, although if
+ * given something else will return an empty array.
+ *
+ * @return array
+ */
function _ctools_context_filter($contexts, $required) {
$result = array();
@@ -293,12 +538,17 @@ function _ctools_context_filter($contexts, $required) {
* If an array of required contexts is provided, one selector will be
* provided for each context.
*
- * @param $contexts
+ * @param array $contexts
* A keyed array of all available contexts.
- * @param $required
+ * @param array|ctools_context_required|ctools_context_optional $required
* The required context object or array of objects.
+ * @param array|string $default
+ * The default value for the select object, suitable for a #default_value
+ * render key. Where $required is an array, this is an array keyed by the
+ * same key values as $required for all keys where an empty string is not a
+ * suitable default. Otherwise it is just the default value.
*
- * @return
+ * @return array
* A form element, or NULL if there are no contexts that satisfy the
* requirements.
*/
@@ -306,8 +556,10 @@ function ctools_context_selector($contexts, $required, $default) {
if (is_array($required)) {
$result = array('#tree' => TRUE);
$count = 1;
- foreach ($required as $id => $r) {
- $result[] = _ctools_context_selector($contexts, $r, isset($default[$id]) ? $default[$id] : '', $count++);
+ foreach ($required as $id => $item) {
+ $result[] = _ctools_context_selector(
+ $contexts, $item, isset($default[$id]) ? $default[$id] : '', $count++
+ );
}
return $result;
}
@@ -315,6 +567,27 @@ function ctools_context_selector($contexts, $required, $default) {
return _ctools_context_selector($contexts, $required, $default);
}
+/**
+ * Helper function for ctools_context_selector().
+ *
+ * @internal This function DOES NOT form part of the CTools API. Use the API
+ * function ctools_context_selector() instead.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context_required|ctools_context_optional $required
+ * The required context object.
+ * @param $default
+ * The default value for the select object, suitable for a #default_value
+ * render key.
+ * @param int $num
+ * If supplied and non-zero, the title of the select form element will be
+ * "Context $num", otherwise it will be "Context".
+ *
+ * @return array
+ * A form element, or NULL if there are no contexts that satisfy the
+ * requirements.
+ */
function _ctools_context_selector($contexts, $required, $default, $num = 0) {
$filtered = ctools_context_filter($contexts, $required);
$count = count($filtered);
@@ -358,8 +631,8 @@ function _ctools_context_selector($contexts, $required, $default, $num = 0) {
* @param $required
* The required context object or array of objects.
*
- * @return
- * TRUE if there are enough contexts, FALSE if there are not.
+ * @return bool
+ * True if there are enough contexts, otherwise False.
*/
function ctools_context_match_requirements($contexts, $required) {
if (!is_array($required)) {
@@ -392,8 +665,13 @@ function ctools_context_match_requirements($contexts, $required) {
* A keyed array of all available contexts.
* @param $required
* The required context object or array of objects.
+ * @param array|string $default
+ * The default value for the select object, suitable for a #default_value
+ * render key. Where $required is an array, this is an array keyed by the
+ * same key values as $required for all keys where an empty string is not a
+ * suitable default. Otherwise it is just the default value.
*
- * @return
+ * @return array
* A form element, or NULL if there are no contexts that satisfy the
* requirements.
*/
@@ -401,8 +679,11 @@ function ctools_context_converter_selector($contexts, $required, $default) {
if (is_array($required)) {
$result = array('#tree' => TRUE);
$count = 1;
- foreach ($required as $id => $r) {
- $result[] = _ctools_context_converter_selector($contexts, $r, isset($default[$id]) ? $default[$id] : '', $count++);
+ foreach ($required as $id => $dependency) {
+ $default_id = isset($default[$id]) ? $default[$id] : '';
+ $result[] = _ctools_context_converter_selector(
+ $contexts, $dependency, $default_id, $count++
+ );
}
return $result;
}
@@ -410,17 +691,36 @@ function ctools_context_converter_selector($contexts, $required, $default) {
return _ctools_context_converter_selector($contexts, $required, $default);
}
+/**
+ * Helper function for ctools_context_converter_selector().
+ *
+ * @internal This function DOES NOT form part of the CTools API. Use the API
+ * function ctools_context_converter_selector() instead.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context $required
+ * The required context object.
+ * @param $default
+ * The default value for the select object, suitable for a #default_value
+ * render key.
+ * @param int $num
+ * If supplied and non-zero, the title of the select form element will be
+ * "Context $num", otherwise it will be "Context".
+ *
+ * @return array|null
+ * A form element, or NULL if there are no contexts that satisfy the
+ * requirements.
+ */
function _ctools_context_converter_selector($contexts, $required, $default, $num = 0) {
$filtered = ctools_context_filter($contexts, $required);
$count = count($filtered);
- $form = array();
-
if ($count > 1) {
// If there's more than one to choose from, create a select widget.
$options = array();
foreach ($filtered as $cid => $context) {
- if ($context->type == 'any') {
+ if ($context->type === 'any') {
$options[''] = t('No context');
continue;
}
@@ -450,10 +750,22 @@ function _ctools_context_converter_selector($contexts, $required, $default, $num
'#default_value' => $default,
);
}
+ else {
+ // Not enough choices to need a selector, so don't make one.
+ return NULL;
+ }
}
/**
* Get a list of converters available for a given context.
+ *
+ * @param string $cid
+ * A context ID.
+ * @param ctools_context $context
+ * The context for which converters are needed.
+ *
+ * @return array
+ * A list of context converters.
*/
function ctools_context_get_converters($cid, $context) {
if (empty($context->plugin)) {
@@ -465,6 +777,17 @@ function ctools_context_get_converters($cid, $context) {
/**
* Get a list of converters available for a given context.
+ *
+ * @internal This function DOES NOT form part of the CTools API. Use the API
+ * function ctools_context_get_converters() instead.
+ *
+ * @param string $id
+ * A context ID.
+ * @param string $plugin_name
+ * The name of the context plugin.
+ *
+ * @return array
+ * A list of context converters.
*/
function _ctools_context_get_converters($id, $plugin_name) {
$plugin = ctools_get_context($plugin_name);
@@ -476,7 +799,7 @@ function _ctools_context_get_converters($id, $plugin_name) {
if (is_array($plugin['convert list'])) {
$converters = $plugin['convert list'];
}
- else if ($function = ctools_plugin_get_function($plugin, 'convert list')) {
+ elseif ($function = ctools_plugin_get_function($plugin, 'convert list')) {
$converters = (array) $function($plugin);
}
@@ -496,7 +819,13 @@ function _ctools_context_get_converters($id, $plugin_name) {
}
/**
- * Get a list of all contexts + converters available.
+ * Get a list of all contexts converters available.
+ *
+ * For all contexts returned by ctools_get_contexts(), return the converter
+ * for all contexts that have one.
+ *
+ * @return array
+ * A list of context converters, keyed by the title of the converter.
*/
function ctools_context_get_all_converters() {
$contexts = ctools_get_contexts();
@@ -516,21 +845,24 @@ function ctools_context_get_all_converters() {
/**
* Let the context convert an argument based upon the converter that was given.
*
- * @param $context
- * The context object
- * @param $converter
- * The converter to use, which should be a string provided by the converter list.
- * @param $converter_options
- * A n array of options to pass on to the generation function. For contexts
+ * @param ctools_context $context
+ * The context object.
+ * @param string $converter
+ * The type of converter to use, which should be a string provided by the
+ * converter list function.
+ * @param array $converter_options
+ * An array of options to pass on to the generation function. For contexts
* that use token module, of particular use is 'sanitize' => FALSE which can
* get raw tokens. This should ONLY be used in values that will later be
* treated as unsafe user input since these values are by themselves unsafe.
* It is particularly useful to get raw values from Field API.
+ *
+ * @return string|null
*/
function ctools_context_convert_context($context, $converter, $converter_options = array()) {
// Contexts without plugins might be optional placeholders.
if (empty($context->plugin)) {
- return;
+ return NULL;
}
$value = $context->argument;
@@ -551,22 +883,35 @@ function ctools_context_convert_context($context, $converter, $converter_options
* Choose a context or contexts based upon the selection made via
* ctools_context_filter.
*
- * @param $contexts
- * A keyed array of all available contexts
- * @param $required
- * The required context object provided by the plugin
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param array|ctools_context_required $required
+ * The required context object(s) provided by the plugin.
* @param $context
- * The selection made using ctools_context_selector
+ * The selection made using ctools_context_selector().
+ *
+ * @return ctools_context|array|false
+ * Returns FALSE if $required is not an object, or array of objects, or
+ * the value of $required->select() for the context, or an array of those (if
+ * passed an array in $required).
*/
function ctools_context_select($contexts, $required, $context) {
if (is_array($required)) {
+
+ /**
+ * @var array $required
+ * Array of required context objects.
+ * @var ctools_context_required $item
+ * A required context object.
+ */
$result = array();
- foreach ($required as $id => $r) {
+ foreach ($required as $id => $item) {
+ // @todo What's the difference between the following and "empty($item)" ?
if (empty($required[$id])) {
continue;
}
- if (($result[] = _ctools_context_select($contexts, $r, $context[$id])) === FALSE) {
+ if (($result[] = _ctools_context_select($contexts, $item, $context[$id])) === FALSE) {
return FALSE;
}
}
@@ -576,6 +921,22 @@ function ctools_context_select($contexts, $required, $context) {
return _ctools_context_select($contexts, $required, $context);
}
+/**
+ * Helper function for calling the required context object's selection function.
+ *
+ * This function DOES NOT form part of the CTools API.
+ *
+ * @param array $contexts
+ * A keyed array of all available contexts.
+ * @param ctools_context_required $required
+ * The required context object provided by the plugin.
+ * @param $context
+ * The selection made using ctools_context_selector().
+ *
+ * @return ctools_context|bool
+ * FALSE if the $required is not an object. A ctools_context object if one
+ * matched.
+ */
function _ctools_context_select($contexts, $required, $context) {
if (!is_object($required)) {
return FALSE;
@@ -587,16 +948,14 @@ function _ctools_context_select($contexts, $required, $context) {
/**
* Create a new context object.
*
- * @param $type
+ * @param string $type
* The type of context to create; this loads a plugin.
- * @param $data
+ * @param mixed $data
* The data to put into the context.
- * @param $empty
- * Whether or not this context is specifically empty.
* @param $conf
* A configuration structure if this context was created via UI.
*
- * @return
+ * @return ctools_context
* A $context or NULL if one could not be created.
*/
function ctools_context_create($type, $data = NULL, $conf = FALSE) {
@@ -619,7 +978,7 @@ function ctools_context_create($type, $data = NULL, $conf = FALSE) {
* @param $type
* The type of context to create; this loads a plugin.
*
- * @return
+ * @return ctools_context
* A $context or NULL if one could not be created.
*/
function ctools_context_create_empty($type) {
@@ -636,8 +995,21 @@ function ctools_context_create_empty($type) {
/**
* Perform keyword and context substitutions.
+ *
+ * @param string $string
+ * The string in which to replace keywords.
+ * @param array $keywords
+ * Array of keyword-replacement pairs.
+ * @param array $contexts
+ *
+ * @param array $converter_options
+ * Options to pass on to ctools_context_convert_context(), defaults to an
+ * empty array.
+ *
+ * @return string
+ * The returned string, with substitutions performed.
*/
-function ctools_context_keyword_substitute($string, $keywords, $contexts, $converter_options = array()) {
+function ctools_context_keyword_substitute($string, $keywords, $contexts, array $converter_options = array()) {
// Ensure a default keyword exists:
$keywords['%%'] = '%';
@@ -660,7 +1032,7 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
// If the keyword is already set by something passed in, don't try to
// overwrite it.
- if (!empty($keywords['%' . $keyword])) {
+ if (array_key_exists('%' . $keyword, $keywords)) {
continue;
}
@@ -680,14 +1052,21 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
}
}
- if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
- $keywords['%' . $keyword] = '';
- }
- else if (!empty($converter)) {
- $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
+ if (!isset($context_keywords[$context])) {
+ $keywords['%' . $keyword] = '%' . $keyword;
}
else {
- $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
+ if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
+ $keywords['%' . $keyword] = '';
+ }
+ else {
+ if (!empty($converter)) {
+ $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
+ }
+ else {
+ $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
+ }
+ }
}
}
}
@@ -695,18 +1074,22 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
}
/**
- * Determine a unique context ID for a context
+ * Determine a unique context ID for a context.
*
* Often contexts of many different types will be placed into a list. This
* ensures that even though contexts of multiple types may share IDs, they
* are unique in the final list.
*/
function ctools_context_id($context, $type = 'context') {
- if (!$context['id']) {
+ // If not set, FALSE or empty.
+ if (!isset($context['id']) || !$context['id']) {
$context['id'] = 1;
}
- return $type . '_' . $context['name'] . '_' . $context['id'];
+ // @todo is '' the appropriate default value?
+ $name = isset($context['name']) ? $context['name'] : '';
+
+ return $type . '_' . $name . '_' . $context['id'];
}
/**
@@ -714,42 +1097,46 @@ function ctools_context_id($context, $type = 'context') {
*
* This finds the next id available for the named object.
*
- * @param $objects
- * A list of context descriptor objects, i.e, arguments, relationships, contexts, etc.
- * @param $name
+ * @param array $objects
+ * A list of context descriptor objects, i.e, arguments, relationships,
+ * contexts, etc.
+ * @param string $name
* The name being used.
+ *
+ * @return int
+ * The next integer id available.
*/
function ctools_context_next_id($objects, $name) {
$id = 0;
- // Figure out which instance of this argument we're creating
+ // Figure out which instance of this argument we're creating.
if (!$objects) {
return $id + 1;
}
foreach ($objects as $object) {
- if (isset($object['name']) && $object['name'] == $name) {
- if ($object['id'] > $id) {
+ if (isset($object['name']) && $object['name'] === $name) {
+ if (isset($object['id']) && $object['id'] > $id) {
$id = $object['id'];
}
+ // @todo If obj has no 'id', should we increment local id? $id = $id + 1;
}
}
return $id + 1;
}
-
// ---------------------------------------------------------------------------
// Functions related to contexts from arguments.
-
/**
- * Fetch metadata on a specific argument plugin.
+ * Fetch metadata for a specific argument plugin.
*
* @param $argument
* Name of an argument plugin.
*
- * @return
+ * @return array
* An array with information about the requested argument plugin.
*/
+
function ctools_get_argument($argument) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'arguments', $argument);
@@ -758,7 +1145,7 @@ function ctools_get_argument($argument) {
/**
* Fetch metadata for all argument plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available argument plugins.
*/
function ctools_get_arguments() {
@@ -778,22 +1165,23 @@ function ctools_get_arguments() {
* - keyword: The keyword used for this argument for substitutions.
*
* @param $arg
- * The actual argument received. This is expected to be a string from a URL but
- * this does not have to be the only source of arguments.
+ * The actual argument received. This is expected to be a string from a URL
+ * but this does not have to be the only source of arguments.
* @param $empty
* If true, the $arg will not be used to load the context. Instead, an empty
* placeholder context will be loaded.
*
- * @return
+ * @return ctools_context
* A context object if one can be loaded.
*/
function ctools_context_get_context_from_argument($argument, $arg, $empty = FALSE) {
ctools_include('plugins');
if (empty($argument['name'])) {
- return;
+ return NULL;
}
- if ($function = ctools_plugin_load_function('ctools', 'arguments', $argument['name'], 'context')) {
+ $function = ctools_plugin_load_function('ctools', 'arguments', $argument['name'], 'context');
+ if ($function) {
// Backward compatibility: Merge old style settings into new style:
if (!empty($argument['settings'])) {
$argument += $argument['settings'];
@@ -805,8 +1193,8 @@ function ctools_context_get_context_from_argument($argument, $arg, $empty = FALS
if (is_object($context)) {
$context->identifier = $argument['identifier'];
$context->page_title = isset($argument['title']) ? $argument['title'] : '';
- $context->keyword = $argument['keyword'];
- $context->id = ctools_context_id($argument, 'argument');
+ $context->keyword = $argument['keyword'];
+ $context->id = ctools_context_id($argument, 'argument');
$context->original_argument = $arg;
if (!empty($context->empty)) {
@@ -822,6 +1210,12 @@ function ctools_context_get_context_from_argument($argument, $arg, $empty = FALS
/**
* Retrieve a list of empty contexts for all arguments.
+ *
+ * @param array $arguments
+ *
+ * @return array
+ *
+ * @see ctools_context_get_context_from_arguments()
*/
function ctools_context_get_placeholders_from_argument($arguments) {
$contexts = array();
@@ -837,19 +1231,21 @@ function ctools_context_get_placeholders_from_argument($arguments) {
/**
* Load the contexts for a given list of arguments.
*
- * @param $arguments
+ * @param array $arguments
* The array of argument definitions.
- * @param &$contexts
+ * @param array &$contexts
* The array of existing contexts. New contexts will be added to this array.
- * @param $args
+ * @param array $args
* The arguments to load.
*
- * @return
- * FALSE if an argument wants to 404.
+ * @return bool
+ * TRUE if all is well, FALSE if an argument wants to 404.
+ *
+ * @see ctools_context_get_context_from_argument()
*/
function ctools_context_get_context_from_arguments($arguments, &$contexts, $args) {
foreach ($arguments as $argument) {
- // pull the argument off the list.
+ // Pull the argument off the list.
$arg = array_shift($args);
$id = ctools_context_id($argument, 'argument');
@@ -864,7 +1260,10 @@ function ctools_context_get_context_from_arguments($arguments, &$contexts, $args
$context = $contexts[$id];
}
- if ((empty($context) || empty($context->data)) && !empty($argument['default']) && $argument['default'] == '404') {
+ if ((empty($context) || empty($context->data))
+ && !empty($argument['default'])
+ && $argument['default'] === '404'
+ ) {
return FALSE;
}
}
@@ -873,16 +1272,18 @@ function ctools_context_get_context_from_arguments($arguments, &$contexts, $args
// ---------------------------------------------------------------------------
// Functions related to contexts from relationships.
-
/**
- * Fetch metadata on a specific relationship plugin.
+ * Fetch plugin metadata for a specific relationship plugin.
*
- * @param $content type
+ * @param $relationship
* Name of a panel content type.
*
- * @return
+ * @return array
* An array with information about the requested relationship.
+ *
+ * @see ctools_get_relationships()
*/
+
function ctools_get_relationship($relationship) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'relationships', $relationship);
@@ -891,8 +1292,10 @@ function ctools_get_relationship($relationship) {
/**
* Fetch metadata for all relationship plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available relationships.
+ *
+ * @see ctools_get_relationship()
*/
function ctools_get_relationships() {
ctools_include('plugins');
@@ -900,8 +1303,9 @@ function ctools_get_relationships() {
}
/**
+ * Return a context from a relationship.
*
- * @param $relationship
+ * @param array $relationship
* The configuration of a relationship. It must contain the following data:
* - name: The name of the relationship plugin being used.
* - relationship_settings: The configuration based upon the plugin forms.
@@ -909,18 +1313,21 @@ function ctools_get_relationships() {
* defined by the UI.
* - keyword: The keyword used for this relationship for substitutions.
*
- * @param $source_context
+ * @param ctools_context $source_context
* The context this relationship is based upon.
- *
- * @param $placeholders
+ * @param bool $placeholders
* If TRUE, placeholders are acceptable.
*
- * @return
- * A context object if one can be loaded.
+ * @return ctools_context|null
+ * A context object if one can be loaded, otherwise NULL.
+ *
+ * @see ctools_context_get_relevant_relationships()
+ * @see ctools_context_get_context_from_relationships()
*/
function ctools_context_get_context_from_relationship($relationship, $source_context, $placeholders = FALSE) {
ctools_include('plugins');
- if ($function = ctools_plugin_load_function('ctools', 'relationships', $relationship['name'], 'context')) {
+ $function = ctools_plugin_load_function('ctools', 'relationships', $relationship['name'], 'context');
+ if ($function) {
// Backward compatibility: Merge old style settings into new style:
if (!empty($relationship['relationship_settings'])) {
$relationship += $relationship['relationship_settings'];
@@ -931,7 +1338,7 @@ function ctools_context_get_context_from_relationship($relationship, $source_con
if ($context) {
$context->identifier = $relationship['identifier'];
$context->page_title = isset($relationship['title']) ? $relationship['title'] : '';
- $context->keyword = $relationship['keyword'];
+ $context->keyword = $relationship['keyword'];
if (!empty($context->empty)) {
$context->placeholder = array(
'type' => 'relationship',
@@ -941,6 +1348,7 @@ function ctools_context_get_context_from_relationship($relationship, $source_con
return $context;
}
}
+ return NULL;
}
/**
@@ -954,18 +1362,24 @@ function ctools_context_get_context_from_relationship($relationship, $source_con
* @param $contexts
* An array of contexts used to figure out which relationships are relevant.
*
- * @return
+ * @return array
* An array of relationship keys that are relevant for the given set of
* contexts.
+ *
+ * @see ctools_context_filter()
+ * @see ctools_context_get_context_from_relationship()
+ * @see ctools_context_get_context_from_relationships()
*/
function ctools_context_get_relevant_relationships($contexts) {
$relevant = array();
$relationships = ctools_get_relationships();
- // Go through each relationship
+ // Go through each relationship.
foreach ($relationships as $rid => $relationship) {
// For each relationship, see if there is a context that satisfies it.
- if (empty($relationship['no ui']) && ctools_context_filter($contexts, $relationship['required context'])) {
+ if (empty($relationship['no ui'])
+ && ctools_context_filter($contexts, $relationship['required context'])
+ ) {
$relevant[$rid] = $relationship['title'];
}
}
@@ -974,7 +1388,7 @@ function ctools_context_get_relevant_relationships($contexts) {
}
/**
- * Fetch all active relationships
+ * Fetch all active relationships.
*
* @param $relationships
* An keyed array of relationship data including:
@@ -989,10 +1403,11 @@ function ctools_context_get_relevant_relationships($contexts) {
*
* @param $placeholders
* If TRUE, placeholders are acceptable.
+ *
+ * @see ctools_context_get_context_from_relationship()
+ * @see ctools_context_get_relevant_relationships()
*/
function ctools_context_get_context_from_relationships($relationships, &$contexts, $placeholders = FALSE) {
- $return = array();
-
foreach ($relationships as $rdata) {
if (!isset($rdata['context'])) {
continue;
@@ -1023,16 +1438,16 @@ function ctools_context_get_context_from_relationships($relationships, &$context
// ---------------------------------------------------------------------------
// Functions related to loading contexts from simple context definitions.
-
/**
* Fetch metadata on a specific context plugin.
*
- * @param $context
+ * @param string $context
* Name of a context.
*
- * @return
+ * @return array
* An array with information about the requested panel context.
*/
+
function ctools_get_context($context) {
static $gate = array();
ctools_include('plugins');
@@ -1056,7 +1471,7 @@ function ctools_get_context($context) {
/**
* Fetch metadata for all context plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available panel contexts.
*/
function ctools_get_contexts() {
@@ -1065,27 +1480,38 @@ function ctools_get_contexts() {
}
/**
+ * Return a context object from a context definition array.
*
- * @param $context
+ * The input $context contains the information needed to identify and invoke
+ * the context plugin and create the plugin context from that.
+ *
+ * @param array $context
* The configuration of a context. It must contain the following data:
* - name: The name of the context plugin being used.
* - context_settings: The configuration based upon the plugin forms.
* - identifier: The human readable identifier for this context, usually
* defined by the UI.
* - keyword: The keyword used for this context for substitutions.
- * @param $type
+ * @param string $type
* This is either 'context' which indicates the context will be loaded
- * from data in the settings, or 'required_context' which means the
+ * from data in the settings, or 'requiredcontext' which means the
* context must be acquired from an external source. This is the method
* used to pass pure contexts from one system to another.
+ * @param mixed $argument
+ * Optional information passed to the plugin context via the arg defined in
+ * the plugin's "placeholder name" field.
*
- * @return
+ * @return ctools_context|null
* A context object if one can be loaded.
+ *
+ * @see ctools_get_context()
+ * @see ctools_plugin_get_function()
*/
function ctools_context_get_context_from_context($context, $type = 'context', $argument = NULL) {
ctools_include('plugins');
$plugin = ctools_get_context($context['name']);
- if ($function = ctools_plugin_get_function($plugin, 'context')) {
+ $function = ctools_plugin_get_function($plugin, 'context');
+ if ($function) {
// Backward compatibility: Merge old style settings into new style:
if (!empty($context['context_settings'])) {
$context += $context['context_settings'];
@@ -1100,7 +1526,7 @@ function ctools_context_get_context_from_context($context, $type = 'context', $a
if ($return) {
$return->identifier = $context['identifier'];
$return->page_title = isset($context['title']) ? $context['title'] : '';
- $return->keyword = $context['keyword'];
+ $return->keyword = $context['keyword'];
if (!empty($context->empty)) {
$context->placeholder = array(
@@ -1112,6 +1538,8 @@ function ctools_context_get_context_from_context($context, $type = 'context', $a
return $return;
}
}
+
+ return NULL;
}
/**
@@ -1125,7 +1553,10 @@ function ctools_context_get_context_from_context($context, $type = 'context', $a
* Either 'context' or 'requiredcontext', which indicates whether the contexts
* are loaded from internal data or copied from an external source.
* @param $placeholders
- * If true, placeholders are acceptable.
+ * If True, placeholders are acceptable.
+ *
+ * @return array
+ * Array of contexts, keyed by context ID.
*/
function ctools_context_get_context_from_contexts($contexts, $type = 'context', $placeholders = FALSE) {
$return = array();
@@ -1144,17 +1575,20 @@ function ctools_context_get_context_from_contexts($contexts, $type = 'context',
/**
* Match up external contexts to our required contexts.
*
- * This function is used to create a list of contexts with proper
- * IDs based upon a list of required contexts.
+ * This function is used to create a list of contexts with proper IDs based
+ * upon a list of required contexts.
*
- * These contexts passed in should match the numeric positions of the
- * required contexts. The caller must ensure this has already happened
- * correctly as this function will not detect errors here.
+ * These contexts passed in should match the numeric positions of the required
+ * contexts. The caller must ensure this has already happened correctly as this
+ * function will not detect errors here.
*
* @param $required
* A list of required contexts as defined by the UI.
* @param $contexts
* A list of matching contexts as passed in from the calling system.
+ *
+ * @return array
+ * Array of contexts, keyed by context ID.
*/
function ctools_context_match_required_contexts($required, $contexts) {
$return = array();
@@ -1163,10 +1597,10 @@ function ctools_context_match_required_contexts($required, $contexts) {
}
foreach ($required as $r) {
- $context = clone(array_shift($contexts));
+ $context = clone array_shift($contexts);
$context->identifier = $r['identifier'];
$context->page_title = isset($r['title']) ? $r['title'] : '';
- $context->keyword = $r['keyword'];
+ $context->keyword = $r['keyword'];
$return[ctools_context_id($r, 'requiredcontext')] = $context;
}
@@ -1178,31 +1612,35 @@ function ctools_context_match_required_contexts($required, $contexts) {
*
* Not all of the types need to be supported by this object.
*
- * This function is not used to load contexts from external data, but may
- * be used to load internal contexts and relationships. Otherwise it can also
- * be used to generate a full set of placeholders for UI purposes.
+ * This function is not used to load contexts from external data, but may be
+ * used to load internal contexts and relationships. Otherwise it can also be
+ * used to generate a full set of placeholders for UI purposes.
*
- * @param $object
+ * @param object $object
* An object that contains some or all of the following variables:
*
- * - requiredcontexts: A list of UI configured contexts that are required
- * from an external source. Since these require external data, they will
- * only be added if $placeholders is set to TRUE, and empty contexts will
- * be created.
- * - arguments: A list of UI configured arguments that will create contexts.
- * Since these require external data, they will only be added if $placeholders
- * is set to TRUE.
- * - contexts: A list of UI configured contexts that have no external source,
- * and are essentially hardcoded. For example, these might configure a
- * particular node or a particular taxonomy term.
- * - relationships: A list of UI configured contexts to be derived from other
- * contexts that already exist from other sources. For example, these might
- * be used to get a user object from a node via the node author relationship.
- * @param $placeholders
- * If TRUE, this will generate placeholder objects for types this function
+ * - requiredcontexts: A list of UI configured contexts that are required
+ * from an external source. Since these require external data, they will
+ * only be added if $placeholders is set to TRUE, and empty contexts will
+ * be created.
+ * - arguments: A list of UI configured arguments that will create contexts.
+ * As these require external data, they will only be added if $placeholders
+ * is set to TRUE.
+ * - contexts: A list of UI configured contexts that have no external source,
+ * and are essentially hardcoded. For example, these might configure a
+ * particular node or a particular taxonomy term.
+ * - relationships: A list of UI configured contexts to be derived from other
+ * contexts that already exist from other sources. For example, these might
+ * be used to get a user object from a node via the node author
+ * relationship.
+ * @param bool $placeholders
+ * If True, this will generate placeholder objects for any types this function
* cannot load.
- * @param $contexts
+ * @param array $contexts
* An array of pre-existing contexts that will be part of the return value.
+ *
+ * @return array
+ * Merged output of all results of ctools_context_get_context_from_contexts().
*/
function ctools_context_load_contexts($object, $placeholders = TRUE, $contexts = array()) {
if (!empty($object->base_contexts)) {
@@ -1226,7 +1664,7 @@ function ctools_context_load_contexts($object, $placeholders = TRUE, $contexts =
$contexts += ctools_context_get_context_from_contexts($object->contexts, 'context', $placeholders);
}
- // add contexts from relationships
+ // Add contexts from relationships.
if (!empty($object->relationships) && is_array($object->relationships)) {
ctools_context_get_context_from_relationships($object->relationships, $contexts, $placeholders);
}
@@ -1245,7 +1683,7 @@ function ctools_context_load_contexts($object, $placeholders = TRUE, $contexts =
function ctools_context_get_form($contexts) {
if (!empty($contexts)) {
foreach ($contexts as $id => $context) {
- // if a form shows its id as being a 'required context' that means the
+ // If a form shows its id as being a 'required context' that means the
// the context is external to this display and does not count.
if (!empty($context->form_id) && substr($id, 0, 15) != 'requiredcontext') {
return $context;
@@ -1264,7 +1702,7 @@ function ctools_context_get_form($contexts) {
* The arguments. These will be acquired from $form_state['values'] and the
* keys must match the context IDs.
*
- * @return
+ * @return array
* A new $contexts array containing the replaced contexts. Not all contexts
* may be replaced if, for example, an argument was unable to be converted
* into a context.
@@ -1283,12 +1721,14 @@ function ctools_context_replace_placeholders($contexts, $arguments) {
$new_context = ctools_context_get_context_from_relationship($relationship, $contexts[$relationship['context']]);
}
break;
+
case 'argument':
if (isset($arguments[$cid]) && $arguments[$cid] !== '') {
$argument = $context->placeholder['conf'];
$new_context = ctools_context_get_context_from_argument($argument, $arguments[$cid]);
}
break;
+
case 'context':
if (!empty($arguments[$cid])) {
$context_info = $context->placeholder['conf'];
@@ -1337,32 +1777,37 @@ function ctools_context_replace_form(&$form, $contexts) {
if (is_array($plugin['placeholder form'])) {
$form[$cid] = $plugin['placeholder form'];
}
- else if (function_exists($plugin['placeholder form'])) {
- $widget = $plugin['placeholder form']($info);
- if ($widget) {
- $form[$cid] = $widget;
+ else {
+ if (function_exists($plugin['placeholder form'])) {
+ $widget = $plugin['placeholder form']($info);
+ if ($widget) {
+ $form[$cid] = $widget;
+ }
}
}
if (!empty($form[$cid])) {
- $form[$cid]['#title'] = t('@identifier (@keyword)', array('@keyword' => '%' . $context->keyword, '@identifier' => $context->identifier));
+ $form[$cid]['#title'] = t('@identifier (@keyword)', array(
+ '@keyword' => '%' . $context->keyword,
+ '@identifier' => $context->identifier,
+ ));
}
}
}
}
// ---------------------------------------------------------------------------
-// Functions related to loading access control plugins
-
+// Functions related to loading access control plugins.
/**
* Fetch metadata on a specific access control plugin.
*
* @param $name
* Name of a plugin.
*
- * @return
+ * @return array
* An array with information about the requested access control plugin.
*/
+
function ctools_get_access_plugin($name) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'access', $name);
@@ -1371,7 +1816,7 @@ function ctools_get_access_plugin($name) {
/**
* Fetch metadata for all access control plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available access control plugins.
*/
function ctools_get_access_plugins() {
@@ -1383,8 +1828,14 @@ function ctools_get_access_plugins() {
* Fetch a list of access plugins that are available for a given list of
* contexts.
*
- * if 'logged-in-user' is not in the list of contexts, it will be added as
+ * If 'logged-in-user' is not in the list of contexts, it will be added as
* this is required.
+ *
+ * @param array $contexts
+ * Array of ctools_context objects with which to select access plugins.
+ *
+ * @return array
+ * Array of applicable access plugins. Can be empty.
*/
function ctools_get_relevant_access_plugins($contexts) {
if (!isset($contexts['logged-in-user'])) {
@@ -1394,7 +1845,9 @@ function ctools_get_relevant_access_plugins($contexts) {
$all_plugins = ctools_get_access_plugins();
$plugins = array();
foreach ($all_plugins as $id => $plugin) {
- if (!empty($plugin['required context']) && !ctools_context_match_requirements($contexts, $plugin['required context'])) {
+ if (!empty($plugin['required context'])
+ && !ctools_context_match_requirements($contexts, $plugin['required context'])
+ ) {
continue;
}
$plugins[$id] = $plugin;
@@ -1409,14 +1862,17 @@ function ctools_get_relevant_access_plugins($contexts) {
function ctools_access_get_loggedin_context() {
$context = ctools_context_create('entity:user', array('type' => 'current'), TRUE);
$context->identifier = t('Logged in user');
- $context->keyword = 'viewer';
- $context->id = 0;
+ $context->keyword = 'viewer';
+ $context->id = 0;
return $context;
}
/**
* Get a summary of an access plugin's settings.
+ *
+ * @return string
+ * The summary text.
*/
function ctools_access_summary($plugin, $contexts, $test) {
if (!isset($contexts['logged-in-user'])) {
@@ -1426,8 +1882,9 @@ function ctools_access_summary($plugin, $contexts, $test) {
$description = '';
if ($function = ctools_plugin_get_function($plugin, 'summary')) {
$required_context = isset($plugin['required context']) ? $plugin['required context'] : array();
- $context = isset($test['context']) ? $test['context'] : array();
- $description = $function($test['settings'], ctools_context_select($contexts, $required_context, $context), $plugin);
+ $context = isset($test['context']) ? $test['context'] : array();
+ $selected_context = ctools_context_select($contexts, $required_context, $context);
+ $description = $function($test['settings'], $selected_context, $plugin);
}
if (!empty($test['not'])) {
@@ -1439,10 +1896,23 @@ function ctools_access_summary($plugin, $contexts, $test) {
/**
* Get a summary of a group of access plugin's settings.
+ *
+ * @param $access
+ * An array of settings theoretically set by the user, including the array
+ * of plugins to check:
+ * - 'plugins': the array of plugin metadata info to check
+ * - 'logic': (optional) either 'and' or 'or', indicating how to combine
+ * restrictions. Defaults to 'or'.
+ * @param array $contexts
+ * An array of zero or more contexts that may be used to determine if
+ * the user has access.
+ *
+ * @return string
+ * The summary text. Can be NULL if there are no plugins defined.
*/
function ctools_access_group_summary($access, $contexts) {
- if (empty($access['plugins'])) {
- return;
+ if (empty($access['plugins']) || !is_array($access['plugins'])) {
+ return NULL;
}
$descriptions = array();
@@ -1451,21 +1921,29 @@ function ctools_access_group_summary($access, $contexts) {
$descriptions[] = ctools_access_summary($plugin, $contexts, $test);
}
- $separator = (isset($access['logic']) && $access['logic'] == 'and') ? t(', and ') : t(', or ');
+ $separator =
+ (isset($access['logic']) && $access['logic'] === 'and')
+ ? t(', and ') : t(', or ');
return implode($separator, $descriptions);
}
/**
- * Determine if the current user has access via plugin.
+ * Determine if the current user has access via a plugin.
*
- * @param $settings
- * An array of settings theoretically set by the user.
- * @param $contexts
+ * @param array $settings
+ * An array of settings theoretically set by the user, including the array
+ * of plugins to check:
+ * - 'plugins': the array of plugin metadata info to check
+ * - 'logic': (optional) either 'and' or 'or', indicating how to combine
+ * restrictions. The 'or' case is not fully implemented and returns the
+ * input contexts unchanged.
+ *
+ * @param array $contexts
* An array of zero or more contexts that may be used to determine if
* the user has access.
*
- * @return
- * TRUE if access is granted, false if otherwise.
+ * @return bool
+ * TRUE if access is granted, FALSE if otherwise.
*/
function ctools_access($settings, $contexts = array()) {
if (empty($settings['plugins'])) {
@@ -1504,7 +1982,7 @@ function ctools_access($settings, $contexts = array()) {
// Pass if 'or' and this rule passed.
return TRUE;
}
- else if (!$pass && $settings['logic'] == 'and') {
+ elseif (!$pass && $settings['logic'] == 'and') {
// Fail if 'and' and this rule failed.
return FALSE;
}
@@ -1512,7 +1990,7 @@ function ctools_access($settings, $contexts = array()) {
// Return TRUE if logic was and, meaning all rules passed.
// Return FALSE if logic was or, meaning no rule passed.
- return $settings['logic'] == 'and';
+ return ($settings['logic'] === 'and');
}
/**
@@ -1521,7 +1999,7 @@ function ctools_access($settings, $contexts = array()) {
* @param $plugin
* The access plugin being used.
*
- * @return
+ * @return array
* A default configured test that should be placed in $access['plugins'];
*/
function ctools_access_new_test($plugin) {
@@ -1543,7 +2021,6 @@ function ctools_access_new_test($plugin) {
}
}
-
$default = NULL;
if (isset($plugin['default'])) {
$default = $plugin['default'];
@@ -1557,7 +2034,7 @@ function ctools_access_new_test($plugin) {
if (is_array($default)) {
$test['settings'] = $default;
}
- else if (function_exists($default)) {
+ elseif (function_exists($default)) {
$test['settings'] = $default();
}
else {
@@ -1571,11 +2048,23 @@ function ctools_access_new_test($plugin) {
/**
* Apply restrictions to contexts based upon the access control configured.
*
- * These restrictions allow the UI to not show content that may not
- * be relevant to all types of a particular context.
+ * These restrictions allow the UI to not show content that may not be relevant
+ * to all types of a particular context.
+ *
+ * @param array $settings
+ * Array of keys specifying the settings:
+ * - 'plugins': the array of plugin metadata info to check. If not set, or
+ * not an array, the function returns with no action.
+ * - 'logic': (optional) either 'and' or 'or', indicating how to combine
+ * restrictions. Defaults to 'and'.
+ * The 'or' case is not fully implemented and returns with no action if
+ * there is more than one plugin.
+ *
+ * @param array $contexts
+ * Array of available contexts.
*/
function ctools_access_add_restrictions($settings, $contexts) {
- if (empty($settings['plugins'])) {
+ if (empty($settings['plugins']) || !is_array($settings['plugins'])) {
return;
}
@@ -1584,16 +2073,20 @@ function ctools_access_add_restrictions($settings, $contexts) {
}
// We're not going to try to figure out restrictions on the or.
- if ($settings['logic'] == 'or' && count($settings['plugins']) > 1) {
+ if ($settings['logic'] === 'or' && count($settings['plugins']) > 1) {
return;
}
foreach ($settings['plugins'] as $test) {
$plugin = ctools_get_access_plugin($test['name']);
- if ($plugin && $function = ctools_plugin_get_function($plugin, 'restrictions')) {
+ // $plugin is 'array()' on error.
+ if ($plugin
+ && $function = ctools_plugin_get_function($plugin, 'restrictions')
+ ) {
$required_context = isset($plugin['required context']) ? $plugin['required context'] : array();
$context = isset($test['context']) ? $test['context'] : array();
$contexts = ctools_context_select($contexts, $required_context, $context);
+
if ($contexts !== FALSE) {
$function($test['settings'], $contexts);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.menu.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.menu.inc
index ee227cb7..798d167c 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.menu.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.menu.inc
@@ -25,7 +25,7 @@ function ctools_context_menu(&$items) {
'page callback' => 'ctools_context_ajax_item_delete',
) + $base;
- // For the access system
+ // For the access system.
$base['file'] = 'includes/context-access-admin.inc';
$items['ctools/context/ajax/access/add'] = array(
'page callback' => 'ctools_access_ajax_add',
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.theme.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.theme.inc
index 8f660b8c..d0d866f7 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/context.theme.inc
@@ -19,7 +19,6 @@ function ctools_context_theme(&$theme) {
);
$theme['ctools_context_item_form'] = array(
'render element' => 'form',
-// 'variables' => array('form' => NULL),
'file' => 'includes/context.theme.inc',
);
$theme['ctools_context_item_row'] = array(
@@ -27,7 +26,7 @@ function ctools_context_theme(&$theme) {
'file' => 'includes/context.theme.inc',
);
- // For the access plugin
+ // For the access plugin.
$theme['ctools_access_admin_add'] = array(
'render element' => 'form',
'file' => 'includes/context-access-admin.inc',
@@ -62,10 +61,10 @@ function theme_ctools_context_item_row($vars) {
function theme_ctools_context_item_form($vars) {
$form = $vars['form'];
- $output = '';
- $type = $form['#ctools_context_type'];
- $module = $form['#ctools_context_module'];
- $cache_key = $form['#cache_key'];
+ $output = '';
+ $type = $form['#ctools_context_type'];
+ $module = $form['#ctools_context_module'];
+ $cache_key = $form['#cache_key'];
$type_info = ctools_context_info($type);
@@ -104,17 +103,17 @@ function theme_ctools_context_item_form($vars) {
if (!empty($form['buttons'])) {
// Display the add context item.
- $row = array();
- $row[] = array('data' => render($form['buttons'][$type]['item']), 'class' => array('title'));
- $row[] = array('data' => render($form['buttons'][$type]['add']), 'class' => array('add'), 'width' => "60%");
- $output .= '';
}
if (!empty($form['description'])) {
$output .= render($form['description']);
@@ -139,7 +138,7 @@ function theme_ctools_context_list($vars) {
$description = (!empty($vars['description'])) ? $vars['description'] : NULL;
$titles = array();
$output = '';
- $count = 1;
+ $count = 1;
$contexts = ctools_context_load_contexts($object);
@@ -209,7 +208,7 @@ function theme_ctools_context_list($vars) {
}
}
- // And relationships
+ // And relationships.
if (!empty($object->relationships)) {
foreach ($object->relationships as $relationship) {
$output .= '';
@@ -253,15 +252,15 @@ function theme_ctools_context_list($vars) {
}
/**
- * ctools_context_list() but not in a table format because tabledrag
- * won't let us have tables within tables and still drag.
+ * The ctools_context_list() function but not in a table format because
+ * tabledrag won't let us have tables within tables and still drag.
*/
function theme_ctools_context_list_no_table($vars) {
$object = $vars['object'];
ctools_add_css('context');
$titles = array();
$output = '';
- $count = 1;
+ $count = 1;
// Describe 'built in' contexts.
if (!empty($object->base_contexts)) {
foreach ($object->base_contexts as $id => $context) {
@@ -312,7 +311,7 @@ function theme_ctools_context_list_no_table($vars) {
$count++;
}
}
- // And relationships
+ // And relationships.
if (!empty($object->relationships)) {
foreach ($object->relationships as $relationship) {
$output .= '
' . var_export($conf['config_item_1'], TRUE) . '
';
}
if (!empty($context)) {
@@ -77,7 +75,6 @@ function relcontext_content_type_render($subtype, $conf, $args, $context) {
/**
* 'Edit' callback for the content type.
* This example just returns a form.
- *
*/
function relcontext_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc
index a308683c..e34fa18e 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/content_types/simplecontext_content_type.inc
@@ -1,6 +1,5 @@
'simplecontext_content_type_edit_form',
'admin title' => 'ctools_plugin_example_simplecontext_content_type_admin_title',
- // presents a block which is used in the preview of the data.
+ // Presents a block which is used in the preview of the data.
// Pn Panels this is the preview pane shown on the panels building page.
'admin info' => 'ctools_plugin_example_simplecontext_content_type_admin_info',
'category' => array(t('CTools Examples'), -9),
@@ -103,7 +101,6 @@ function simplecontext_content_type_render($subtype, $conf, $args, $context) {
/**
* 'Edit' callback for the content type.
* This example just returns a form.
- *
*/
function simplecontext_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc
index 0c7ef113..61e25db0 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/relcontext.inc
@@ -80,4 +80,3 @@ function relcontext_settings_form($conf, $external = FALSE) {
);
return $form;
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc
index e19a8422..0ee4658d 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/contexts/simplecontext.inc
@@ -1,10 +1,8 @@
t("Simplecontext"),
'description' => t('A single "simplecontext" context, or data element.'),
- 'context' => 'ctools_plugin_example_context_create_simplecontext', // func to create context
+// Func to create context.
+ 'context' => 'ctools_plugin_example_context_create_simplecontext',
'context name' => 'simplecontext',
'settings form' => 'simplecontext_settings_form',
'keyword' => 'simplecontext',
@@ -69,7 +68,7 @@ function ctools_plugin_example_context_create_simplecontext($empty, $data = NULL
// This is used for keyword.
$context->title = $data;
$context->argument = $data;
- // Make up a bogus context
+ // Make up a bogus context.
$context->data = new stdClass();
$context->data->item1 = t("Item1");
$context->data->item2 = t("Item2");
@@ -102,8 +101,6 @@ function simplecontext_settings_form($conf, $external = FALSE) {
return $form;
}
-
-
/**
* Provide a list of sub-keywords.
*
@@ -125,10 +122,11 @@ function simplecontext_convert($context, $type) {
switch ($type) {
case 'item1':
return $context->data->item1;
+
case 'item2':
return $context->data->item2;
+
case 'description':
return $context->data->description;
}
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/panels.pages.inc b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/panels.pages.inc
index d3022af7..25422cfa 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/panels.pages.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/ctools_plugin_example/plugins/panels.pages.inc
@@ -19,24 +19,24 @@ function ctools_plugin_example_default_panel_pages() {
$page->load_flags = 1;
$page->css_id = '';
$page->arguments = array(
- 0 =>
+ 0 =>
array(
- 'name' => 'simplecontext_arg',
- 'id' => 1,
- 'default' => '404',
- 'title' => '',
- 'identifier' => 'Simplecontext arg',
- 'keyword' => 'simplecontext',
+ 'name' => 'simplecontext_arg',
+ 'id' => 1,
+ 'default' => '404',
+ 'title' => '',
+ 'identifier' => 'Simplecontext arg',
+ 'keyword' => 'simplecontext',
),
);
$page->relationships = array(
- 0 =>
+ 0 =>
array(
- 'context' => 'argument_simplecontext_arg_1',
- 'name' => 'relcontext_from_simplecontext',
- 'id' => 1,
- 'identifier' => 'Relcontext from Simplecontext',
- 'keyword' => 'relcontext',
+ 'context' => 'argument_simplecontext_arg_1',
+ 'name' => 'relcontext_from_simplecontext',
+ 'id' => 1,
+ 'identifier' => 'Relcontext from Simplecontext',
+ 'keyword' => 'relcontext',
),
);
$page->no_blocks = '0';
@@ -58,14 +58,14 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => '"No Context Item"',
- 'body' => 'The "no context item" content type is here to demonstrate that you can create a content_type that does not require a context. This is probably the same as just creating a custom php block on the fly, and might serve the same purpose.',
- 'format' => '1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => '"No Context Item"',
+ 'body' => 'The "no context item" content type is here to demonstrate that you can create a content_type that does not require a context. This is probably the same as just creating a custom php block on the fly, and might serve the same purpose.',
+ 'format' => '1',
);
$pane->cache = array();
$display->content['new-1'] = $pane;
@@ -78,14 +78,14 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'description';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'item1' => 'one',
- 'item2' => 'two',
- 'item3' => 'three',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'item1' => 'one',
+ 'item2' => 'two',
+ 'item3' => 'three',
);
$pane->cache = array();
$display->content['new-2'] = $pane;
@@ -98,16 +98,16 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => 'Simplecontext',
- 'body' => 'The "Simplecontext" content and content type demonstrate a very basic context and how to display it.
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => 'Simplecontext',
+ 'body' => 'The "Simplecontext" content and content type demonstrate a very basic context and how to display it.
Simplecontext includes configuration, so it can get info from the config. It can also get its information to run from a simplecontext context, generated either from an arg to the panels page or via explicitly adding a context to the page.',
- 'format' => '1',
+ 'format' => '1',
);
$pane->cache = array();
$display->content['new-3'] = $pane;
@@ -119,17 +119,17 @@ function ctools_plugin_example_default_panel_pages() {
$pane->shown = '1';
$pane->subtype = 'description';
$pane->access = array(
- 0 => '2',
- 1 => '4',
+ 0 => '2',
+ 1 => '4',
);
$pane->configuration = array(
- 'context' => 'argument_simplecontext_arg_1',
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'config_item_1' => 'simplecontext called from arg',
+ 'context' => 'argument_simplecontext_arg_1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'config_item_1' => 'simplecontext called from arg',
);
$pane->cache = array();
$display->content['new-4'] = $pane;
@@ -142,14 +142,14 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => 'Relcontext',
- 'body' => 'The relcontext content_type gets its data from a relcontext, which is an example of a relationship. This panel should be run with an argument like "/xxx", which allows the simplecontext to get its context, and then the relcontext is configured in this panel to get (create) its data from the simplecontext.',
- 'format' => '1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => 'Relcontext',
+ 'body' => 'The relcontext content_type gets its data from a relcontext, which is an example of a relationship. This panel should be run with an argument like "/xxx", which allows the simplecontext to get its context, and then the relcontext is configured in this panel to get (create) its data from the simplecontext.',
+ 'format' => '1',
);
$pane->cache = array();
$display->content['new-5'] = $pane;
@@ -162,13 +162,13 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'description';
$pane->access = array();
$pane->configuration = array(
- 'context' => 'relationship_relcontext_from_simplecontext_1',
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'config_item_1' => 'default1',
+ 'context' => 'relationship_relcontext_from_simplecontext_1',
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'config_item_1' => 'default1',
);
$pane->cache = array();
$display->content['new-6'] = $pane;
@@ -181,13 +181,13 @@ function ctools_plugin_example_default_panel_pages() {
$pane->subtype = 'custom_php';
$pane->access = array();
$pane->configuration = array(
- 'style' => 'default',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'css_id' => '',
- 'css_class' => '',
- 'title' => '',
- 'body' => '$arg = arg(1);
+ 'style' => 'default',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'css_id' => '',
+ 'css_class' => '',
+ 'title' => '',
+ 'body' => '$arg = arg(1);
$arg0 = arg(0);
if (!$arg) {
$block->content = <<The export section of the schema file
Customizing the modal
- type: Either fixed or scale. If fixed, the modal will always be a fixed size. If scale the modal will scale to a percentage of the browser window. Default: scale. -
- width: If fixed the width in pixels. If scale the percentage of the screen expressed as a number less than zero. (For 80 percent, use .8, for example). Default: .8 +
- width: If fixed the width in pixels. If scale the percentage of the screen expressed as a number less than zero. (For 80 percent, use .8, for example). Default: .8
- height: If fixed the height in pixels. If scale the percentage of the screen expressed as a number less than zero. (For 80 percent, use .8, for example). Default: .8
- addWidth: Any additional width to add to the modal in pixels. Only useful if the type is scale. Default: 0
- addHeight: Any additional height to add to the modal in pixels. Only useful if the type is scale. Default: 0 @@ -168,7 +168,7 @@
Rendering within the modal
function ctools_ajax_hello_world($js) {
$title = t('Greetings');
- $output = '<p>' . t('Hello world') . ''</p>';
+ $output = '<p>' . t('Hello world') . '</p>';
if ($js) {
ctools_modal_render($title, $output);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/help/plugins-creating.html b/profiles/commerce_kickstart/modules/contrib/ctools/help/plugins-creating.html
index 23237058..6d5b35f6 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/help/plugins-creating.html
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/help/plugins-creating.html
@@ -26,7 +26,7 @@ Defining a plugin
- - a file name:
- the file which holds the class with the name structure as: [filename].[class].php @@ -35,6 +35,7 @@
- if the class is in the same file as the $plugin
- the plugin .inc file can have a different name than the class identifier
Defining a plugin
';
@@ -341,4 +340,3 @@ function theme_ctools_context_list_no_table($vars) {
return $output;
}
-
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/css.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/css.inc
index 8cf5ed40..83fe1c34 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/css.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/css.inc
@@ -1,6 +1,6 @@
$declaration) {
foreach ($declaration as $property => $value) {
if (!in_array($property, $allowed_properties)) {
- // $filtered['properties'][$selector_str][$property] = $value;
+ // $filtered['properties'][$selector_str][$property] = $value;.
unset($css[$selector_str][$property]);
continue;
}
$value = str_replace('!important', '', $value);
if (preg_match($disallowed_values_regex, $value) || !(in_array($value, $allowed_values) || preg_match($allowed_values_regex, $value))) {
- // $filtered['values'][$selector_str][$property] = $value;
+ // $filtered['values'][$selector_str][$property] = $value;.
unset($css[$selector_str][$property]);
continue;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/dependent.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/dependent.inc
index 74de9197..20c25ded 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/dependent.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/dependent.inc
@@ -44,7 +44,7 @@
*
* A fuller example, that hides the menu title when no menu is selected:
* @code
- *function ctools_dependent_example() {
+ * function ctools_dependent_example() {
* $form = array();
* $form['menu'] = array(
* '#type' => 'fieldset',
@@ -72,12 +72,12 @@
* );
*
* return system_settings_form($form);
- *}
+ * }
* @endcode
*
* An example for hiding checkboxes using #prefix and #suffix:
* @code
- *function ctools_dependent_example_checkbox() {
+ * function ctools_dependent_example_checkbox() {
* $form = array();
* $form['object'] = array(
* '#type' => 'fieldset',
@@ -111,7 +111,7 @@
* );
*
* return system_settings_form($form);
- *}
+ * }
* @endcode
*
* Deprecated:
@@ -125,7 +125,6 @@
/**
* Process callback to add dependency to form items.
- *
*/
function ctools_dependent_process($element, &$form_state, &$form) {
return $element;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropbutton.theme.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropbutton.theme.inc
index fcdd5a37..8ce99f07 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropbutton.theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropbutton.theme.inc
@@ -75,7 +75,7 @@ function theme_links__ctools_dropbutton($vars) {
if (!empty($vars['links'])) {
$is_drop_button = (count($vars['links']) > 1);
- // Add needed files
+ // Add needed files.
if ($is_drop_button) {
ctools_add_js('dropbutton');
ctools_add_css('dropbutton');
@@ -86,7 +86,7 @@ function theme_links__ctools_dropbutton($vars) {
static $id = 0;
$id++;
- // Wrapping div
+ // Wrapping div.
$class = 'ctools-no-js';
$class .= ($is_drop_button) ? ' ctools-dropbutton' : '';
$class .= ' ctools-button';
@@ -98,7 +98,7 @@ function theme_links__ctools_dropbutton($vars) {
$output .= '
';
}
- // The button content
+ // The button content.
$output .= '';
- // Add a twisty if this is a dropbutton
+ // Add a twisty if this is a dropbutton.
if ($is_drop_button) {
$vars['title'] = ($vars['title'] ? check_plain($vars['title']) : t('open'));
@@ -109,10 +109,11 @@ function theme_links__ctools_dropbutton($vars) {
else {
$output .= '' . $vars['title'] . '';
}
- $output .= '
'; // ctools-link
+ // ctools-link.
+ $output .= '';
// Check for attributes. theme_links expects an array().
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropdown.theme.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropdown.theme.inc
index 7e748f5e..2437b89e 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropdown.theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/dropdown.theme.inc
@@ -57,7 +57,7 @@ function ctools_dropdown_theme(&$items) {
* to style a single dropdown however you like without interfering with
* other dropdowns.
*/
-function theme_ctools_dropdown($vars) {
+function theme_ctools_dropdown($vars) {
// Provide a unique identifier for every dropdown on the page.
static $id = 0;
$id++;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/entity-access.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/entity-access.inc
index 972cf13b..69f2c335 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/entity-access.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/entity-access.inc
@@ -24,19 +24,23 @@ function _ctools_entity_access(&$entity_info, $entity_type) {
// Sad panda, we don't use Entity API, lets manually add access callbacks.
$entity_info['access callback'] = 'ctools_metadata_no_hook_node_access';
break;
+
case 'user':
$entity_info['access callback'] = 'ctools_metadata_user_access';
break;
+
case 'comment':
if (module_exists('comment')) {
$entity_info['access callback'] = 'ctools_metadata_comment_access';
}
break;
+
case 'taxonomy_term':
if (module_exists('taxonomy')) {
$entity_info['access callback'] = 'ctools_metadata_taxonomy_access';
}
break;
+
case 'taxonomy_vocabulary':
if (module_exists('taxonomy')) {
$entity_info['access callback'] = 'ctools_metadata_taxonomy_access';
@@ -64,7 +68,7 @@ function _ctools_entity_access(&$entity_info, $entity_type) {
*
* @throws EntityMalformedException
*
- * @return boolean
+ * @return bool
* TRUE if access is allowed, FALSE otherwise.
*/
function ctools_metadata_no_hook_node_access($op, $node = NULL, $account = NULL) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.inc
index 16e57d6e..1eb87ae7 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.inc
@@ -81,7 +81,6 @@ function ctools_export_ui_process(&$plugin, $info) {
// Add some default fields that appear often in exports
// If these use different keys they can easily be specified in the
// $plugin.
-
if (empty($plugin['export']['admin_title']) && !empty($schema['fields']['admin_title'])) {
$plugin['export']['admin_title'] = 'admin_title';
}
@@ -297,7 +296,6 @@ function ctools_export_ui_process(&$plugin, $info) {
);
// Define strings.
-
// For all strings, %title may be filled in at a later time via str_replace
// since we do not know the title now.
$plugin['strings'] += array(
@@ -414,6 +412,7 @@ function ctools_export_ui_plugin_base_path($plugin) {
* The id in the menu items from the plugin.
* @param $export_key
* The export key of the item being edited, if it exists.
+ *
* @return
* The menu path to the plugin's list.
*/
@@ -429,12 +428,11 @@ function ctools_export_ui_plugin_menu_path($plugin, $item_id, $export_key = NULL
* Helper function to include CTools plugins and get an export-ui exportable.
*
* @param $plugin_name
- * The plugin that should be laoded.
+ * The plugin that should be loaded.
*/
function ctools_get_export_ui($plugin_name) {
ctools_include('plugins');
return ctools_get_plugins('ctools', 'export_ui', $plugin_name);
-
}
/**
@@ -456,14 +454,14 @@ function ctools_export_ui_switcher_page($plugin_name, $op) {
$args = func_get_args();
$js = !empty($_REQUEST['js']);
- // Load the $plugin information
+ // Load the $plugin information.
$plugin = ctools_get_export_ui($plugin_name);
$handler = ctools_export_ui_get_handler($plugin);
if ($handler) {
$method = $op . '_page';
if (method_exists($handler, $method)) {
- // replace the first two arguments:
+ // Replace the first two arguments:
$args[0] = $js;
$args[1] = $_POST;
return call_user_func_array(array($handler, $method), $args);
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.menu.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.menu.inc
index d27bf157..0fda8c25 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.menu.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/export-ui.menu.inc
@@ -1,5 +1,9 @@
array('handler'),
);
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/export.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/export.inc
index 0b85c2ef..d2fff2fd 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/export.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/export.inc
@@ -4,7 +4,7 @@
* @file
* Contains code to make it easier to have exportable objects.
*
- * Documentation for exportable objects is contained in help/export.html
+ * Documentation for exportable objects is contained in help/export.html.
*/
/**
@@ -126,6 +126,7 @@ function ctools_export_crud_load_multiple($table, array $names) {
* If TRUE, the static cache of all objects will be flushed prior to
* loading all. This can be important on listing pages where items
* might have changed on the page load.
+ *
* @return
* An array of all loaded objects, keyed by the unique IDs of the export key.
*/
@@ -328,7 +329,6 @@ function ctools_export_crud_set_status($table, $object, $status) {
}
-
/**
* Enable a certain object.
*
@@ -426,7 +426,7 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
}
}
- // Build the query
+ // Build the query.
$query = db_select($table, 't__0')->fields('t__0');
$alias_count = 1;
if (!empty($schema['join'])) {
@@ -451,7 +451,7 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
if ($type == 'names') {
$query->condition($export['key'], $args, 'IN');
}
- else if ($type == 'conditions') {
+ elseif ($type == 'conditions') {
foreach ($args as $key => $value) {
if (isset($schema['fields'][$key])) {
$query->condition($key, $value);
@@ -499,7 +499,7 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
if ($defaults) {
foreach ($defaults as $object) {
if ($type == 'conditions') {
- // if this does not match all of our conditions, skip it.
+ // If this does not match all of our conditions, skip it.
foreach ($args as $key => $value) {
if (!isset($object->$key)) {
continue 2;
@@ -509,12 +509,12 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
continue 2;
}
}
- else if ($object->$key != $value) {
+ elseif ($object->$key != $value) {
continue 2;
}
}
}
- else if ($type == 'names') {
+ elseif ($type == 'names') {
if (!in_array($object->{$export['key']}, $args)) {
continue;
}
@@ -561,7 +561,6 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
}
}
- // For conditions,
return $return;
}
@@ -807,10 +806,10 @@ function _ctools_export_get_some_defaults($table, $export, $names) {
function _ctools_export_unpack_object($schema, $data, $object = 'stdClass') {
if (is_string($object)) {
if (class_exists($object)) {
- $object = new $object;
+ $object = new $object();
}
else {
- $object = new stdClass;
+ $object = new stdClass();
}
}
@@ -873,14 +872,14 @@ function ctools_var_export($var, $prefix = '') {
$output .= $prefix . ')';
}
}
- else if (is_object($var) && get_class($var) === 'stdClass') {
+ elseif (is_object($var) && get_class($var) === 'stdClass') {
// var_export() will export stdClass objects using an undefined
// magic method __set_state() leaving the export broken. This
// workaround avoids this by casting the object as an array for
// export and casting it back to an object when evaluated.
$output = '(object) ' . ctools_var_export((array) $var, $prefix);
}
- else if (is_bool($var)) {
+ elseif (is_bool($var)) {
$output = $var ? 'TRUE' : 'FALSE';
}
else {
@@ -902,7 +901,8 @@ function ctools_export_object($table, $object, $indent = '', $identifier = NULL,
$output = $indent . '$' . $identifier . ' = new ' . get_class($object) . "();\n";
if ($schema['export']['can disable']) {
- $output .= $indent . '$' . $identifier . '->disabled = FALSE; /* Edit this to true to make a default ' . $identifier . ' disabled initially */' . "\n";
+ $disabled = !isset($object->disabled) || $object->disabled != TRUE ? 'FALSE' : 'TRUE';
+ $output .= $indent . '$' . $identifier . '->disabled = ' . $disabled . '; /* Edit this to true to make a default ' . $identifier . ' disabled initially */' . "\n";
}
if (!empty($schema['export']['api']['current_version'])) {
$output .= $indent . '$' . $identifier . '->api_version = ' . $schema['export']['api']['current_version'] . ";\n";
@@ -958,7 +958,7 @@ function ctools_export_object($table, $object, $indent = '', $identifier = NULL,
}
}
- // And bottom additions here
+ // And bottom additions here.
foreach ($additions2 as $field => $value) {
$output .= $indent . '$' . $identifier . '->' . $field . ' = ' . ctools_var_export($value, $indent) . ";\n";
}
@@ -986,7 +986,7 @@ function ctools_export_get_schema($table) {
// simply hasn't been cached. If we've been asked, let's force the
// issue.
if (!$schema || empty($schema['export'])) {
- // force a schema reset:
+ // Force a schema reset:
$schema = drupal_get_schema($table, TRUE);
}
@@ -998,7 +998,7 @@ function ctools_export_get_schema($table) {
return array();
}
- // Add some defaults
+ // Add some defaults.
$schema['export'] += array(
'key' => 'name',
'key name' => 'Name',
@@ -1106,7 +1106,7 @@ function ctools_export_set_object_status($object, $new_status = TRUE) {
$export = $schema['export'];
$status = variable_get($export['status'], array());
- // Compare
+ // Compare.
if (!$new_status && $object->export_type & EXPORT_IN_DATABASE) {
unset($status[$object->{$export['key']}]);
}
@@ -1149,12 +1149,12 @@ function ctools_export_new_object($table, $set_defaults = TRUE) {
$schema = ctools_export_get_schema($table);
$export = $schema['export'];
- $object = new $export['object'];
+ $object = new $export['object']();
foreach ($schema['fields'] as $field => $info) {
if (isset($info['object default'])) {
$object->$field = $info['object default'];
}
- else if (isset($info['default'])) {
+ elseif (isset($info['default'])) {
$object->$field = $info['default'];
}
else {
@@ -1179,11 +1179,11 @@ function ctools_export_new_object($table, $set_defaults = TRUE) {
function ctools_export_to_hook_code(&$code, $table, $names = array(), $name = 'foo') {
$schema = ctools_export_get_schema($table);
$export = $schema['export'];
- // Use the schema-specified function for generating hook code, if one exists
+ // Use the schema-specified function for generating hook code, if one exists.
if (function_exists($export['to hook code callback'])) {
$output = $export['to hook code callback']($names, $name);
}
- // Otherwise, the following code generates basic hook code
+ // Otherwise, the following code generates basic hook code.
else {
$output = ctools_export_default_to_hook_code($schema, $table, $names, $name);
}
@@ -1227,7 +1227,7 @@ function ctools_export_default_to_hook_code($schema, $table, $names, $name) {
$output .= " \${$export['identifier']}s = array();\n\n";
foreach ($objects as $object) {
$output .= ctools_export_crud_export($table, $object, ' ');
- $output .= " \${$export['identifier']}s['" . check_plain($object->$export['key']) . "'] = \${$export['identifier']};\n\n";
+ $output .= " \${$export['identifier']}s['" . check_plain($object->{$export['key']}) . "'] = \${$export['identifier']};\n\n";
}
$output .= " return \${$export['identifier']}s;\n";
$output .= "}\n";
@@ -1235,6 +1235,7 @@ function ctools_export_default_to_hook_code($schema, $table, $names, $name) {
return $output;
}
+
/**
* Default function for listing bulk exportable objects.
*/
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/fields.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/fields.inc
index f379f5e9..0d3256f2 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/fields.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/fields.inc
@@ -5,7 +5,6 @@
* Extend core fields with some helper functions to reduce code complexity within views and ctools plugins.
*/
-
/**
* Fake an instance of a field.
*
@@ -75,27 +74,30 @@ function ctools_fields_get_field_formatter_settings_form($field, $formatter_type
$conf['formatter_settings'] += $formatter['settings'];
}
$function = $formatter['module'] . '_field_formatter_settings_form';
+
+ $instance = ctools_fields_fake_field_instance($field['field_name'], $view_mode, $formatter_type, $conf['formatter_settings']);
if (function_exists($function)) {
- $instance = ctools_fields_fake_field_instance($field['field_name'], $view_mode, $formatter_type, $conf['formatter_settings']);
$settings_form = $function($field, $instance, $view_mode, $form, $form_state);
- if ($settings_form) {
- // Allow other modules to alter the formatter settings form.
- $context = array(
- 'module' => $formatter['module'],
- 'formatter' => $formatter,
- 'field' => $field,
- 'instance' => $instance,
- 'view_mode' => $view_mode,
- 'form' => $form,
- 'form_state' => $form_state,
- );
- drupal_alter('field_formatter_settings_form', $settings_form, $context);
-
- $settings_form['#tree'] = TRUE;
- $form['ctools_field_list']['#value'][] = $field;
- $form += $settings_form;
- }
}
+ if (empty($settings_form)) {
+ $settings_form = array();
+ }
+
+ // Allow other modules to alter the formatter settings form.
+ $context = array(
+ 'module' => $formatter['module'],
+ 'formatter' => $formatter,
+ 'field' => $field,
+ 'instance' => $instance,
+ 'view_mode' => $view_mode,
+ 'form' => $form,
+ 'form_state' => $form_state,
+ );
+ drupal_alter('field_formatter_settings_form', $settings_form, $context);
+
+ $settings_form['#tree'] = TRUE;
+ $form['ctools_field_list']['#value'][] = $field;
+ $form += $settings_form;
if (isset($field['cardinality']) && $field['cardinality'] != 1) {
list($prefix, $suffix) = explode('@count', t('Skip the first @count item(s)'));
@@ -137,7 +139,7 @@ function ctools_fields_get_field_formatter_settings_form($field, $formatter_type
*/
function ctools_fields_get_field_formatter_info($fields) {
$info = array();
- $field_info = module_invoke_all('field_formatter_info');
+ $field_info = field_info_formatter_types();
foreach ($fields as $field) {
foreach ($field_info as $format_name => $formatter_info) {
if (in_array($field['type'], $formatter_info['field types'])) {
@@ -145,7 +147,6 @@ function ctools_fields_get_field_formatter_info($fields) {
}
}
}
- drupal_alter('field_formatter_info', $info);
return $info;
}
@@ -209,15 +210,15 @@ function ctools_field_label($field_name) {
* - Otherwise NULL.
* @param $options
* An associative array of additional options, with the following keys:
- * - 'field_name': The name of the field whose operation should be
+ * - 'field_name': The name of the field whose operation should be
* invoked. By default, the operation is invoked on all the fields
* in the entity's bundle. NOTE: This option is not compatible with
* the 'deleted' option; the 'field_id' option should be used
* instead.
- * - 'field_id': The id of the field whose operation should be
+ * - 'field_id': The id of the field whose operation should be
* invoked. By default, the operation is invoked on all the fields
* in the entity's' bundles.
- * - 'default': A boolean value, specifying which implementation of
+ * - 'default': A boolean value, specifying which implementation of
* the operation should be invoked.
* - if FALSE (default), the field types implementation of the operation
* will be invoked (hook_field_[op])
@@ -225,10 +226,10 @@ function ctools_field_label($field_name) {
* will be invoked (field_default_[op])
* Internal use only. Do not explicitely set to TRUE, but use
* _field_invoke_default() instead.
- * - 'deleted': If TRUE, the function will operate on deleted fields
+ * - 'deleted': If TRUE, the function will operate on deleted fields
* as well as non-deleted fields. If unset or FALSE, only
* non-deleted fields are operated on.
- * - 'language': A language code or an array of language codes keyed by field
+ * - 'language': A language code or an array of language codes keyed by field
* name. It will be used to narrow down to a single value the available
* languages to act on.
*
@@ -341,7 +342,7 @@ function ctools_field_foreign_keys($field_name) {
$foreign_keys[$field_name] = $field['foreign keys'];
}
else {
- // try to fetch foreign keys from schema, as not everything
+ // Try to fetch foreign keys from schema, as not everything
// stores foreign keys properly in the field info.
$module = $field['module'];
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/jump-menu.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/jump-menu.inc
index 51f45982..e2ae1cfc 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/jump-menu.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/jump-menu.inc
@@ -8,7 +8,6 @@
* if javascript is in use. Each item is keyed to the href that the button
* should go to. With javascript, the page is immediately redirected. Without
* javascript, the form is submitted and a drupal_goto() is given.
- *
*/
/**
@@ -127,7 +126,7 @@ function ctools_jump_menu_submit($form, &$form_state) {
// This allows duplicate paths to be used in jump menus for multiple options.
$redirect_array = explode("::", $form_state['values']['jump']);
- if(isset($redirect_array[1]) && !empty($redirect_array[1])){
+ if (isset($redirect_array[1]) && !empty($redirect_array[1])) {
$redirect = $redirect_array[1];
}
else {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/language.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/language.inc
index 9a7850b7..a850670e 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/language.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/language.inc
@@ -1,5 +1,9 @@
t("Current user's language"),
@@ -41,4 +44,4 @@ function ctools_language_list_all() {
);
$languages = array_merge($languages, ctools_language_list());
return $languages;
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/math-expr.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/math-expr.inc
index eeb184d8..3105ec52 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/math-expr.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/math-expr.inc
@@ -99,7 +99,7 @@ class ctools_math_expr {
'sqrt','abs','ln','log',
'time', 'ceil', 'floor', 'min', 'max', 'round');
- function ctools_math_expr() {
+ function __construct() {
// make the variables a little more accurate
$this->v['pi'] = pi();
$this->v['e'] = exp(1);
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/modal.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/modal.inc
index fc990159..18b216fc 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/modal.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/modal.inc
@@ -55,9 +55,9 @@ function ctools_modal_add_js() {
'alt' => t('Close window'),
)),
'throbber' => theme('image', array(
- 'path' => ctools_image_path('throbber.gif'),
- 'title' => t('Loading...'),
- 'alt' => t('Loading'),
+ 'path' => ctools_image_path('throbber.gif'),
+ 'title' => t('Loading...'),
+ 'alt' => t('Loading'),
)),
),
);
@@ -85,7 +85,7 @@ function ctools_modal_add_plugin_js($plugins) {
if (file_exists($file)) {
$js[$file] = TRUE;
}
- else if (file(exists($subtype['path'] . '/' . $file))) {
+ elseif (file(exists($subtype['path'] . '/' . $file))) {
$js[$subtype['path'] . '/' . $file] = TRUE;
}
}
@@ -95,7 +95,7 @@ function ctools_modal_add_plugin_js($plugins) {
if (file_exists($file)) {
$css[$file] = TRUE;
}
- else if (file(exists($subtype['path'] . '/' . $file))) {
+ elseif (file(exists($subtype['path'] . '/' . $file))) {
$css[$subtype['path'] . '/' . $file] = TRUE;
}
}
@@ -140,7 +140,7 @@ function ctools_modal_command_dismiss() {
}
/**
- * Display loading screen in the modal
+ * Display loading screen in the modal.
*/
function ctools_modal_command_loading() {
return array(
@@ -189,7 +189,7 @@ function ctools_modal_text_button($text, $dest, $alt, $class = '') {
* Wrap a form so that we can use it properly with AJAX. Essentially if the
* form wishes to render, it automatically does that, otherwise it returns
* the render array so we can see submission results.
-
+ *
* @param array $form
* An associative array containing the structure of the form.
* @param array $form_state
@@ -222,7 +222,7 @@ function ctools_modal_form_wrapper($form_id, &$form_state) {
$output = drupal_build_form($form_id, $form_state);
if (!empty($form_state['ajax']) && (!$form_state['executed'] || $form_state['rebuild'])) {
- return ctools_modal_form_render($form_state, $output);
+ return ctools_modal_form_render($form_state, $output);
}
return $output;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/object-cache.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/object-cache.inc
index 29225b05..614c56f0 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/object-cache.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/object-cache.inc
@@ -27,6 +27,7 @@
* defaults to session_id().
*
* @deprecated $skip_cache is deprecated in favor of drupal_static*
+ *
* @return
* The data that was cached.
*/
@@ -91,7 +92,7 @@ function ctools_object_cache_set($obj, $name, $cache, $sid = NULL) {
}
/**
- * Remove an object from the non-volatile ctools cache
+ * Remove an object from the non-volatile ctools cache.
*
* @param $obj
* A 128 character or less string to define what kind of object is being
@@ -117,7 +118,6 @@ function ctools_object_cache_clear($obj, $name, $sid = NULL) {
drupal_static_reset('ctools_object_cache_get');
}
-
/**
* Determine if another user has a given object cached.
*
@@ -197,7 +197,8 @@ function ctools_object_cache_clear_all($obj, $name) {
*/
function ctools_object_cache_clean($age = NULL) {
if (empty($age)) {
- $age = 86400 * 7; // 7 days
+ // 7 days.
+ $age = 86400 * 7;
}
db_delete('ctools_object_cache')
->condition('updated', REQUEST_TIME - $age, '<')
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/page-wizard.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/page-wizard.inc
index a211361b..9690aae0 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/page-wizard.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/page-wizard.inc
@@ -1,5 +1,9 @@
plugin = $plugin;
if ($function = ctools_plugin_get_function($plugin, 'default cache')) {
$function($cache);
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins-admin.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins-admin.inc
index d4ead0a4..c11fcfd6 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins-admin.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins-admin.inc
@@ -10,6 +10,7 @@
*
* Implementing this
*/
+
/**
* Get a plugin configuration form.
*
@@ -100,7 +101,7 @@ function _ctools_plugin_configure_create_form_info(&$form_info, $plugin_definiti
if (empty($plugin_definition['title'])) {
$title = t('Configure');
}
- else if ($op == 'add') {
+ elseif ($op == 'add') {
$title = t('Configure new !plugin_title', array('!plugin_title' => $plugin_definition['title']));
}
else {
@@ -134,10 +135,10 @@ function _ctools_plugin_configure_create_form_info(&$form_info, $plugin_definiti
$form_info['forms']['form']['wrapper'] = 'ctools_plugins_default_form_wrapper';
}
}
- else if (is_array($info)) {
- if (empty($form_info['order'])) {
- $form_info['order'] = array();
- }
+ elseif (is_array($info)) {
+ if (empty($form_info['order'])) {
+ $form_info['order'] = array();
+ }
if (empty($form_info['forms'])) {
$form_info['forms'] = array();
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins.inc
index 79a6087f..a4abb537 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/plugins.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Contains routines to organize and load plugins. It allows a special
* variation of the hook system so that plugins can be kept in separate
* .inc files, and can be either loaded all at once or loaded only when
@@ -70,7 +69,7 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
if (isset($info['version'])) {
$version = $info['version'];
}
- else if (isset($info['api'])) {
+ elseif (isset($info['api'])) {
$version = $info['api'];
}
@@ -99,7 +98,7 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
}
// Only process if version is between minimum and current, inclusive.
- if (version_compare($info['version'], $minimum_version, '>=') && version_compare($info['version'], $current_version, '<=')) {
+ if (version_compare($info['version'], $minimum_version, '>=') && version_compare($info['version'], $current_version, '<=')) {
if (!isset($info['path'])) {
$info['path'] = '';
}
@@ -151,7 +150,7 @@ function ctools_plugin_api_include($owner, $api, $minimum_version, $current_vers
if (isset($plugin_info["$api file"])) {
$file = $plugin_info["$api file"];
}
- else if (isset($plugin_info['file'])) {
+ elseif (isset($plugin_info['file'])) {
$file = $plugin_info['file'];
}
else {
@@ -161,7 +160,7 @@ function ctools_plugin_api_include($owner, $api, $minimum_version, $current_vers
if (file_exists(DRUPAL_ROOT . "/$plugin_info[path]/$file")) {
require_once DRUPAL_ROOT . "/$plugin_info[path]/$file";
}
- else if (file_exists(DRUPAL_ROOT . "/$file")) {
+ elseif (file_exists(DRUPAL_ROOT . "/$file")) {
require_once DRUPAL_ROOT . "/$file";
}
$already_done[$owner][$api][$module] = TRUE;
@@ -184,7 +183,7 @@ function ctools_plugin_api_get_hook($owner, $api) {
if (function_exists($function = $owner . '_' . $api . '_hook_name')) {
$hook = $function();
}
- else if (function_exists($function = $owner . '_ctools_plugin_api_hook_name')) {
+ elseif (function_exists($function = $owner . '_ctools_plugin_api_hook_name')) {
$hook = $function();
}
@@ -200,18 +199,18 @@ function ctools_plugin_api_get_hook($owner, $api) {
/**
* Fetch a group of plugins by name.
*
- * @param $module
- * The name of the module that utilizes this plugin system. It will be
- * used to call hook_ctools_plugin_$plugin() to get more data about the plugin.
- * @param $type
+ * @param string $module
+ * The name of the module that utilizes this plugin system. It will be used to
+ * get more data about the plugin as defined on hook_ctools_plugin_type().
+ * @param string $type
* The type identifier of the plugin.
- * @param $id
+ * @param string $id
* If specified, return only information about plugin with this identifier.
* The system will do its utmost to load only plugins with this id.
*
- * @return
- * An array of information arrays about the plugins received. The contents
- * of the array are specific to the plugin.
+ * @return array
+ * An array of information arrays about the plugins received. The contents of
+ * the array are specific to the plugin.
*/
function ctools_get_plugins($module, $type, $id = NULL) {
// Store local caches of plugins and plugin info so we don't have to do full
@@ -224,10 +223,14 @@ function ctools_get_plugins($module, $type, $id = NULL) {
$info = ctools_plugin_get_plugin_type_info();
- // Bail out noisily if an invalid module/type combination is requested.
if (!isset($info[$module][$type])) {
- watchdog('ctools', 'Invalid plugin module/type combination requested: module @module and type @type', array('@module' => $module, '@type' => $type), WATCHDOG_ERROR);
- return array();
+ // If we don't find the plugin we attempt a cache rebuild before bailing out.
+ $info = ctools_plugin_get_plugin_type_info(TRUE);
+ // Bail out noisily if an invalid module/type combination is requested.
+ if (!isset($info[$module][$type])) {
+ watchdog('ctools', 'Invalid plugin module/type combination requested: module @module and type @type', array('@module' => $module, '@type' => $type), WATCHDOG_ERROR);
+ return array();
+ }
}
// Make sure our plugins array is populated.
@@ -235,8 +238,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
$plugins[$module][$type] = array();
}
- // Attempt to shortcut this whole piece of code if we already have
- // the requested plugin:
+ // Attempt to shortcut this whole piece of code if we already have the
+ // requested plugin:
if ($id && array_key_exists($id, $plugins[$module][$type])) {
return $plugins[$module][$type][$id];
}
@@ -254,9 +257,9 @@ function ctools_get_plugins($module, $type, $id = NULL) {
if (!empty($cache->data)) {
// Cache load succeeded so use the cached plugin list.
- $plugins[$module][$type] = $cache->data;
+ $plugins[$module][$type] = $cache->data;
// Set $setup to true so we know things where loaded.
- $setup[$module][$type] = TRUE;
+ $setup[$module][$type] = TRUE;
}
else {
// Cache load failed so store that we need to build and write the cache.
@@ -271,8 +274,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
$plugins[$module][$type] = ctools_plugin_load_hooks($info[$module][$type]);
}
- // Then see if we should load all files. We only do this if we
- // want a list of all plugins or there was a cache miss.
+ // Then see if we should load all files. We only do this if we want a list of
+ // all plugins or there was a cache miss.
if (empty($setup[$module][$type]) && ($build_cache || !$id)) {
$setup[$module][$type] = TRUE;
$plugins[$module][$type] = array_merge($plugins[$module][$type], ctools_plugin_load_includes($info[$module][$type]));
@@ -295,9 +298,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
}
}
-
- // If we were told earlier that this is cacheable and the cache was
- // empty, give something back.
+ // If we were told earlier that this is cacheable and the cache was empty,
+ // give something back.
if ($build_cache) {
cache_set("plugins:$module:$type", $plugins[$module][$type], $info[$module][$type]['cache table']);
}
@@ -309,7 +311,7 @@ function ctools_get_plugins($module, $type, $id = NULL) {
return array_filter($plugins[$module][$type]);
}
- // Check to see if we need to look for the file
+ // Check to see if we need to look for the file.
if (!array_key_exists($id, $plugins[$module][$type])) {
// If we can have child plugins, check to see if the plugin name is in the
// format of parent:child and break it up if it is.
@@ -415,19 +417,20 @@ function ctools_get_plugins_reset() {
/**
* Load plugins from a directory.
*
- * @param $info
+ * @param array $info
* The plugin info as returned by ctools_plugin_get_info()
- * @param $file
+ * @param string $filename
* The file to load if we're looking for just one particular plugin.
*
- * @return
- * An array of information created for this plugin.
+ * @return array
+ * A (possibly empty) array of information created for this plugin.
*/
function ctools_plugin_load_includes($info, $filename = NULL) {
// Keep a static array so we don't hit file_scan_directory more than necessary.
$all_files = &drupal_static(__FUNCTION__, array());
- // store static of plugin arrays for reference because they can't be reincluded.
+ // Store static of plugin arrays for reference because they can't be
+ // reincluded, so there is no point in using drupal_static().
static $plugin_arrays = array();
if (!isset($all_files[$info['module']][$info['type']])) {
@@ -462,24 +465,23 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
}
foreach ($files as $file) {
if (!empty($info['info file'])) {
- // Parse a .info file
+ // Parse a .info file.
$result = ctools_plugin_process_info($info, $module, $file);
}
else {
// Parse a hook.
- $plugin = NULL; // ensure that we don't have something leftover from earlier.
+ // Ensure that we don't have something leftover from earlier.
+ $plugin = NULL;
if (isset($plugin_arrays[$file->uri])) {
$identifier = $plugin_arrays[$file->uri];
}
else {
-
- require_once DRUPAL_ROOT . '/' . $file->uri;
+ include_once DRUPAL_ROOT . '/' . $file->uri;
// .inc files have a special format for the hook identifier.
// For example, 'foo.inc' in the module 'mogul' using the plugin
- // whose hook is named 'borg_type' should have a function named (deep breath)
- // mogul_foo_borg_type()
-
+ // whose hook is named 'borg_type' should have a function named
+ // (deep breath) mogul_foo_borg_type().
// If, however, the .inc file set the quasi-global $plugin array, we
// can use that and not even call a function. Set the $identifier
// appropriately and ctools_plugin_process() will handle it.
@@ -492,7 +494,8 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
}
}
- $result = ctools_plugin_process($info, $module, $identifier, dirname($file->uri), basename($file->uri), $file->name);
+ $result = ctools_plugin_process($info, $module, $identifier,
+ dirname($file->uri), basename($file->uri), $file->name);
}
if (is_array($result)) {
$plugins = array_merge($plugins, $result);
@@ -512,7 +515,7 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
* @param $info
* The $info array for the plugin as returned by ctools_plugin_get_info().
*
- * @return array $directories
+ * @return array
* An array of directories to search.
*/
function ctools_plugin_get_directories($info) {
@@ -538,21 +541,21 @@ function ctools_plugin_get_directories($info) {
}
/**
- * Helper function to build a ctools-friendly list of themes capable of
- * providing plugins.
+ * Helper to build a ctools-friendly list of themes capable of providing plugins.
*
- * @return array $themes
+ * @return array
* A list of themes that can act as plugin providers, sorted parent-first with
* the active theme placed last.
*/
function _ctools_list_themes() {
+ // @TODO: Use drupal_static() here?
static $themes;
if (is_null($themes)) {
$current = variable_get('theme_default', FALSE);
$themes = $active = array();
$all_themes = list_themes();
foreach ($all_themes as $name => $theme) {
- // Only search from active themes
+ // Only search from active themes.
if (empty($theme->status) && $theme->name != $current) {
continue;
}
@@ -563,19 +566,19 @@ function _ctools_list_themes() {
}
}
- // Construct a parent-first list of all themes
+ // Construct a parent-first list of all themes.
foreach ($active as $name => $theme) {
$base_themes = isset($theme->base_themes) ? $theme->base_themes : array();
$themes = array_merge($themes, $base_themes, array($name => $theme->info['name']));
}
- // Put the actual theme info objects into the array
+ // Put the actual theme info objects into the array.
foreach (array_keys($themes) as $name) {
if (isset($all_themes[$name])) {
$themes[$name] = $all_themes[$name];
}
}
- // Make sure the current default theme always gets the last word
+ // Make sure the current default theme always gets the last word.
if ($current_key = array_search($current, array_keys($themes))) {
$themes += array_splice($themes, $current_key, 1);
}
@@ -583,7 +586,6 @@ function _ctools_list_themes() {
return $themes;
}
-
/**
* Find all the base themes for the specified theme.
*
@@ -599,9 +601,10 @@ function _ctools_list_themes() {
* The name of the theme whose base we are looking for.
* @param $used_keys
* A recursion parameter preventing endless loops.
- * @return
+ *
+ * @return array
* Returns an array of all of the theme's ancestors; the first element's value
- * will be NULL if an error occurred.
+ * will be NULL if an error occurred. (Note: this is NOT $arr[0]).
*/
function ctools_find_base_themes($themes, $key, $used_keys = array()) {
$base_key = $themes[$key]->info['base theme'];
@@ -629,7 +632,6 @@ function ctools_find_base_themes($themes, $key, $used_keys = array()) {
return $current_base_theme;
}
-
/**
* Load plugin info for the provided hook; this is handled separately from
* plugins from files.
@@ -654,22 +656,28 @@ function ctools_plugin_load_hooks($info) {
/**
* Process a single hook implementation of a ctools plugin.
*
- * @param $info
+ * @param array $info
* The $info array about the plugin as returned by ctools_plugin_get_info()
- * @param $module
+ * @param string $module
* The module that implements the plugin being processed.
- * @param $identifier
- * The plugin identifier, which is used to create the name of the hook
- * function being called.
- * @param $path
+ * @param string|array $identifier
+ * Used to create the base setting of return value. If:
+ * - $identifier is a string, a hook name is created from this and the 'hook'
+ * key of the $info array, and the return value of that hook function is
+ * used. The hook is called like this: $identifier_$hook($info);
+ * - $identifier is an array, this array is used directly.
+ * @param string $path
* The path where files utilized by this plugin will be found.
- * @param $file
+ * @param string $file
* The file that was loaded for this plugin, if it exists.
- * @param $base
+ * @param string $base
* The base plugin name to use. If a file was loaded for the plugin, this
* is the plugin to assume must be present. This is used to automatically
* translate the array to make the syntax more friendly to plugin
* implementors.
+ *
+ * @return null|array
+ * NULL on failure, otherwise an array containing the results keyed by name.
*/
function ctools_plugin_process($info, $module, $identifier, $path, $file = NULL, $base = NULL) {
if (is_array($identifier)) {
@@ -737,9 +745,19 @@ function _ctools_process_data($result, $plugin_type_info, $module, $path, $file)
return $result;
}
-
/**
* Process an info file for plugin information, rather than a hook.
+ *
+ * @param array $info
+ * The $info array about the plugin as returned by ctools_plugin_get_info()
+ * @param string $module
+ * The module that implements the plugin being processed.
+ * @param object $file
+ * An object containing 'uri' and 'name' properties. 'uri' is the name of the
+ * 'info' file to process. 'name' is the plugin key-name.
+ *
+ * @return null|array
+ * NULL on failure, otherwise an array containing the results keyed by name.
*/
function ctools_plugin_process_info($info, $module, $file) {
$result = drupal_parse_info_file($file->uri);
@@ -766,7 +784,7 @@ function ctools_plugin_get_info($module, $type) {
* @param $function_name
* The identifier of the function. For example, 'settings form'.
*
- * @return
+ * @return string
* The actual name of the function to call, or NULL if the function
* does not exist.
*/
@@ -783,7 +801,7 @@ function ctools_plugin_get_function($plugin_definition, $function_name) {
}
if (!isset($plugin_definition[$function_name])) {
- return;
+ return NULL;
}
if (is_array($plugin_definition[$function_name]) && isset($plugin_definition[$function_name]['function'])) {
@@ -818,7 +836,7 @@ function ctools_plugin_get_function($plugin_definition, $function_name) {
* @param $function_name
* The identifier of the function. For example, 'settings form'.
*
- * @return
+ * @return string
* The actual name of the function to call, or NULL if the function
* does not exist.
*/
@@ -836,7 +854,7 @@ function ctools_plugin_load_function($module, $type, $id, $function_name) {
* @param $class_name
* The identifier of the class. For example, 'handler'.
*
- * @return
+ * @return string
* The actual name of the class to call, or NULL if the class does not exist.
*/
function ctools_plugin_get_class($plugin_definition, $class_name) {
@@ -855,11 +873,11 @@ function ctools_plugin_get_class($plugin_definition, $class_name) {
if (!isset($plugin_definition[$class_name])) {
return;
}
- else if (is_string($plugin_definition[$class_name])) {
+ elseif (is_string($plugin_definition[$class_name])) {
// Plugin uses the string form shorthand.
$return = $plugin_definition[$class_name];
}
- else if (isset($plugin_definition[$class_name]['class'])) {
+ elseif (isset($plugin_definition[$class_name]['class'])) {
// Plugin uses the verbose array form.
$return = $plugin_definition[$class_name]['class'];
}
@@ -881,7 +899,7 @@ function ctools_plugin_get_class($plugin_definition, $class_name) {
* @param $class_name
* The identifier of the class. For example, 'handler'.
*
- * @return
+ * @return string
* The actual name of the class to call, or NULL if the class does not exist.
*/
function ctools_plugin_load_class($module, $type, $id, $class_name) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/registry.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/registry.inc
index 9d4328e6..7e517bb9 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/registry.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/registry.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Registry magic. In a separate file to minimize unnecessary code loading.
*/
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/uuid.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/uuid.inc
index 6e4c42c3..13897f1f 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/uuid.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/uuid.inc
@@ -9,7 +9,9 @@
/**
* Pattern for detecting a valid UUID.
*/
-define('UUID_PATTERN', '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}');
+if (!defined('UUID_PATTERN')) {
+ define('UUID_PATTERN', '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}');
+}
/**
* Generates a UUID using the Windows internal GUID generator.
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/includes/wizard.inc b/profiles/commerce_kickstart/modules/contrib/ctools/includes/wizard.inc
index 1a821a58..e92e0e30 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/includes/wizard.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/includes/wizard.inc
@@ -469,10 +469,8 @@ function ctools_wizard_get_path($form_info, $step) {
if (!isset($path[1]) || !is_array($path[1])) {
$path[1] = array();
}
- // Ensure that the query part of options is an array.
- $path[1] += array('query' => array());
// Add the destination parameter, if not set already.
- $path[1]['query'] += drupal_get_destination();
+ $path[1] += drupal_get_destination();
}
return $path;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/js/auto-submit.js b/profiles/commerce_kickstart/modules/contrib/ctools/js/auto-submit.js
index a3e9aa42..b658577a 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/js/auto-submit.js
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/js/auto-submit.js
@@ -36,9 +36,11 @@ Drupal.behaviors.CToolsAutoSubmit = {
attach: function(context) {
// 'this' references the form element
function triggerSubmit (e) {
- var $this = $(this);
- if (!$this.hasClass('ctools-ajaxing')) {
- $this.find('.ctools-auto-submit-click').click();
+ if ($.contains(document.body, this)) {
+ var $this = $(this);
+ if (!$this.hasClass('ctools-ajaxing')) {
+ $this.find('.ctools-auto-submit-click').click();
+ }
}
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/js/dependent.js b/profiles/commerce_kickstart/modules/contrib/ctools/js/dependent.js
index f74ec81b..a60fc120 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/js/dependent.js
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/js/dependent.js
@@ -97,7 +97,13 @@
else {
switch ($(trigger).attr('type')) {
case 'checkbox':
- var val = $(trigger).attr('checked') ? true : false;
+ // **This check determines if using a jQuery version 1.7 or newer which requires the use of the prop function instead of the attr function when not called on an attribute
+ if ($().prop) {
+ var val = $(trigger).prop('checked') ? true : false;
+ }
+ else {
+ var val = $(trigger).attr('checked') ? true : false;
+ }
if (val) {
$(trigger).siblings('label').removeClass('hidden-options').addClass('expanded-options');
@@ -148,34 +154,41 @@
len++;
}
- var object = $('#' + id + '-wrapper');
- if (!object.size()) {
- // Some elements can't use the parent() method or they can
- // damage things. They are guaranteed to have wrappers but
- // only if dependent.inc provided them. This check prevents
- // problems when multiple AJAX calls cause settings to build
- // up.
- var $original = $('#' + id);
- if ($original.is('fieldset') || $original.is('textarea')) {
- continue;
- }
-
- object = $('#' + id).parent();
+ var $original = $('#' + id);
+ if ($original.is('fieldset') || $original.is('textarea')) {
+ continue;
}
+ var object = $original.parent();
+
if (Drupal.settings.CTools.dependent[id].type == 'disable') {
if (Drupal.settings.CTools.dependent[id].num <= len) {
// Show if the element if criteria is matched
- object.attr('disabled', false);
- object.addClass('dependent-options');
- object.children().attr('disabled', false);
+ // **This check determines if using a jQuery version 1.7 or newer which requires the use of the prop function instead of the attr function when not called on an attribute
+ if (typeof $().prop == 'function') {
+ object.prop('disabled', false);
+ object.addClass('dependent-options');
+ object.children().prop('disabled', false);
+ }
+ else {
+ object.attr('disabled', false);
+ object.addClass('dependent-options');
+ object.children().attr('disabled', false);
+ }
}
else {
// Otherwise hide. Use css rather than hide() because hide()
// does not work if the item is already hidden, for example,
// in a collapsed fieldset.
- object.attr('disabled', true);
- object.children().attr('disabled', true);
+ // **This check determines if using a jQuery version 1.7 or newer which requires the use of the prop function instead of the attr function when not called on an attribute
+ if (typeof $().prop == 'function') {
+ object.prop('disabled', true);
+ object.children().prop('disabled', true);
+ }
+ else {
+ object.attr('disabled', true);
+ object.children().attr('disabled', true);
+ }
}
}
else {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/js/modal.js b/profiles/commerce_kickstart/modules/contrib/ctools/js/modal.js
index c757ef27..e65f51af 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/js/modal.js
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/js/modal.js
@@ -121,18 +121,18 @@
*/
Drupal.theme.prototype.CToolsModalDialog = function () {
var html = ''
- html += '
',
);
- $YEARLY_on_the_BYDAY_of_BYMONTH = array(
+ $yearly_on_the_byday_of_bymonth = array(
'#type' => 'container',
'#tree' => TRUE,
);
- $YEARLY_BYDAY_COUNT = '';
- $YEARLY_BYDAY_DAY = '';
+ $yearly_byday_count = '';
+ $yearly_byday_day = '';
if (isset($rrule['BYDAY']) && !empty($rrule['BYDAY']) && $rrule['FREQ'] === 'YEARLY') {
- $YEARLY_BYDAY_COUNT = substr($rrule['BYDAY'][0], 0, -2);
- $YEARLY_BYDAY_DAY = substr($rrule['BYDAY'][0], -2);;
+ $yearly_byday_count = substr($rrule['BYDAY'][0], 0, -2);
+ $yearly_byday_day = substr($rrule['BYDAY'][0], -2);;
}
list($byday_count_title, $byday_day_title) = explode('@byday', t('On the @byday of', array(), array('context' => 'Date repeat')));
- $YEARLY_on_the_BYDAY_of_BYMONTH['BYDAY_COUNT'] = array(
+ $yearly_on_the_byday_of_bymonth['BYDAY_COUNT'] = array(
'#type' => 'select',
'#title' => $byday_count_title,
- '#default_value' => !empty($YEARLY_BYDAY_COUNT) ? $YEARLY_BYDAY_COUNT : '',
+ '#default_value' => !empty($yearly_byday_count) ? $yearly_byday_count : '',
'#options' => date_order_translated(),
'#multiple' => FALSE,
'#prefix' => ''
- html += '
',
);
- $MONTHLY_on_the_BYDAY_of_BYMONTH = array(
+ $monthly_on_the_byday_of_bymonth = array(
'#type' => 'container',
'#tree' => TRUE,
);
- $MONTHLY_BYDAY_COUNT = '';
- $MONTHLY_BYDAY_DAY = '';
+ $monthly_byday_count = '';
+ $monthly_byday_day = '';
if (isset($rrule['BYDAY']) && !empty($rrule['BYDAY']) && $rrule['FREQ'] === 'MONTHLY') {
- $MONTHLY_BYDAY_COUNT = substr($rrule['BYDAY'][0], 0, -2);
- $MONTHLY_BYDAY_DAY = substr($rrule['BYDAY'][0], -2);;
+ $monthly_byday_count = substr($rrule['BYDAY'][0], 0, -2);
+ $monthly_byday_day = substr($rrule['BYDAY'][0], -2);;
}
list($byday_count_title, $byday_day_title) = explode('@byday', t('On the @byday of', array(), array('context' => 'Date repeat')));
- $MONTHLY_on_the_BYDAY_of_BYMONTH['BYDAY_COUNT'] = array(
+ $monthly_on_the_byday_of_bymonth['BYDAY_COUNT'] = array(
'#type' => 'select',
'#title' => $byday_count_title,
- '#default_value' => !empty($MONTHLY_BYDAY_COUNT) ? $MONTHLY_BYDAY_COUNT : '',
+ '#default_value' => !empty($monthly_byday_count) ? $monthly_byday_count : '',
'#options' => date_order_translated(),
'#multiple' => FALSE,
'#prefix' => '' // panels-modal-content
- html += '
' . implode('
', $date->errors); @@ -517,13 +612,15 @@ function date_popup_validate($element, &$form_state) { /** * Helper function for extracting a date value out of user input. * - * @param autocomplete + * @param bool $auto_complete * Should we add a time value to complete the date if there is no time? * Useful anytime the time value is optional. */ function date_popup_input_date($element, $input, $auto_complete = FALSE) { if (empty($input) || !is_array($input) || !array_key_exists('date', $input) || empty($input['date'])) { - return NULL; + //check if there is no time associated in the input variable. This is the exception scenario where the user has entered only time and not date. + if(empty($input['time'])) + return NULL; } date_popup_add(); $granularity = date_format_order($element['#date_format']); @@ -532,9 +629,14 @@ function date_popup_input_date($element, $input, $auto_complete = FALSE) { $format = date_popup_date_format($element); $format .= $has_time ? ' ' . date_popup_time_format($element) : ''; - $datetime = $input['date']; - $datetime .= $has_time ? ' ' . $input['time'] : ''; + //check if date is empty, if yes, then leave it blank. + $datetime = !empty($input['date']) ? trim($input['date']) : ''; + $datetime .= $has_time ? ' ' . trim($input['time']) : ''; $date = new DateObject($datetime, $element['#date_timezone'], $format); + //if the variable is time only then set TimeOnly to TRUE + if(empty($input['date']) && !empty($input['time']) ){ + $date->timeOnly = 'TRUE'; + } if (is_object($date)) { $date->limitGranularity($granularity); if ($date->validGranularity($granularity, $flexible)) { @@ -552,7 +654,7 @@ function date_popup_time_formats($with_seconds = FALSE) { return array( 'H:i:s', 'h:i:sA', - ); + ); } /** @@ -561,8 +663,17 @@ function date_popup_time_formats($with_seconds = FALSE) { * TODO Remove any formats not supported by the widget, if any. */ function date_popup_formats() { - $formats = str_replace('i', 'i:s', array_keys(system_get_date_formats('short'))); + // Load short date formats. + $formats = system_get_date_formats('short'); + + // Load custom date formats. + if ($formats_custom = system_get_date_formats('custom')) { + $formats = array_merge($formats, $formats_custom); + } + + $formats = str_replace('i', 'i:s', array_keys($formats)); $formats = drupal_map_assoc($formats); + return $formats; } @@ -570,7 +681,8 @@ function date_popup_formats() { * Recreate a date format string so it has the values popup expects. * * @param string $format - * a normal date format string, like Y-m-d + * A normal date format string, like Y-m-d + * * @return string * A format string in popup format, like YMD-, for the * earlier 'calendar' version, or m/d/Y for the later 'datepicker' @@ -588,15 +700,34 @@ function date_popup_format_to_popup($format) { * Recreate a time format string so it has the values popup expects. * * @param string $format - * a normal time format string, like h:i (a) + * A normal time format string, like h:i (a) + * * @return string - * a format string that the popup can accept like h:i a + * A format string that the popup can accept like h:i a */ function date_popup_format_to_popup_time($format, $timepicker = NULL) { if (empty($format)) { $format = 'H:i'; } - $format = str_replace(array('/', '-', ' .', ',', 'F', 'M', 'l', 'z', 'w', 'W', 'd', 'j', 'm', 'n', 'y', 'Y'), '', $format); + $symbols = array( + '/', + '-', + ' .', + ',', + 'F', + 'M', + 'l', + 'z', + 'w', + 'W', + 'd', + 'j', + 'm', + 'n', + 'y', + 'Y', + ); + $format = str_replace($symbols, '', $format); $format = strtr($format, date_popup_timepicker_format_replacements($timepicker)); return $format; } @@ -605,9 +736,10 @@ function date_popup_format_to_popup_time($format, $timepicker = NULL) { * Reconstruct popup format string into normal format string. * * @param string $format - * a string in popup format, like YMD- + * A string in popup format, like YMD- + * * @return string - * a normal date format string, like Y-m-d + * A normal date format string, like Y-m-d */ function date_popup_popup_to_format($format) { $replace = array_flip(date_popup_datepicker_format_replacements()); @@ -621,22 +753,21 @@ function date_popup_popup_to_format($format) { * This function returns a map of format replacements required to change any * input format into one that the given timepicker can support. * - * @param $timepicker + * @param string $timepicker * The time entry plugin being used: either 'wvega' or 'default'. - * @return + * + * @return array * A map of replacements. */ function date_popup_timepicker_format_replacements($timepicker = 'default') { switch ($timepicker) { case 'wvega': - return array( - 'a' => 'A', // The wvega timepicker only supports uppercase AM/PM. - ); + // The wvega timepicker only supports uppercase AM/PM. + return array('a' => 'A'); + default: - return array( - 'G' => 'H', // The default timeEntry plugin requires leading zeros. - 'g' => 'h', - ); + // The default timeEntry plugin requires leading zeros. + return array('G' => 'H', 'g' => 'h'); } } @@ -645,16 +776,16 @@ function date_popup_timepicker_format_replacements($timepicker = 'default') { */ function date_popup_datepicker_format_replacements() { return array( - 'd' => 'dd', - 'j' => 'd', - 'l' => 'DD', - 'D' => 'D', - 'm' => 'mm', - 'n' => 'm', - 'F' => 'MM', - 'M' => 'M', - 'Y' => 'yy', - 'y' => 'y', + 'd' => 'dd', + 'j' => 'd', + 'l' => 'DD', + 'D' => 'D', + 'm' => 'mm', + 'n' => 'm', + 'F' => 'MM', + 'M' => 'M', + 'Y' => 'yy', + 'y' => 'y', ); } @@ -667,16 +798,26 @@ function theme_date_popup($vars) { $element = $vars['element']; $attributes = !empty($element['#wrapper_attributes']) ? $element['#wrapper_attributes'] : array('class' => array()); $attributes['class'][] = 'container-inline-date'; - // If there is no description, the floating date elements need some extra padding below them. + // If there is no description, the floating date + // elements need some extra padding below them. $wrapper_attributes = array('class' => array('date-padding')); if (empty($element['date']['#description'])) { $wrapper_attributes['class'][] = 'clearfix'; } - // Add an wrapper to mimic the way a single value field works, for ease in using #states. + // Add an wrapper to mimic the way a single value field works, + // for ease in using #states. if (isset($element['#children'])) { - $element['#children'] = '35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(r($){r 1n(){p.Y=[];p.26=[];p.26[\'\']={1c:B,1d:\':\',1o:\'\',Z:[\'3J\',\'3K\'],2C:[\'3L\',\'3M 2D\',\'3N 2D\',\'3O\',\'3P\']};p.1B={2E:\'\',1C:B,27:[1,1,1],2F:0,2G:L,2H:v,2I:v,2J:v,2K:\'3Q.3R\',1p:[20,20,8],2L:\'\',1D:[40,40,16],2M:B,28:[3S,3T],2N:v,2O:v};$.1q(p.1B,p.26[\'\'])}7 m=\'o\';$.1q(1n.2P,{1e:\'3U\',3V:r(a){1E(p.1B,a||{});u p},2Q:r(b,c){7 d=$(b);q(d.2R(p.1e)){u}7 e={};e.1r=$.1q({},c);e.E=0;e.13=0;e.14=0;e.x=0;e.w=$(b);$.y(b,m,e);7 f=p.t(e,\'2K\');7 g=p.t(e,\'3W\');7 h=p.t(e,\'1p\');7 i=p.t(e,\'2E\');7 j=(!f?v:$(\'<15 1F="3X" 2S="3Y: 3Z-41; \'+\'29: 2T(\\\'\'+f+\'\\\') 0 0 2U-2V; \'+\'2a: \'+h[0]+\'O; 2W: \'+h[1]+\'O;\'+($.K.2X&&$.K.42<\'1.9\'?\' 2Y-U: \'+h[0]+\'O; 2Y-43: \'+(h[1]-18)+\'O;\':\'\')+\'">\'));d.44(\'<15 1F="45">\').2Z(i?\'<15 1F="47">\'+i+\'\':\'\').2Z(j||\'\');d.49(p.1e).17(\'2b.o\',p.2c).17(\'4a.o\',p.30).17(\'4b.o\',p.31).17(\'4c.o\',p.32).17(\'4d.o\',p.33);q($.K.2X){d.17(\'w.o\',r(a){$.o.1f(e)})}q($.K.2d){d.17(\'4e.o\',r(a){1G(r(){$.o.1f(e)},1)})}q(p.t(e,\'2G\')&&$.1H.2e){d.2e(p.34)}q(j){j.3a(p.2f).2g(p.1I).4f(p.3b).2h(p.1I).3c(p.2i)}},4g:r(a){p.2j(a,B)},4h:r(a){p.2j(a,L)},2j:r(b,c){7 d=$.y(b,m);q(!d){u}b.3d=c;q(b.2k&&b.2k.1J.1g()==\'15\'){$.o.1K(d,b.2k,(c?5:-1))}$.o.Y=$.3e($.o.Y,r(a){u(a==b?v:a)});q(c){$.o.Y.4i(b)}},1s:r(a){u $.3f(a,p.Y)>-1},4j:r(a,b,c){7 d=$.y(a,m);q(d){q(1h b==\'1L\'){7 e=b;b={};b[e]=c}7 f=p.1i(d);1E(d.1r,b||{});q(f){p.19(d,F J(0,0,0,f[0],f[1],f[2]))}}$.y(a,m,d)},4k:r(b){$w=$(b);q(!$w.2R(p.1e)){u}$w.4l(p.1e).4m(\'.o\');q($.1H.2e){$w.4n()}p.Y=$.3e(p.Y,r(a){u(a==b?v:a)});$w.4o().4p($w);$.4q(b,m)},4r:r(a,b){7 c=$.y(a,m);q(c){p.19(c,b?(1h b==\'4s\'?F J(b.2l()):b):v)}},3g:r(a){7 b=$.y(a,m);7 c=(b?p.1i(b):v);u(!c?v:F J(0,0,0,c[0],c[1],c[2]))},4t:r(a){7 b=$.y(a,m);7 c=(b?p.1i(b):v);u(!c?0:(c[0]*4u+c[1]*2m+c[2])*3h)},2c:r(a){7 b=(a.1J&&a.1J.1g()==\'w\'?a:p);q($.o.P==b||$.o.1s(b)){$.o.1M=B;u}7 c=$.y(b,m);$.o.1M=L;$.o.P=b;$.o.1j=v;7 d=$.o.t(c,\'2N\');1E(c.1r,(d?d.1N(b,[b]):{}));$.y(b,m,c);$.o.1f(c);1G(r(){$.o.1a(c)},10)},30:r(a){$.o.1j=$.o.P;$.o.P=v},31:r(b){7 c=b.1k;7 d=$.y(c,m);q(!$.o.1M){7 e=$.o.t(d,\'1d\').G+2;d.x=0;q(c.3i!=v){1O(7 f=0;f<=I.1l(1,d.V,d.D);f++){7 g=(f!=d.D?(f*e)+2:(d.D*e)+$.o.t(d,\'1o\').G+$.o.t(d,\'Z\')[0].G);d.x=f;q(c.3i=48){u L}7 b=$.y(a.1k,m);2r(a.2q){A 9:u(a.4B?$.o.W(b,-1,L):$.o.W(b,+1,L));A 35:q(a.3m){$.o.1R(b,\'\')}N{b.x=I.1l(1,b.V,b.D);$.o.R(b,0)}C;A 36:q(a.3m){$.o.19(b)}N{b.x=0;$.o.R(b,0)}C;A 37:$.o.W(b,-1,B);C;A 38:$.o.R(b,+1);C;A 39:$.o.W(b,+1,B);C;A 40:$.o.R(b,-1);C;A 46:$.o.1R(b,\'\');C}u B},33:r(a){7 b=4C.4D(a.3n==4E?a.2q:a.3n);q(b<\' \'){u L}7 c=$.y(a.1k,m);$.o.3o(c,b);u B},34:r(a,b){q($.o.1s(a.1k)){u}b=($.K.3p?-b/I.1S(b):($.K.2s?b/I.1S(b):b));7 c=$.y(a.1k,m);c.w.2b();q(!c.w.T()){$.o.1f(c)}$.o.R(c,b);a.4F()},3b:r(b){7 c=$.o.1b(b);7 d=$.y($.o.1m(c),m);7 e=$.o.t(d,\'2L\');q(e){d.1T=L;7 f=$(c).1Q();7 g=v;$(c).3q().2t(r(){7 a=$(p);q(a.1v(\'1w\')==\'4G\'||a.1v(\'1w\')==\'3r\'){g=a.1Q()}u!g});7 h=$.o.t(d,\'1p\');7 i=$.o.t(d,\'1D\');$(\'<3s 1F="4H" 2S="1w: 3r; U: \'+(f.U-(i[0]-h[0])/2-(g?g.U:0))+\'O; 1x: \'+(f.1x-(i[1]-h[1])/2-(g?g.1x:0))+\'O; 2a: \'+i[0]+\'O; 2W: \'+i[1]+\'O; 29: 4I 2T(\'+e+\') 2U-2V 2u 2u; z-4J: 10;">\').3a($.o.2f).2g($.o.1I).2h($.o.3t).3c($.o.2i).4K(c)}},1m:r(a){u $(a).4L(\'.\'+$.o.1e)[0]},2i:r(a){7 b=$.o.1b(a);7 c=$.y($.o.1m(b),m);b.4M=$.o.t(c,\'2C\')[$.o.2v(c,a)]},2f:r(a){7 b=$.o.1b(a);7 c=$.o.1m(b);q($.o.1s(c)){u}q(c==$.o.1j){$.o.P=c;$.o.1j=v}7 d=$.y(c,m);$.o.2c(c);7 e=$.o.2v(d,a);$.o.1K(d,b,e);$.o.2w(d,e);$.o.X=v;$.o.1U=L;7 f=$.o.t(d,\'28\');q(e>=3&&f[0]){$.o.X=1G(r(){$.o.2x(d,e)},f[0]);$(b).3u(\'2h\',$.o.2y).3u(\'2g\',$.o.2y)}},2w:r(a,b){q(!a.w.T()){$.o.1f(a)}2r(b){A 0:p.19(a);C;A 1:p.W(a,-1,B);C;A 2:p.W(a,+1,B);C;A 3:p.R(a,+1);C;A 4:p.R(a,-1);C}},2x:r(a,b){q(!$.o.X){u}$.o.P=$.o.1j;p.2w(a,b);p.X=1G(r(){$.o.2x(a,b)},p.t(a,\'28\')[1])},2y:r(a){4N($.o.X);$.o.X=v},3t:r(a){$.o.X=v;7 b=$.o.1b(a);7 c=$.o.1m(b);7 d=$.y(c,m);$(b).4O();d.1T=B},1I:r(a){$.o.X=v;7 b=$.o.1b(a);7 c=$.o.1m(b);7 d=$.y(c,m);q(!$.o.1s(c)){$.o.1K(d,b,-1)}q($.o.1U){$.o.P=$.o.1j}q($.o.P&&$.o.1U){$.o.1a(d)}$.o.1U=B},1b:r(a){u a.1k||a.3j},2v:r(a,b){7 c=p.1b(b);7 d=($.K.3p||$.K.2s?$.o.3v(c):$(c).1Q());7 e=($.K.2s?$.o.3w(c):[1t.2n.1u||1t.3x.1u,1t.2n.1V||1t.3x.1V]);7 f=p.t(a,\'2M\');7 g=(f?3y:b.3k+e[0]-d.U-($.K.2d?2:0));7 h=b.4P+e[1]-d.1x-($.K.2d?2:0);7 i=p.t(a,(a.1T?\'1D\':\'1p\'));7 j=(f?3y:i[0]-1-g);7 k=i[1]-1-h;q(i[2]>0&&I.1S(g-j)<=i[2]&&I.1S(h-k)<=i[2]){u 0}7 l=I.3z(g,h,j,k);u(l==g?1:(l==j?2:(l==h?3:4)))},1K:r(a,b,c){$(b).1v(\'29-1w\',\'-\'+((c+1)*p.t(a,(a.1T?\'1D\':\'1p\'))[0])+\'O 2u\')},3v:r(a){7 b=1W=0;q(a.3A){b=a.2o;1W=a.3B;2z(a=a.3A){7 c=b;b+=a.2o;q(b<0){b=c}1W+=a.3B}}u{U:b,1x:1W}},3w:r(a){7 b=B;$(a).3q().2t(r(){b|=$(p).1v(\'1w\')==\'4Q\'});q(b){u[0,0]}7 c=a.1u;7 d=a.1V;2z(a=a.4R){c+=a.1u||0;d+=a.1V||0}u[c,d]},t:r(a,b){u(a.1r[b]!=v?a.1r[b]:$.o.1B[b])},1f:r(a){7 b=p.1i(a);7 c=p.t(a,\'1C\');q(b){a.E=b[0];a.13=b[1];a.14=b[2]}N{7 d=p.1y(a);a.E=d[0];a.13=d[1];a.14=(c?d[2]:0)}a.V=(c?2:-1);a.D=(p.t(a,\'1c\')?-1:(c?3:2));a.1X=\'\';a.x=I.1l(0,I.3z(I.1l(1,a.V,a.D),p.t(a,\'2F\')));q(a.w.T()!=\'\'){p.2A(a)}},1i:r(a,b){b=b||a.w.T();7 c=p.t(a,\'1d\');7 d=b.4S(c);q(c==\'\'&&b!=\'\'){d[0]=b.1z(0,2);d[1]=b.1z(2,4);d[2]=b.1z(4,6)}7 e=p.t(a,\'Z\');7 f=p.t(a,\'1c\');q(d.G>=2){7 g=!f&&(b.3C(e[0])>-1);7 h=!f&&(b.3C(e[1])>-1);7 i=Q(d[0],10);i=(2B(i)?0:i);i=((g||h)&&i==12?0:i)+(h?12:0);7 j=Q(d[1],10);j=(2B(j)?0:j);7 k=(d.G>=3?Q(d[2],10):0);k=(2B(k)||!p.t(a,\'1C\')?0:k);u p.1y(a,[i,j,k])}u v},1y:r(a,b){7 c=(b!=v);q(!c){7 d=p.1A(a,p.t(a,\'2H\'))||F J();b=[d.1Y(),d.1Z(),d.21()]}7 e=B;7 f=p.t(a,\'27\');1O(7 i=0;i1){b[i]=I.4T(b[i]/f[i])*f[i];e=L}}u b},2A:r(a){7 b=p.t(a,\'1c\');7 c=p.t(a,\'1d\');7 d=(p.22(b?a.E:((a.E+11)%12)+1)+c+p.22(a.13)+(p.t(a,\'1C\')?c+p.22(a.14):\'\')+(b?\'\':p.t(a,\'1o\')+p.t(a,\'Z\')[(a.E<12?0:1)]));p.1R(a,d);p.1a(a)},1a:r(a){7 b=a.w[0];q(a.w.4U(\':4V\')||$.o.P!=b){u}7 c=p.t(a,\'1d\');7 d=c.G+2;7 e=(a.x!=a.D?(a.x*d):(a.D*d)-c.G+p.t(a,\'1o\').G);7 f=e+(a.x!=a.D?2:p.t(a,\'Z\')[0].G);q(b.3D){b.3D(e,f)}N q(b.1P){7 g=b.1P();g.4W(\'2p\',e);g.3l(\'2p\',f-a.w.T().G);g.4X()}q(!b.3d){b.2b()}},22:r(a){u(a<10?\'0\':\'\')+a},1R:r(a,b){q(b!=a.w.T()){a.w.T(b).4Y(\'4Z\')}},W:r(a,b,c){7 d=(a.w.T()==\'\'||a.x==(b==-1?0:I.1l(1,a.V,a.D)));q(!d){a.x+=b}p.1a(a);a.1X=\'\';$.y(a.w[0],m,a);u(d&&c)},R:r(a,b){q(a.w.T()==\'\'){b=0}7 c=p.t(a,\'27\');p.19(a,F J(0,0,0,a.E+(a.x==0?b*c[0]:0)+(a.x==a.D?b*12:0),a.13+(a.x==1?b*c[1]:0),a.14+(a.x==a.V?b*c[2]:0)))},19:r(a,b){b=p.1A(a,b);7 c=p.1y(a,b?[b.1Y(),b.1Z(),b.21()]:v);b=F J(0,0,0,c[0],c[1],c[2]);7 b=p.25(b);7 d=p.25(p.1A(a,p.t(a,\'2I\')));7 e=p.25(p.1A(a,p.t(a,\'2J\')));b=(d&&be?e:b));7 f=p.t(a,\'2O\');q(f){b=f.1N(a.w[0],[p.3g(a.w[0]),b,d,e])}a.E=b.1Y();a.13=b.1Z();a.14=b.21();p.2A(a);$.y(a.w[0],m,a)},25:r(a){q(!a){u v}a.50(51);a.52(0);a.53(0);u a},1A:r(i,j){7 k=r(a){7 b=F J();b.54(b.2l()+a*3h);u b};7 l=r(a){7 b=$.o.1i(i,a);7 c=F J();7 d=(b?b[0]:c.1Y());7 e=(b?b[1]:c.1Z());7 f=(b?b[2]:c.21());q(!b){7 g=/([+-]?[0-9]+)\\s*(s|S|m|M|h|H)?/g;7 h=g.3E(a);2z(h){2r(h[2]||\'s\'){A\'s\':A\'S\':f+=Q(h[1],10);C;A\'m\':A\'M\':e+=Q(h[1],10);C;A\'h\':A\'H\':d+=Q(h[1],10);C}h=g.3E(a)}}c=F J(0,0,10,d,e,f,0);q(/^!/.55(a)){q(c.3F()>10){c=F J(0,0,10,23,59,59)}N q(c.3F()<10){c=F J(0,0,10,0,0,0)}}u c};u(j?(1h j==\'1L\'?l(j):(1h j==\'56\'?k(j):j)):v)},3o:r(a,b){q(b==p.t(a,\'1d\')){p.W(a,+1,B)}N q(b>=\'0\'&&b<=\'9\'){7 c=Q(b,10);7 d=Q(a.1X+b,10);7 e=p.t(a,\'1c\');7 f=(a.x!=0?a.E:(e?(d<24?d:c):(d>=1&&d<=12?d:(c>0?c:a.E))%12+(a.E>=12?12:0)));7 g=(a.x!=1?a.13:(d<2m?d:c));7 h=(a.x!=a.V?a.14:(d<2m?d:c));7 i=p.1y(a,[f,g,h]);p.19(a,F J(0,0,0,i[0],i[1],i[2]));a.1X=b}N q(!p.t(a,\'1c\')){b=b.1g();7 j=p.t(a,\'Z\');q((b==j[0].1z(0,1).1g()&&a.E>=12)||(b==j[1].1z(0,1).1g()&&a.E<12)){7 k=a.x;a.x=a.D;p.R(a,+1);a.x=k;p.1a(a)}}}});r 1E(a,b){$.1q(a,b);1O(7 c 57 b){q(b[c]==v){a[c]=v}}u a}7 n=[\'58\',\'2l\',\'5a\'];$.1H.o=r(c){7 d=5b.2P.5c.5d(5e,1);q(1h c==\'1L\'&&$.3f(c,n)>-1){u $.o[\'3G\'+c+\'1n\'].1N($.o,[p[0]].3H(d))}u p.2t(r(){7 a=p.1J.1g();q(a==\'w\'){q(1h c==\'1L\'){$.o[\'3G\'+c+\'1n\'].1N($.o,[p].3H(d))}N{7 b=($.1H.3I?$(p).3I():{});$.o.2Q(p,$.1q(b,c))}}})};$.o=F 1n()})(5f);',62,326,'|||||||var|||||||||||||||||timeEntry|this|if|function||_get|return|null|input|_field|data||case|false|break|_ampmField|_selectedHour|new|length||Math|Date|browser|true||else|px|_lastInput|parseInt|_adjustField||val|left|_secondField|_changeField|_timer|_disabledInputs|ampmNames||||_selectedMinute|_selectedSecond|span||bind||_setTime|_showField|_getSpinnerTarget|show24Hours|separator|markerClassName|_parseTime|toLowerCase|typeof|_extractTime|_blurredInput|target|max|_getInput|TimeEntry|ampmPrefix|spinnerSize|extend|options|_isDisabledTimeEntry|document|scrollLeft|css|position|top|_constrainTime|substring|_determineTime|_defaults|showSeconds|spinnerBigSize|extendRemove|class|setTimeout|fn|_endSpinner|nodeName|_changeSpinner|string|_focussed|apply|for|createTextRange|offset|_setValue|abs|_expanded|_handlingSpinner|scrollTop|curTop|_lastChr|getHours|getMinutes||getSeconds|_formatNumber|||_normaliseTime|regional|timeSteps|spinnerRepeat|background|width|focus|_doFocus|msie|mousewheel|_handleSpinner|mouseup|mouseout|_describeSpinner|_enableDisable|nextSibling|getTime|60|documentElement|offsetLeft|character|keyCode|switch|safari|each|0px|_getSpinnerRegion|_actionSpinner|_repeatSpinner|_releaseSpinner|while|_showTime|isNaN|spinnerTexts|field|appendText|initialField|useMouseWheel|defaultTime|minTime|maxTime|spinnerImage|spinnerBigImage|spinnerIncDecOnly|beforeShow|beforeSetTime|prototype|_connectTimeEntry|hasClass|style|url|no|repeat|height|mozilla|padding|after|_doBlur|_doClick|_doKeyDown|_doKeyPress|_doMouseWheel||||||mousedown|_expandSpinner|mousemove|disabled|map|inArray|_getTimeTimeEntry|1000|selectionStart|srcElement|clientX|moveEnd|ctrlKey|charCode|_handleKeyPress|opera|parents|absolute|div|_endExpand|one|_findPos|_findScroll|body|99|min|offsetParent|offsetTop|indexOf|setSelectionRange|exec|getDate|_|concat|metadata|AM|PM|Now|Previous|Next|Increment|Decrement|spinnerDefault|png|500|250|hasTimeEntry|setDefaults|spinnerText|timeEntry_control|display|inline||block|version|bottom|wrap|timeEntry_wrap||timeEntry_append||addClass|blur|click|keydown|keypress|paste|mouseover|_enableTimeEntry|_disableTimeEntry|push|_changeTimeEntry|_destroyTimeEntry|removeClass|unbind|unmousewheel|parent|replaceWith|removeData|_setTimeTimeEntry|object|_getOffsetTimeEntry|3600|thin|medium|thick|border|collapse|boundingWidth|shiftKey|String|fromCharCode|undefined|preventDefault|relative|timeEntry_expand|transparent|index|insertAfter|siblings|title|clearTimeout|remove|clientY|fixed|parentNode|split|round|is|hidden|moveStart|select|trigger|change|setFullYear|1900|setMonth|setDate|setTime|test|number|in|getOffset||isDisabled|Array|slice|call|arguments|jQuery'.split('|'),0,{}))
\ No newline at end of file
+/* jshint ignore:start */
+(function($){function TimeEntry(){this._disabledInputs=[];this.regional=[];this.regional['']={show24Hours:false,separator:':',ampmPrefix:'',ampmNames:['AM','PM'],spinnerTexts:['Now','Previous field','Next field','Increment','Decrement']};this._defaults={appendText:'',showSeconds:false,timeSteps:[1,1,1],initialField:0,noSeparatorEntry:false,useMouseWheel:true,defaultTime:null,minTime:null,maxTime:null,spinnerImage:'spinnerDefault.png',spinnerSize:[20,20,8],spinnerBigImage:'',spinnerBigSize:[40,40,16],spinnerIncDecOnly:false,spinnerRepeat:[500,250],beforeShow:null,beforeSetTime:null};$.extend(this._defaults,this.regional[''])}$.extend(TimeEntry.prototype,{markerClassName:'hasTimeEntry',propertyName:'timeEntry',_appendClass:'timeEntry_append',_controlClass:'timeEntry_control',_expandClass:'timeEntry_expand',setDefaults:function(a){$.extend(this._defaults,a||{});return this},_attachPlugin:function(b,c){var d=$(b);if(d.hasClass(this.markerClassName)){return}var e={options:$.extend({},this._defaults,c),input:d,_field:0,_selectedHour:0,_selectedMinute:0,_selectedSecond:0};d.data(this.propertyName,e).addClass(this.markerClassName).bind('focus.'+this.propertyName,this._doFocus).bind('blur.'+this.propertyName,this._doBlur).bind('click.'+this.propertyName,this._doClick).bind('keydown.'+this.propertyName,this._doKeyDown).bind('keypress.'+this.propertyName,this._doKeyPress).bind('paste.'+this.propertyName,function(a){setTimeout(function(){n._parseTime(e)},1)});this._optionPlugin(b,c)},_optionPlugin:function(a,b,c){a=$(a);var d=a.data(this.propertyName);if(!b||(typeof b=='string'&&c==null)){var e=b;b=(d||{}).options;return(b&&e?b[e]:b)}if(!a.hasClass(this.markerClassName)){return}b=b||{};if(typeof b=='string'){var e=b;b={};b[e]=c}var f=this._extractTime(d);$.extend(d.options,b);d._field=0;if(f){this._setTime(d,new Date(0,0,0,f[0],f[1],f[2]))}a.next('span.'+this._appendClass).remove();a.parent().find('span.'+this._controlClass).remove();if($.fn.mousewheel){a.unmousewheel()}var g=(!d.options.spinnerImage?null:$(''));a.after(d.options.appendText?''+d.options.appendText+'':'').after(g||'');if(d.options.useMouseWheel&&$.fn.mousewheel){a.mousewheel(this._doMouseWheel)}if(g){g.mousedown(this._handleSpinner).mouseup(this._endSpinner).mouseover(this._expandSpinner).mouseout(this._endSpinner).mousemove(this._describeSpinner)}},_enablePlugin:function(a){this._enableDisable(a,false)},_disablePlugin:function(a){this._enableDisable(a,true)},_enableDisable:function(b,c){var d=$.data(b,this.propertyName);if(!d){return}b.disabled=c;if(b.nextSibling&&b.nextSibling.nodeName.toLowerCase()=='span'){n._changeSpinner(d,b.nextSibling,(c?5:-1))}n._disabledInputs=$.map(n._disabledInputs,function(a){return(a==b?null:a)});if(c){n._disabledInputs.push(b)}},_isDisabledPlugin:function(a){return $.inArray(a,this._disabledInputs)>-1},_destroyPlugin:function(b){b=$(b);if(!b.hasClass(this.markerClassName)){return}b.removeClass(this.markerClassName).removeData(this.propertyName).unbind('.'+this.propertyName);if($.fn.mousewheel){b.unmousewheel()}this._disabledInputs=$.map(this._disabledInputs,function(a){return(a==b[0]?null:a)});b.siblings('.'+this._appendClass+',.'+this._controlClass).remove()},_setTimePlugin:function(a,b){var c=$.data(a,this.propertyName);if(c){if(b===null||b===''){c.input.val('')}else{this._setTime(c,b?(typeof b=='object'?new Date(b.getTime()):b):null)}}},_getTimePlugin:function(a){var b=$.data(a,this.propertyName);var c=(b?this._extractTime(b):null);return(!c?null:new Date(0,0,0,c[0],c[1],c[2]))},_getOffsetPlugin:function(a){var b=$.data(a,this.propertyName);var c=(b?this._extractTime(b):null);return(!c?0:(c[0]*3600+c[1]*60+c[2])*1000)},_doFocus:function(a){var b=(a.nodeName&&a.nodeName.toLowerCase()=='input'?a:this);if(n._lastInput==b||n._isDisabledPlugin(b)){n._focussed=false;return}var c=$.data(b,n.propertyName);n._focussed=true;n._lastInput=b;n._blurredInput=null;$.extend(c.options,($.isFunction(c.options.beforeShow)?c.options.beforeShow.apply(b,[b]):{}));n._parseTime(c);setTimeout(function(){n._showField(c)},10)},_doBlur:function(a){n._blurredInput=n._lastInput;n._lastInput=null},_doClick:function(b){var c=b.target;var d=$.data(c,n.propertyName);var e=d._field;if(!n._focussed){var f=d.options.separator.length+2;d._field=0;if(c.selectionStart!=null){for(var g=0;g<=Math.max(1,d._secondField,d._ampmField);g++){var h=(g!=d._ampmField?(g*f)+2:(d._ampmField*f)+d.options.ampmPrefix.length+d.options.ampmNames[0].length);d._field=g;if(c.selectionStart=48){return true}var b=$.data(a.target,n.propertyName);switch(a.keyCode){case 9:return(a.shiftKey?n._changeField(b,-1,true):n._changeField(b,+1,true));case 35:if(a.ctrlKey){n._setValue(b,'')}else{b._field=Math.max(1,b._secondField,b._ampmField);n._adjustField(b,0)}break;case 36:if(a.ctrlKey){n._setTime(b)}else{b._field=0;n._adjustField(b,0)}break;case 37:n._changeField(b,-1,false);break;case 38:n._adjustField(b,+1);break;case 39:n._changeField(b,+1,false);break;case 40:n._adjustField(b,-1);break;case 46:n._setValue(b,'');break;default:return true}return false},_doKeyPress:function(a){var b=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);if(b<' '){return true}var c=$.data(a.target,n.propertyName);n._handleKeyPress(c,b);return false},_doMouseWheel:function(a,b){if(n._isDisabledPlugin(a.target)){return}var c=$.data(a.target,n.propertyName);c.input.focus();if(!c.input.val()){n._parseTime(c)}n._adjustField(c,b);a.preventDefault()},_expandSpinner:function(b){var c=n._getSpinnerTarget(b);var d=$.data(n._getInput(c),n.propertyName);if(n._isDisabledPlugin(d.input[0])){return}if(d.options.spinnerBigImage){d._expanded=true;var e=$(c).offset();var f=null;$(c).parents().each(function(){var a=$(this);if(a.css('position')=='relative'||a.css('position')=='absolute'){f=a.offset()}return!f});$('').mousedown(n._handleSpinner).mouseup(n._endSpinner).mouseout(n._endExpand).mousemove(n._describeSpinner).insertAfter(c)}},_getInput:function(a){return $(a).siblings('.'+n.markerClassName)[0]},_describeSpinner:function(a){var b=n._getSpinnerTarget(a);var c=$.data(n._getInput(b),n.propertyName);b.title=c.options.spinnerTexts[n._getSpinnerRegion(c,a)]},_handleSpinner:function(a){var b=n._getSpinnerTarget(a);var c=n._getInput(b);if(n._isDisabledPlugin(c)){return}if(c==n._blurredInput){n._lastInput=c;n._blurredInput=null}var d=$.data(c,n.propertyName);n._doFocus(c);var e=n._getSpinnerRegion(d,a);n._changeSpinner(d,b,e);n._actionSpinner(d,e);n._timer=null;n._handlingSpinner=true;if(e>=3&&d.options.spinnerRepeat[0]){n._timer=setTimeout(function(){n._repeatSpinner(d,e)},d.options.spinnerRepeat[0]);$(b).one('mouseout',n._releaseSpinner).one('mouseup',n._releaseSpinner)}},_actionSpinner:function(a,b){if(!a.input.val()){n._parseTime(a)}switch(b){case 0:this._setTime(a);break;case 1:this._changeField(a,-1,false);break;case 2:this._changeField(a,+1,false);break;case 3:this._adjustField(a,+1);break;case 4:this._adjustField(a,-1);break}},_repeatSpinner:function(a,b){if(!n._timer){return}n._lastInput=n._blurredInput;this._actionSpinner(a,b);this._timer=setTimeout(function(){n._repeatSpinner(a,b)},a.options.spinnerRepeat[1])},_releaseSpinner:function(a){clearTimeout(n._timer);n._timer=null},_endExpand:function(a){n._timer=null;var b=n._getSpinnerTarget(a);var c=n._getInput(b);var d=$.data(c,n.propertyName);$(b).remove();d._expanded=false},_endSpinner:function(a){n._timer=null;var b=n._getSpinnerTarget(a);var c=n._getInput(b);var d=$.data(c,n.propertyName);if(!n._isDisabledPlugin(c)){n._changeSpinner(d,b,-1)}if(n._handlingSpinner){n._lastInput=n._blurredInput}if(n._lastInput&&n._handlingSpinner){n._showField(d)}n._handlingSpinner=false},_getSpinnerTarget:function(a){return a.target||a.srcElement},_getSpinnerRegion:function(a,b){var c=this._getSpinnerTarget(b);var d=$(c).offset();var e=[document.documentElement.scrollLeft||document.body.scrollLeft,document.documentElement.scrollTop||document.body.scrollTop];var f=(a.options.spinnerIncDecOnly?99:b.clientX+e[0]-d.left);var g=b.clientY+e[1]-d.top;var h=a.options[a._expanded?'spinnerBigSize':'spinnerSize'];var i=(a.options.spinnerIncDecOnly?99:h[0]-1-f);var j=h[1]-1-g;if(h[2]>0&&Math.abs(f-i)<=h[2]&&Math.abs(g-j)<=h[2]){return 0}var k=Math.min(f,g,i,j);return(k==f?1:(k==i?2:(k==g?3:4)))},_changeSpinner:function(a,b,c){$(b).css('background-position','-'+((c+1)*a.options[a._expanded?'spinnerBigSize':'spinnerSize'][0])+'px 0px')},_parseTime:function(a){var b=this._extractTime(a);if(b){a._selectedHour=b[0];a._selectedMinute=b[1];a._selectedSecond=b[2]}else{var c=this._constrainTime(a);a._selectedHour=c[0];a._selectedMinute=c[1];a._selectedSecond=(a.options.showSeconds?c[2]:0)}a._secondField=(a.options.showSeconds?2:-1);a._ampmField=(a.options.show24Hours?-1:(a.options.showSeconds?3:2));a._lastChr='';a._field=Math.max(0,Math.min(Math.max(1,a._secondField,a._ampmField),a.options.initialField));if(a.input.val()!=''){this._showTime(a)}},_extractTime:function(a,b){b=b||a.input.val();var c=b.split(a.options.separator);if(a.options.separator==''&&b!=''){c[0]=b.substring(0,2);c[1]=b.substring(2,4);c[2]=b.substring(4,6)}if(c.length>=2){var d=!a.options.show24Hours&&(b.indexOf(a.options.ampmNames[0])>-1);var e=!a.options.show24Hours&&(b.indexOf(a.options.ampmNames[1])>-1);var f=parseInt(c[0],10);f=(isNaN(f)?0:f);f=((d||e)&&f==12?0:f)+(e?12:0);var g=parseInt(c[1],10);g=(isNaN(g)?0:g);var h=(c.length>=3?parseInt(c[2],10):0);h=(isNaN(h)||!a.options.showSeconds?0:h);return this._constrainTime(a,[f,g,h])}return null},_constrainTime:function(a,b){var c=(b!=null);if(!c){var d=this._determineTime(a.options.defaultTime,a)||new Date();b=[d.getHours(),d.getMinutes(),d.getSeconds()]}var e=false;for(var i=0;i1){b[i]=Math.round(b[i]/a.options.timeSteps[i])*a.options.timeSteps[i];e=true}}return b},_showTime:function(a){var b=(this._formatNumber(a.options.show24Hours?a._selectedHour:((a._selectedHour+11)%12)+1)+a.options.separator+this._formatNumber(a._selectedMinute)+(a.options.showSeconds?a.options.separator+this._formatNumber(a._selectedSecond):'')+(a.options.show24Hours?'':a.options.ampmPrefix+a.options.ampmNames[(a._selectedHour<12?0:1)]));this._setValue(a,b);this._showField(a)},_showField:function(a){var b=a.input[0];if(a.input.is(':hidden')||n._lastInput!=b){return}var c=a.options.separator.length+2;var d=(a._field!=a._ampmField?(a._field*c):(a._ampmField*c)-a.options.separator.length+a.options.ampmPrefix.length);var e=d+(a._field!=a._ampmField?2:a.options.ampmNames[0].length);if(b.setSelectionRange){b.setSelectionRange(d,e)}else if(b.createTextRange){var f=b.createTextRange();f.moveStart('character',d);f.moveEnd('character',e-a.input.val().length);f.select()}if(!b.disabled){b.focus()}},_formatNumber:function(a){return(a<10?'0':'')+a},_setValue:function(a,b){if(b!=a.input.val()){a.input.val(b).trigger('change')}},_changeField:function(a,b,c){var d=(a.input.val()==''||a._field==(b==-1?0:Math.max(1,a._secondField,a._ampmField)));if(!d){a._field+=b}this._showField(a);a._lastChr='';return(d&&c)},_adjustField:function(a,b){if(a.input.val()==''){b=0}this._setTime(a,new Date(0,0,0,a._selectedHour+(a._field==0?b*a.options.timeSteps[0]:0)+(a._field==a._ampmField?b*12:0),a._selectedMinute+(a._field==1?b*a.options.timeSteps[1]:0),a._selectedSecond+(a._field==a._secondField?b*a.options.timeSteps[2]:0)))},_setTime:function(a,b){b=this._determineTime(b,a);var c=this._constrainTime(a,b?[b.getHours(),b.getMinutes(),b.getSeconds()]:null);b=new Date(0,0,0,c[0],c[1],c[2]);var b=this._normaliseTime(b);var d=this._normaliseTime(this._determineTime(a.options.minTime,a));var e=this._normaliseTime(this._determineTime(a.options.maxTime,a));if(d&&e&&d>e){if(be){b=(Math.abs(b-d)e?e:b))}if($.isFunction(a.options.beforeSetTime)){b=a.options.beforeSetTime.apply(a.input[0],[this._getTimePlugin(a.input[0]),b,d,e])}a._selectedHour=b.getHours();a._selectedMinute=b.getMinutes();a._selectedSecond=b.getSeconds();this._showTime(a)},_determineTime:function(i,j){var k=function(a){var b=new Date();b.setTime(b.getTime()+a*1000);return b};var l=function(a){var b=n._extractTime(j,a);var c=new Date();var d=(b?b[0]:c.getHours());var e=(b?b[1]:c.getMinutes());var f=(b?b[2]:c.getSeconds());if(!b){var g=/([+-]?[0-9]+)\s*(s|S|m|M|h|H)?/g;var h=g.exec(a);while(h){switch(h[2]||'s'){case's':case'S':f+=parseInt(h[1],10);break;case'm':case'M':e+=parseInt(h[1],10);break;case'h':case'H':d+=parseInt(h[1],10);break}h=g.exec(a)}}c=new Date(0,0,10,d,e,f,0);if(/^!/.test(a)){if(c.getDate()>10){c=new Date(0,0,10,23,59,59)}else if(c.getDate()<10){c=new Date(0,0,10,0,0,0)}}return c};return(i?(typeof i=='string'?l(i):(typeof i=='number'?k(i):i)):null)},_normaliseTime:function(a){if(!a){return null}a.setFullYear(1900);a.setMonth(0);a.setDate(0);return a},_handleKeyPress:function(a,b){if(b==a.options.separator){this._changeField(a,+1,false)}else if(b>='0'&&b<='9'){var c=parseInt(b,10);var d=parseInt(a._lastChr+b,10);var e=(a._field!=0?a._selectedHour:(a.options.show24Hours?(d<24?d:c):(d>=1&&d<=12?d:(c>0?c:a._selectedHour))%12+(a._selectedHour>=12?12:0)));var f=(a._field!=1?a._selectedMinute:(d<60?d:c));var g=(a._field!=a._secondField?a._selectedSecond:(d<60?d:c));var h=this._constrainTime(a,[e,f,g]);this._setTime(a,new Date(0,0,0,h[0],h[1],h[2]));if(a.options.noSeparatorEntry&&a._lastChr){this._changeField(a,+1,false)}else{a._lastChr=b}}else if(!a.options.show24Hours){b=b.toLowerCase();if((b==a.options.ampmNames[0].substring(0,1).toLowerCase()&&a._selectedHour>=12)||(b==a.options.ampmNames[1].substring(0,1).toLowerCase()&&a._selectedHour<12)){var i=a._field;a._field=a._ampmField;this._adjustField(a,+1);a._field=i;this._showField(a)}}}});var m=['getOffset','getTime','isDisabled'];function isNotChained(a,b){if(a=='option'&&(b.length==0||(b.length==1&&typeof b[0]=='string'))){return true}return $.inArray(a,m)>-1}$.fn.timeEntry=function(b){var c=Array.prototype.slice.call(arguments,1);if(isNotChained(b,c)){return n['_'+b+'Plugin'].apply(n,[this[0]].concat(c))}return this.each(function(){if(typeof b=='string'){if(!n['_'+b+'Plugin']){throw'Unknown command: '+b;}n['_'+b+'Plugin'].apply(n,[this].concat(c))}else{var a=($.fn.metadata?$(this).metadata():{});n._attachPlugin(this,$.extend({},a,b||{}))}})};var n=$.timeEntry=new TimeEntry()})(jQuery);
+/* jshint ignore:end */
\ No newline at end of file
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat.inc b/profiles/commerce_kickstart/modules/contrib/date/date_repeat.inc
index 2df03dc8..046d8aee 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat.inc
@@ -2,5 +2,6 @@
/**
* @file
* Empty file to avoid fatal error if it doesn't exist.
+ *
* Formerly the Date Repeat field code.
- */
\ No newline at end of file
+ */
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.info b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.info
index 695a2fd9..0a63175c 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.info
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.info
@@ -7,9 +7,9 @@ php = 5.2
files[] = tests/date_repeat.test
files[] = tests/date_repeat_form.test
-; Information added by Drupal.org packaging script on 2014-07-29
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
core = "7.x"
project = "date"
-datestamp = "1406653438"
+datestamp = "1491562090"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.install b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.install
index 65c3adbb..52039630 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.install
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.install
@@ -12,21 +12,3 @@ function date_repeat_install() {
// Make sure this module loads after date_api.
db_query("UPDATE {system} SET weight = 1 WHERE name = 'date_repeat'");
}
-
-/**
- * Implements hook_uninstall().
- */
-function date_repeat_uninstall() {
-}
-
-/**
- * Implements hook_enable().
- */
-function date_repeat_enable() {
-}
-
-/**
- * Implements hook_disable().
- */
-function date_repeat_disable() {
-}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.module b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.module
index d742dc88..61d971ba 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.module
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat.module
@@ -1,7 +1,6 @@
array('render element' => 'element'),
@@ -55,6 +57,9 @@ function date_repeat_freq_options() {
);
}
+/**
+ * Helper function for interval options.
+ */
function date_repeat_interval_options() {
$options = range(0, 366);
unset($options[0]);
@@ -92,9 +97,11 @@ function date_repeat_dow_day_options_abbr($translated = TRUE, $length = 3) {
case 1:
$context = 'day_abbr1';
break;
+
case 2:
$context = 'day_abbr2';
break;
+
default:
$context = '';
break;
@@ -105,16 +112,28 @@ function date_repeat_dow_day_options_abbr($translated = TRUE, $length = 3) {
return $return;
}
+/**
+ * Helper function for weekdays translated.
+ */
function date_repeat_dow_day_untranslated() {
static $date_repeat_weekdays;
if (empty($date_repeat_weekdays)) {
- $date_repeat_weekdays = array('SU' => 'Sunday', 'MO' => 'Monday', 'TU' => 'Tuesday',
- 'WE' => 'Wednesday', 'TH' => 'Thursday', 'FR' => 'Friday',
- 'SA' => 'Saturday');
+ $date_repeat_weekdays = array(
+ 'SU' => 'Sunday',
+ 'MO' => 'Monday',
+ 'TU' => 'Tuesday',
+ 'WE' => 'Wednesday',
+ 'TH' => 'Thursday',
+ 'FR' => 'Friday',
+ 'SA' => 'Saturday'
+ );
}
return $date_repeat_weekdays;
}
+/**
+ * Helper function for weekdays order.
+ */
function date_repeat_dow_day_options_ordered($weekdays) {
$day_keys = array_keys($weekdays);
$day_values = array_values($weekdays);
@@ -164,8 +183,7 @@ function date_repeat_dow2day($dow) {
}
/**
- * Shift the array of iCal day names into the right order
- * for a specific week start day.
+ * Shift the array of iCal day names into the right order for a specific week start day.
*/
function date_repeat_days_ordered($week_start_day) {
$days = array_flip(array_keys(date_repeat_dow_day_options(FALSE)));
@@ -212,18 +230,21 @@ function date_repeat_rrule_description($rrule, $format = 'D M d Y') {
'!except' => '',
'!additional' => '',
'!week_starts_on' => '',
- );
+ );
$interval = date_repeat_interval_options();
switch ($rrule['FREQ']) {
case 'WEEKLY':
$description['!interval'] = format_plural($rrule['INTERVAL'], 'every week', 'every @count weeks') . ' ';
break;
+
case 'MONTHLY':
$description['!interval'] = format_plural($rrule['INTERVAL'], 'every month', 'every @count months') . ' ';
break;
+
case 'YEARLY':
$description['!interval'] = format_plural($rrule['INTERVAL'], 'every year', 'every @count years') . ' ';
break;
+
default:
$description['!interval'] = format_plural($rrule['INTERVAL'], 'every day', 'every @count days') . ' ';
break;
@@ -240,26 +261,41 @@ function date_repeat_rrule_description($rrule, $format = 'D M d Y') {
if (!empty($count)) {
// See if there is a 'pretty' option for this count, i.e. +1 => First.
$order = array_key_exists($count, $counts) ? strtolower($counts[$count]) : $count;
- $results[] = trim(t('!repeats_every_interval on the !date_order !day_of_week', array('!repeats_every_interval ' => '', '!date_order' => $order, '!day_of_week' => $days[$day])));
+ $results[] = trim(t('!repeats_every_interval on the !date_order !day_of_week',
+ array(
+ '!repeats_every_interval ' => '',
+ '!date_order' => $order,
+ '!day_of_week' => $days[$day]
+ )));
}
else {
- $results[] = trim(t('!repeats_every_interval every !day_of_week', array('!repeats_every_interval ' => '', '!day_of_week' => $days[$day])));
+ $results[] = trim(t('!repeats_every_interval every !day_of_week',
+ array('!repeats_every_interval ' => '', '!day_of_week' => $days[$day])));
}
}
$description['!byday'] = implode(' ' . t('and') . ' ', $results);
}
if (!empty($rrule['BYMONTH'])) {
- if (sizeof($rrule['BYMONTH']) < 12) {
+ if (count($rrule['BYMONTH']) < 12) {
$results = array();
$months = date_month_names();
foreach ($rrule['BYMONTH'] as $month) {
$results[] = $months[$month];
}
if (!empty($rrule['BYMONTHDAY'])) {
- $description['!bymonth'] = trim(t('!repeats_every_interval on the !month_days of !month_names', array('!repeats_every_interval ' => '', '!month_days' => implode(', ', $rrule['BYMONTHDAY']), '!month_names' => implode(', ', $results))));
+ $description['!bymonth'] = trim(t('!repeats_every_interval on the !month_days of !month_names',
+ array(
+ '!repeats_every_interval ' => '',
+ '!month_days' => implode(', ', $rrule['BYMONTHDAY']),
+ '!month_names' => implode(', ', $results)
+ )));
}
else {
- $description['!bymonth'] = trim(t('!repeats_every_interval on !month_names', array('!repeats_every_interval ' => '', '!month_names' => implode(', ', $results))));
+ $description['!bymonth'] = trim(t('!repeats_every_interval on !month_names',
+ array(
+ '!repeats_every_interval ' => '',
+ '!month_names' => implode(', ', $results)
+ )));
}
}
}
@@ -267,12 +303,17 @@ function date_repeat_rrule_description($rrule, $format = 'D M d Y') {
$rrule['INTERVAL'] = 1;
}
if (!empty($rrule['COUNT'])) {
- $description['!count'] = trim(t('!repeats_every_interval !count times', array('!repeats_every_interval ' => '', '!count' => $rrule['COUNT'])));
+ $description['!count'] = trim(t('!repeats_every_interval !count times',
+ array('!repeats_every_interval ' => '', '!count' => $rrule['COUNT'])));
}
if (!empty($rrule['UNTIL'])) {
$until = date_ical_date($rrule['UNTIL'], 'UTC');
date_timezone_set($until, date_default_timezone_object());
- $description['!until'] = trim(t('!repeats_every_interval until !until_date', array('!repeats_every_interval ' => '', '!until_date' => date_format_date($until, 'custom', $format))));
+ $description['!until'] = trim(t('!repeats_every_interval until !until_date',
+ array(
+ '!repeats_every_interval ' => '',
+ '!until_date' => date_format_date($until, 'custom', $format)
+ )));
}
if ($exceptions) {
$values = array();
@@ -281,11 +322,16 @@ function date_repeat_rrule_description($rrule, $format = 'D M d Y') {
date_timezone_set($except, date_default_timezone_object());
$values[] = date_format_date($except, 'custom', $format);
}
- $description['!except'] = trim(t('!repeats_every_interval except !except_dates', array('!repeats_every_interval ' => '', '!except_dates' => implode(', ', $values))));
+ $description['!except'] = trim(t('!repeats_every_interval except !except_dates',
+ array(
+ '!repeats_every_interval ' => '',
+ '!except_dates' => implode(', ', $values)
+ )));
}
if (!empty($rrule['WKST'])) {
$day_names = date_repeat_dow_day_options();
- $description['!week_starts_on'] = trim(t('!repeats_every_interval where the week start on !day_of_week', array('!repeats_every_interval ' => '', '!day_of_week' => $day_names[trim($rrule['WKST'])])));
+ $description['!week_starts_on'] = trim(t('!repeats_every_interval where the week start on !day_of_week',
+ array('!repeats_every_interval ' => '', '!day_of_week' => $day_names[trim($rrule['WKST'])])));
}
if ($additions) {
$values = array();
@@ -294,9 +340,15 @@ function date_repeat_rrule_description($rrule, $format = 'D M d Y') {
date_timezone_set($add, date_default_timezone_object());
$values[] = date_format_date($add, 'custom', $format);
}
- $description['!additional'] = trim(t('Also includes !additional_dates.', array('!additional_dates' => implode(', ', $values))));
+ $description['!additional'] = trim(t('Also includes !additional_dates.',
+ array('!additional_dates' => implode(', ', $values))));
}
- return t('Repeats !interval !bymonth !byday !count !until !except. !additional', $description);
+ $output = t('Repeats !interval !bymonth !byday !count !until !except. !additional', $description);
+ // Removes double whitespaces from Repeat tile.
+ $output = preg_replace('/\s+/', ' ', $output);
+ // Removes whitespace before full stop ".", at the end of the title.
+ $output = str_replace(' .', '.', $output);
+ return $output;
}
/**
@@ -310,17 +362,17 @@ function date_repeat_split_rrule($rrule) {
$additions = array();
foreach ($parts as $part) {
if (strstr($part, 'RRULE')) {
- $RRULE = str_replace('RRULE:', '', $part);
- $rrule = (array) date_ical_parse_rrule('RRULE:', $RRULE);
+ $cleanded_part = str_replace('RRULE:', '', $part);
+ $rrule = (array) date_ical_parse_rrule('RRULE:', $cleanded_part);
}
elseif (strstr($part, 'EXDATE')) {
- $EXDATE = str_replace('EXDATE:', '', $part);
- $exceptions = (array) date_ical_parse_exceptions('EXDATE:', $EXDATE);
+ $exdate = str_replace('EXDATE:', '', $part);
+ $exceptions = (array) date_ical_parse_exceptions('EXDATE:', $exdate);
unset($exceptions['DATA']);
}
elseif (strstr($part, 'RDATE')) {
- $RDATE = str_replace('RDATE:', '', $part);
- $additions = (array) date_ical_parse_exceptions('RDATE:', $RDATE);
+ $rdate = str_replace('RDATE:', '', $part);
+ $additions = (array) date_ical_parse_exceptions('RDATE:', $rdate);
unset($additions['DATA']);
}
}
@@ -372,7 +424,7 @@ function date_repeat_form_element_radios_process($element) {
'#title_display' => 'invisible',
'#return_value' => $key,
'#default_value' => isset($element['#default_value']) ?
- $element['#default_value'] : NULL,
+ $element['#default_value'] : NULL,
'#attributes' => $element['#attributes'],
'#parents' => $element['#parents'],
'#id' => drupal_html_id('edit-' . implode('-', $parents_for_id)),
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_calc.inc b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_calc.inc
index 4ff3c4a5..d840df62 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_calc.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_calc.inc
@@ -53,9 +53,11 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
// Create a date object for the start and end dates.
$start_date = new DateObject($start, $timezone);
- // Versions of PHP greater than PHP 5.3.5 require that we set an explicit time when
- // using date_modify() or the time may not match the original value. Adding this
- // modifier gives us the same results in both older and newer versions of PHP.
+ // Versions of PHP greater than PHP 5.3.5 require
+ // that we set an explicit time when using date_modify()
+ // or the time may not match the original value.
+ // Adding this modifier gives us the same results in both older
+ // and newer versions of PHP.
$modify_time = ' ' . $start_date->format('g:ia');
// If the rule has an UNTIL, see if that is earlier than the end date.
@@ -91,27 +93,32 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
}
// Make sure DAILY frequency isn't used in places it won't work;
- if (!empty($rrule['BYMONTHDAY']) && !in_array($rrule['FREQ'], array('MONTHLY', 'YEARLY'))) {
+ if (!empty($rrule['BYMONTHDAY']) &&
+ !in_array($rrule['FREQ'], array('MONTHLY', 'YEARLY'))) {
$rrule['FREQ'] = 'MONTHLY';
}
- elseif (!empty($rrule['BYDAY']) && !in_array($rrule['FREQ'], array('MONTHLY', 'WEEKLY', 'YEARLY'))) {
+ elseif (!empty($rrule['BYDAY'])
+ && !in_array($rrule['FREQ'], array('MONTHLY', 'WEEKLY', 'YEARLY'))) {
$rrule['FREQ'] = 'WEEKLY';
- }
+ }
// Find the time period to jump forward between dates.
switch ($rrule['FREQ']) {
- case 'DAILY':
- $jump = $interval . ' days';
- break;
- case 'WEEKLY':
- $jump = $interval . ' weeks';
- break;
- case 'MONTHLY':
- $jump = $interval . ' months';
- break;
- case 'YEARLY':
- $jump = $interval . ' years';
- break;
+ case 'DAILY':
+ $jump = $interval . ' days';
+ break;
+
+ case 'WEEKLY':
+ $jump = $interval . ' weeks';
+ break;
+
+ case 'MONTHLY':
+ $jump = $interval . ' months';
+ break;
+
+ case 'YEARLY':
+ $jump = $interval . ' years';
+ break;
}
$rrule = date_repeat_adjust_rrule($rrule, $start_date);
@@ -135,7 +142,7 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
$direction_days[$day] = array(
'direction' => !empty($regs[1]) ? $regs[1] : '+',
'direction_count' => $regs[2],
- );
+ );
}
}
while (!$finished) {
@@ -198,8 +205,9 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
else {
- // More complex searches for day names and criteria like '-1SU' or '2TU,2TH',
- // require that we interate through the whole time period checking each BYDAY.
+ // More complex searches for day names and criteria
+ // like '-1SU' or '2TU,2TH', require that we interate through
+ // the whole time period checking each BYDAY.
// Create helper array to pull day names out of iCal day strings.
$day_names = date_repeat_dow_day_options(FALSE);
@@ -303,7 +311,8 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
// period, then jumping ahead to the next week, month, or year,
// an INTERVAL at a time.
- if (!empty($week_days) && in_array($rrule['FREQ'], array('MONTHLY', 'WEEKLY', 'YEARLY'))) {
+ if (!empty($week_days) &&
+ in_array($rrule['FREQ'], array('MONTHLY', 'WEEKLY', 'YEARLY'))) {
$finished = FALSE;
$current_day = clone($start_date);
$format = $rrule['FREQ'] == 'YEARLY' ? 'Y' : 'n';
@@ -322,8 +331,9 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
$moved = FALSE;
foreach ($week_days as $delta => $day) {
// Find the next occurence of each day in this week, only add it
- // if we are still in the current month or year. The date_repeat_add_dates
- // function is insufficient to test whether to include this date
+ // if we are still in the current month or year.
+ // The date_repeat_add_dates function is insufficient
+ // to test whether to include this date
// if we are using a rule like 'every other month', so we must
// explicitly test it here.
@@ -370,10 +380,12 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
date_modify($current_day, '+1 ' . $week_start_day . $modify_time);
date_modify($current_day, '-1 week' . $modify_time);
break;
+
case 'MONTHLY':
date_modify($current_day, '-' . (date_format($current_day, 'j') - 1) . ' days' . $modify_time);
date_modify($current_day, '-1 month' . $modify_time);
break;
+
case 'YEARLY':
date_modify($current_day, '-' . date_format($current_day, 'z') . ' days' . $modify_time);
date_modify($current_day, '-1 year' . $modify_time);
@@ -387,7 +399,7 @@ function _date_repeat_calc($rrule, $start, $end, $exceptions, $timezone, $additi
}
}
- // add additional dates
+ // Add additional dates.
foreach ($additions as $addition) {
$date = new dateObject($addition . ' ' . $start_date->format('H:i:s'), $timezone);
$days[] = date_format($date, DATE_FORMAT_DATETIME);
@@ -426,8 +438,8 @@ function date_repeat_adjust_rrule($rrule, $start_date) {
// position rules make no sense in other periods and just add complexity.
elseif (!empty($rrule['BYDAY']) && !in_array($rrule['FREQ'], array('MONTHLY', 'YEARLY'))) {
- foreach ($rrule['BYDAY'] as $delta => $BYDAY) {
- $rrule['BYDAY'][$delta] = substr($BYDAY, -2);
+ foreach ($rrule['BYDAY'] as $delta => $by_day) {
+ $rrule['BYDAY'][$delta] = substr($by_day, -2);
}
}
@@ -442,7 +454,7 @@ function date_repeat_adjust_rrule($rrule, $start_date) {
* and that it meets other criteria in the RRULE.
*/
function date_repeat_add_dates(&$days, $current_day, $start_date, $end_date, $exceptions, $rrule) {
- if (isset($rrule['COUNT']) && sizeof($days) >= $rrule['COUNT']) {
+ if (isset($rrule['COUNT']) && count($days) >= $rrule['COUNT']) {
return FALSE;
}
$formatted = date_format($current_day, DATE_FORMAT_DATETIME);
@@ -456,13 +468,14 @@ function date_repeat_add_dates(&$days, $current_day, $start_date, $end_date, $ex
return FALSE;
}
if (!empty($rrule['BYDAY'])) {
- $BYDAYS = $rrule['BYDAY'];
- foreach ($BYDAYS as $delta => $BYDAY) {
- $BYDAYS[$delta] = substr($BYDAY, -2);
+ $by_days = $rrule['BYDAY'];
+ foreach ($by_days as $delta => $by_day) {
+ $by_days[$delta] = substr($by_day, -2);
}
- if (!in_array(date_repeat_dow2day(date_format($current_day, 'w')), $BYDAYS)) {
+ if (!in_array(date_repeat_dow2day(date_format($current_day, 'w')), $by_days)) {
return FALSE;
- }}
+ }
+ }
if (!empty($rrule['BYYEAR']) && !in_array(date_format($current_day, 'Y'), $rrule['BYYEAR'])) {
return FALSE;
}
@@ -472,17 +485,17 @@ function date_repeat_add_dates(&$days, $current_day, $start_date, $end_date, $ex
if (!empty($rrule['BYMONTHDAY'])) {
// Test month days, but only if there are no negative numbers.
$test = TRUE;
- $BYMONTHDAYS = array();
+ $by_month_days = array();
foreach ($rrule['BYMONTHDAY'] as $day) {
if ($day > 0) {
- $BYMONTHDAYS[] = $day;
+ $by_month_days[] = $day;
}
else {
$test = FALSE;
break;
}
}
- if ($test && !empty($BYMONTHDAYS) && !in_array(date_format($current_day, 'j'), $BYMONTHDAYS)) {
+ if ($test && !empty($by_month_days) && !in_array(date_format($current_day, 'j'), $by_month_days)) {
return FALSE;
}
}
@@ -499,7 +512,7 @@ function date_repeat_add_dates(&$days, $current_day, $start_date, $end_date, $ex
* Stop when $current_day is greater than $end_date or $count is reached.
*/
function date_repeat_is_finished($current_day, $days, $count, $end_date) {
- if (($count && sizeof($days) >= $count)
+ if (($count && count($days) >= $count)
|| (!empty($end_date) && date_format($current_day, 'U') > date_format($end_date, 'U'))) {
return TRUE;
}
@@ -517,7 +530,7 @@ function date_repeat_is_finished($current_day, $days, $count, $end_date) {
* If $day is empty, will set to the number of days from the
* beginning or end of the month.
*/
-function date_repeat_set_month_day($date_in, $day, $count = 1, $direction = '+', $timezone = 'UTC', $modify_time) {
+function date_repeat_set_month_day($date_in, $day, $count = 1, $direction = '+', $timezone = 'UTC', $modify_time = '') {
if (is_object($date_in)) {
$current_month = date_format($date_in, 'n');
@@ -567,7 +580,7 @@ function date_repeat_set_month_day($date_in, $day, $count = 1, $direction = '+',
* If $day is empty, will set to the number of days from the
* beginning or end of the year.
*/
-function date_repeat_set_year_day($date_in, $month, $day, $count = 1, $direction = '+', $timezone = 'UTC', $modify_time) {
+function date_repeat_set_year_day($date_in, $month, $day, $count = 1, $direction = '+', $timezone = 'UTC', $modify_time = '') {
if (is_object($date_in)) {
$current_year = date_format($date_in, 'Y');
@@ -620,4 +633,4 @@ function date_repeat_set_year_day($date_in, $month, $day, $count = 1, $direction
}
}
return $date_in;
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_form.inc b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_form.inc
index db7a79bc..33525956 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_form.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/date_repeat_form.inc
@@ -30,13 +30,16 @@
* BYSETPOS
* Seldom used anywhere, so no reason to complicated the code.
*/
+
/**
* Generate the repeat setting form.
*/
function _date_repeat_rrule_process($element, &$form_state, $form) {
- // If the RRULE field is not visible to the user, needs no processing or validation.
- // The Date field module is not adding this element to forms if the field is hidden,
+ // If the RRULE field is not visible to the user,
+ // needs no processing or validation.
+ // The Date field module is not adding this element to forms
+ // if the field is hidden,
// this test is just in case some other module attempts to do so.
if (date_hidden_element($element)) {
@@ -67,16 +70,16 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
$timezone = !empty($element['#date_timezone']) ? $element['#date_timezone'] : date_default_timezone();
$merged_values = date_repeat_merge($rrule, $element);
- $UNTIL = '';
+ $until = '';
if (!empty($merged_values['UNTIL']['datetime'])) {
$until_date = new DateObject($merged_values['UNTIL']['datetime'], $merged_values['UNTIL']['tz']);
date_timezone_set($until_date, timezone_open($timezone));
- $UNTIL = date_format($until_date, DATE_FORMAT_DATETIME);
+ $until = date_format($until_date, DATE_FORMAT_DATETIME);
}
- $COUNT = '';
+ $count = '';
if (!empty($merged_values['COUNT'])) {
- $COUNT = $merged_values['COUNT'];
+ $count = $merged_values['COUNT'];
}
$element['FREQ'] = array(
@@ -137,7 +140,7 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
);
list($prefix, $suffix) = explode('@interval', t('Every @interval days', array(), array('context' => 'Date repeat')));
- $DAILY_INTERVAL = array(
+ $daily_interval = array(
'#type' => 'textfield',
'#title' => t('Repeats', array(), array('context' => 'Date repeat')),
'#title_display' => 'invisible',
@@ -210,32 +213,34 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
'#suffix' => '
',
);
- $DAILY_radios_default = 'INTERVAL';
+ $daily_radios_default = 'INTERVAL';
if (isset($rrule['FREQ']) && $rrule['FREQ'] === 'DAILY' && !empty($rrule['BYDAY'])) {
switch (count($rrule['BYDAY'])) {
case 2:
- $DAILY_radios_default = 'every_tu_th';
+ $daily_radios_default = 'every_tu_th';
break;
+
case 3:
- $DAILY_radios_default = 'every_mo_we_fr';
+ $daily_radios_default = 'every_mo_we_fr';
break;
+
case 5:
- $DAILY_radios_default = 'every_weekday';
+ $daily_radios_default = 'every_weekday';
break;
}
}
- $DAILY_every_weekday = array(
+ $daily_every_weekday = array(
'#type' => 'item',
'#markup' => '';
- html += ' ';
- html += Drupal.CTools.Modal.currentSettings.closeText + Drupal.CTools.Modal.currentSettings.closeImage;
- html += ' ';
- html += ' ';
- html += '
';
- html += ' ';
+ html += ''
+ html += ' ';
+ html += '
';
return html;
}
@@ -142,11 +142,11 @@
*/
Drupal.theme.prototype.CToolsModalThrobber = function () {
var html = '';
- html += ' ';
- html += '
';
+
+ return theme('form_element', $variables);
+}
+
+/**
+ * Returns HTML for remaining message.
+ */
+function theme_date_display_remaining($variables) {
+ $remaining_days = $variables['remaining_days'];
+ $output = '';
+ $show_remaining_text = t('The upcoming date less then 1 day.');
+ if ($remaining_days) {
+ $show_remaining_text = format_plural($remaining_days, 'To event remaining 1 day', 'To event remaining @count days');
+ }
+
+ return '';
- html += Drupal.CTools.Modal.currentSettings.throbber;
- html += '
';
+ html += '';
+ html += '
';
return html;
};
@@ -265,7 +265,10 @@
}
// An empty event means we were triggered via .click() and
// in jquery 1.4 this won't trigger a submit.
- if (event.bubbles == undefined) {
+ // We also have to check jQuery version to prevent
+ // IE8 + jQuery 1.4.4 to break on other events
+ // bound to the submit button.
+ if (jQuery.fn.jquery.substr(0, 3) === '1.4' && typeof event.bubbles === "undefined") {
$(this.form).trigger('submit');
return false;
}
@@ -299,7 +302,7 @@
// Attach behaviors within a modal dialog.
var settings = response.settings || ajax.settings || Drupal.settings;
- Drupal.attachBehaviors('#modalContent', settings);
+ Drupal.attachBehaviors($('#modalContent'), settings);
if ($('#modal-content').hasClass('ctools-modal-loading')) {
$('#modal-content').removeClass('ctools-modal-loading');
@@ -551,6 +554,7 @@
// Create our content div, get the dimensions, and hide it
var modalContent = $('#modalContent').css('top','-1000px');
+ var $modalHeader = modalContent.find('.modal-header');
var mdcTop = wt + ( winHeight / 2 ) - ( modalContent.outerHeight() / 2);
var mdcLeft = ( winWidth / 2 ) - ( modalContent.outerWidth() / 2);
$('#modalBackdrop').css(css).css('top', 0).css('height', docHeight + 'px').css('width', docWidth + 'px').show();
@@ -558,7 +562,7 @@
// Bind a click for closing the modalContent
modalContentClose = function(){close(); return false;};
- $('.close').bind('click', modalContentClose);
+ $('.close', $modalHeader).bind('click', modalContentClose);
// Bind a keypress on escape for closing the modalContent
modalEventEscapeCloseHandler = function(event) {
@@ -574,7 +578,7 @@
// close button, but we should save the original focus to restore it after
// the dialog is closed.
var oldFocus = document.activeElement;
- $('.close').focus();
+ $('.close', $modalHeader).focus();
// Close the open modal content and backdrop
function close() {
@@ -583,7 +587,7 @@
$('body').unbind( 'focus', modalEventHandler);
$('body').unbind( 'keypress', modalEventHandler );
$('body').unbind( 'keydown', modalTabTrapHandler );
- $('.close').unbind('click', modalContentClose);
+ $('.close', $modalHeader).unbind('click', modalContentClose);
$('body').unbind('keypress', modalEventEscapeCloseHandler);
$(document).trigger('CToolsDetachBehaviors', $('#modalContent'));
@@ -659,9 +663,11 @@
$('body').unbind('focus', modalEventHandler);
$('body').unbind('keypress', modalEventHandler);
$('body').unbind( 'keydown', modalTabTrapHandler );
- $('.close').unbind('click', modalContentClose);
+ var $modalContent = $('#modalContent');
+ var $modalHeader = $modalContent.find('.modal-header');
+ $('.close', $modalHeader).unbind('click', modalContentClose);
$('body').unbind('keypress', modalEventEscapeCloseHandler);
- $(document).trigger('CToolsDetachBehaviors', $('#modalContent'));
+ $(document).trigger('CToolsDetachBehaviors', $modalContent);
// jQuery magic loop through the instances and run the animations or removal.
content.each(function(){
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/js/stylizer.js b/profiles/commerce_kickstart/modules/contrib/ctools/js/stylizer.js
index 16d6c49d..12ab7204 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/js/stylizer.js
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/js/stylizer.js
@@ -5,7 +5,7 @@
Drupal.CTools.Stylizer.addFarbtastic = function(context) {
// This behavior attaches by ID, so is only valid once on a page.
- if ($('ctools_stylizer_color_scheme_form .color-form.Stylizer-processed').size()) {
+ if ($('#ctools_stylizer_color_scheme_form .color-form.Stylizer-processed').size()) {
return;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/help/getting-started.html b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/help/getting-started.html
index 4e4f24ae..6a75a370 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/help/getting-started.html
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/help/getting-started.html
@@ -4,7 +4,7 @@
This is a quick summary:
';
+ html += Drupal.CTools.Modal.currentSettings.throbber;
html += '
';
+ html += '-
-
- Visit administer >> site building >> pages to get to the primary page manager interface. +
- Visit administer >> structure >> pages to get to the primary page manager interface.
- You can add custom pages for your basic landing pages, front pages, whatever you like for normal content display.
- You can use the system pages to create finer control of how taxonomy vocabularies, nodes and user profiles are displayed.
- When you add your first custom page, do not bother with the optional features. You will not need these until you get to more advanced tasks. diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.admin.inc b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.admin.inc index 0f164fe5..95d12255 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.admin.inc +++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.admin.inc @@ -1542,25 +1542,42 @@ function page_manager_handler_import_submit(&$form, &$form_state) { * Rearrange the order of variants. */ function page_manager_handler_rearrange($form, &$form_state) { + ctools_include('context-task-handler'); $page = $form_state['page']; $form['handlers'] = array('#tree' => TRUE); + // Get the number of variants to be displayed in order to set the delta + // to the proper value. This fixes problems in previous versions with sorting + // large numbers of variants. + $delta = count($page->handler_info)/2 + 1; + foreach ($page->handler_info as $id => $info) { if ($info['changed'] & PAGE_MANAGER_CHANGED_DELETED) { continue; } $handler = $page->handlers[$id]; $plugin = page_manager_get_task_handler($handler->handler); - + $object = ctools_context_handler_get_task_object($page->task, $page->subtask, $handler); + $display = new stdClass(); + $display->context = ctools_context_load_contexts($object, TRUE); + $content = page_manager_get_handler_title($plugin, $handler, $page->task, $page->subtask_id); + $access = ctools_access_group_summary(!empty($handler->conf['access']) ? $handler->conf['access'] : array(), $display->context); + if ($access) { + $access = t('This panel will be selected if @conditions.', array('@conditions' => $access)); + } + else { + $access = t('This panel will always be selected.'); + } + $content .= '
' . $access . '
';
$form['handlers'][$id]['title'] = array(
- '#markup' => page_manager_get_handler_title($plugin, $handler, $page->task, $page->subtask_id),
+ '#markup' => $content,
);
$form['handlers'][$id]['weight'] = array(
'#type' => 'weight',
'#default_value' => $info['weight'],
- '#delta' => 30,
+ '#delta' => $delta,
);
}
@@ -1671,6 +1688,12 @@ function page_manager_handler_clone_submit(&$form, &$form_state) {
page_manager_handler_add_to_page($form_state['page'], $handler, $form_state['values']['title']);
+ // Variant is cloned and added to the Page. Ensure the uuids are re-generated.
+ panels_panel_context_get_display($handler);
+ if (isset($handler->conf['display']) && method_exists($handler->conf['display'], 'clone_display')) {
+ $handler->conf['display'] = $handler->conf['display']->clone_display();
+ }
+
$plugin = page_manager_get_task_handler($handler->handler);
// It has no forms at all. Add the variant and go to its first operation.
$keys = array_keys($plugin['operations']);
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.info b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.info
index c7f4df3a..f86687f8 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.info
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.info
@@ -5,9 +5,11 @@ dependencies[] = ctools
package = Chaos tool suite
version = CTOOLS_MODULE_VERSION
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.x-1.9"
+files[] = tests/head_links.test
+
+; Information added by Drupal.org packaging script on 2018-02-04
+version = "7.x-1.13"
core = "7.x"
project = "ctools"
-datestamp = "1440020680"
+datestamp = "1517704095"
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.module b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.module
index f3cb743e..a498f7fb 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.module
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/page_manager.module
@@ -1202,7 +1202,7 @@ function page_manager_page_manager_pages_to_hook_code($names = array(), $name =
foreach ($objects as $object) {
// Have to implement our own because this export func sig requires it
$code .= $export['export callback']($object, TRUE, ' ');
- $code .= " \${$export['identifier']}s['" . check_plain($object->$export['key']) . "'] = \${$export['identifier']};\n\n";
+ $code .= " \${$export['identifier']}s['" . check_plain($object->{$export['key']}) . "'] = \${$export['identifier']};\n\n";
}
$code .= " return \${$export['identifier']}s;\n";
$code .= "}\n";
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/task_handlers/http_response.inc b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/task_handlers/http_response.inc
index c4eba8e2..8fc0f256 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/task_handlers/http_response.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/task_handlers/http_response.inc
@@ -3,7 +3,8 @@
/**
* @file
*
- * This is the task handler plugin to handle generating 403, 404 and 301 response codes.
+ * This is the task handler plugin to handle generating 403, 404, 301 and 302
+ * response codes.
*/
// Plugin definition
@@ -108,7 +109,8 @@ function page_manager_http_response_codes() {
403 => t('403 Access denied'),
404 => t('404 Page not found'),
410 => t('410 Gone'),
- 301 => t('301 Redirect'),
+ 301 => t('301 Permanent redirect'),
+ 302 => t('302 Temporary redirect'),
);
}
@@ -256,7 +258,7 @@ function page_manager_http_response_edit_settings($form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Redirect destination'),
'#default_value' => $conf['destination'],
- '#dependency' => array('edit-code' => array(301)),
+ '#dependency' => array('edit-code' => array(301, 302)),
'#description' => t('Enter the path to redirect to. You may use keyword substitutions from contexts. You can use external urls (http://www.example.com/foo) or internal urls (node/1).'),
);
@@ -313,7 +315,7 @@ function page_manager_http_response_render($handler, $base_contexts, $args, $tes
}
$info['response code'] = $handler->conf['code'];
- if ($info['response code'] == 301) {
+ if ($info['response code'] == 301 || $info['response code'] == 302) {
$path = ctools_context_keyword_substitute($handler->conf['destination'], array(), $contexts);
$url = parse_url($path);
if (isset($url['query'])) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/node_view.inc b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/node_view.inc
index 89a29128..fb2f2a41 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/node_view.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/node_view.inc
@@ -85,6 +85,23 @@ function page_manager_node_view_page($node) {
ctools_include('context');
ctools_include('context-task-handler');
+ $uri = entity_uri('node', $node);
+ if (isset($uri['path'])) {
+ // Set the node path as the canonical URL to prevent duplicate content.
+ $meta_canon = array(
+ 'rel' => 'canonical',
+ 'href' => url($uri['path'], $uri['options']),
+ );
+ drupal_add_html_head_link($meta_canon, TRUE);
+
+ // Set the non-aliased path as a default shortlink.
+ $meta_short = array(
+ 'rel' => 'shortlink',
+ 'href' => url($uri['path'], array_merge($uri['options'], array('alias' => TRUE)))
+ );
+ drupal_add_html_head_link($meta_short, TRUE);
+ }
+
// Load all contexts.
$contexts = ctools_context_handler_get_task_contexts($task, '', array($node));
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc
index 97bd37bc..b2ae8cbe 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/plugins/tasks/page.admin.inc
@@ -698,7 +698,7 @@ function page_manager_page_form_menu($form, &$form_state) {
'#title' => t('Title'),
'#type' => 'textfield',
'#default_value' => $menu['title'],
- '#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
+ '#description' => t('If set to normal or tab, enter the text to use for the menu item. Renaming the menu item using the Drupal menu system (admin/structure/menu) will override this, even if it is renamed again here.'),
'#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab', 'action')),
);
@@ -1462,6 +1462,15 @@ function page_manager_page_form_clone_submit(&$form, &$form_state) {
$original->path = $form_state['values']['path'];
$handlers = !empty($form_state['values']['handlers']) ? $form_state['page']->handlers : FALSE;
+ // Ensure the handler uuids are re-generated.
+ if ($handlers) {
+ foreach ($handlers as &$handler) {
+ if (isset($handler->conf['display']) && method_exists($handler->conf['display'], 'clone_display')) {
+ $handler->conf['display'] = $handler->conf['display']->clone_display();
+ }
+ }
+ }
+
// Export the handler, which is a fantastic way to clean database IDs out of it.
$export = page_manager_page_export($original, $handlers);
ob_start();
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/tests/head_links.test b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/tests/head_links.test
new file mode 100644
index 00000000..f3bc5a44
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/page_manager/tests/head_links.test
@@ -0,0 +1,74 @@
+ 'Head links test',
+ 'description' => 'Checks that the shortlink and canonical links are present on a node page overriden by Page manager',
+ 'group' => 'ctools',
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp() {
+ parent::setUp('page_manager');
+
+ // First add an override for "node/%node".
+ variable_set('page_manager_node_view_disabled', FALSE);
+
+ $record = (object) array(
+ 'name' => 'node_view__http_response_707659df-062d-4252-8c2a-22a8e0289cd4',
+ 'task' => 'node_view',
+ 'subtask' => '',
+ 'handler' => 'http_response',
+ 'weight' => '1',
+ 'conf' => array(
+ 'title' => 'Test',
+ 'contexts' => array(
+ 0 => array(
+ 'identifier' => 'String',
+ 'keyword' => 'string',
+ 'name' => 'string',
+ 'string' => 'Test',
+ 'id' => 1,
+ ),
+ ),
+ 'relationships' => array(),
+ 'code' => '404',
+ 'destination' => '',
+ 'name' => '',
+ ),
+ );
+
+ page_manager_save_task_handler($record);
+
+ menu_rebuild();
+ }
+
+ /**
+ * Test the presence of the head links.
+ */
+ public function testHeadLinks() {
+ $node = $this->drupalCreateNode();
+ $url = 'node/' . $node->nid;
+ $this->drupalGet($url);
+
+ $shortlink = $this->xpath('//head//link[@rel="shortlink"]');
+ $this->assertEqual(url($url), (string) $shortlink[0]['href'], 'shortlink url found');
+
+ $canonical = $this->xpath('//head//link[@rel="canonical"]');
+ $this->assertEqual(url($url), (string) $canonical[0]['href'], 'canonical url found');
+ }
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/compare_users.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/compare_users.inc
index c271ff4e..a8c44f4d 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/compare_users.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/compare_users.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Ctools access plugin to provide access/visiblity if two user contexts are equal.
+ * CTools access plugin to provide access/visiblity if two user contexts are equal.
*/
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/query_string_exists.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/query_string_exists.inc
new file mode 100644
index 00000000..abec5f7a
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/access/query_string_exists.inc
@@ -0,0 +1,44 @@
+ t('Query string exists'),
+ 'description' => t('Control access by whether or not a query string exists.'),
+ 'callback' => 'ctools_query_string_exists_ctools_access_check',
+ 'settings form' => 'ctools_query_string_exists_ctools_access_settings',
+ 'summary' => 'ctools_query_string_exists_ctools_access_summary',
+ 'defaults' => array('key' => ''),
+);
+
+/**
+ * Settings form.
+ */
+function ctools_query_string_exists_ctools_access_settings($form, &$form_state, $config) {
+ $form['settings']['key'] = array(
+ '#title' => t('Query string key'),
+ '#description' => t('Enter the key of the query string.'),
+ '#type' => 'textfield',
+ '#required' => TRUE,
+ '#default_value' => $config['key']
+ );
+
+ return $form;
+}
+
+/**
+ * Check for access.
+ */
+function ctools_query_string_exists_ctools_access_check($config, $context) {
+ return isset($_GET[$config['key']]);
+}
+
+/**
+ * Provide a summary description.
+ */
+function ctools_query_string_exists_ctools_access_summary($config, $context) {
+ return t('@identifier exists', array('@identifier' => $config['key']));
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/term.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/term.inc
index 868c8aa5..65c87ac7 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/term.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/term.inc
@@ -18,6 +18,7 @@ $plugin = array(
'context' => 'ctools_term_context',
'default' => array('input_form' => 'tid', 'breadcrumb' => TRUE, 'transform' => FALSE),
'settings form' => 'ctools_term_settings_form',
+ 'settings form validate' => 'ctools_term_settings_form_validate',
'placeholder form' => 'ctools_term_ctools_argument_placeholder',
'breadcrumb' => 'ctools_term_breadcrumb',
);
@@ -31,6 +32,16 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
return ctools_context_create_empty('entity:taxonomy_term');
}
+ if (isset($conf['vocabularies'])) {
+ $vocabularies = $conf['vocabularies'];
+ }
+ else {
+ $vids = isset($conf['vids']) ? $conf['vids'] : array();
+
+ // Convert legacy use of vids to machine names.
+ $vocabularies = _ctools_term_vocabulary_machine_name_convert($vids);
+ }
+
if (is_object($arg)) {
$term = $arg;
}
@@ -50,12 +61,11 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
$terms = taxonomy_get_term_by_name($arg);
-
- $conf['vids'] = is_array($conf['vids']) ? array_filter($conf['vids']) : NULL;
- if ((count($terms) > 1) && isset($conf['vids'])) {
+ // If only one term is found, fall through to vocabulary check below.
+ if ((count($terms) > 1) && $vocabularies) {
foreach ($terms as $potential) {
- foreach ($conf['vids'] as $vid => $active) {
- if ($active && $potential->vid == $vid) {
+ foreach ($vocabularies as $machine_name) {
+ if ($potential->vocabulary_machine_name == $machine_name) {
$term = $potential;
// break out of the foreaches AND the case
break 3;
@@ -72,7 +82,7 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
}
- if (!empty($conf['vids']) && array_filter($conf['vids']) && empty($conf['vids'][$term->vid])) {
+ if ($vocabularies && !isset($vocabularies[$term->vocabulary_machine_name])) {
return NULL;
}
@@ -98,13 +108,20 @@ function ctools_term_settings_form(&$form, &$form_state, $conf) {
$vocabularies = taxonomy_get_vocabularies();
$options = array();
foreach ($vocabularies as $vid => $vocab) {
- $options[$vid] = $vocab->name;
+ $options[$vocab->machine_name] = $vocab->name;
+ }
+
+ // Fallback on legacy 'vids', when no vocabularies are available.
+ if (empty($conf['vocabularies']) && !empty($conf['vids'])) {
+ $conf['vocabularies'] = _ctools_term_vocabulary_machine_name_convert(array_filter($conf['vids']));
+ unset($conf['vids']);
}
- $form['settings']['vids'] = array(
+
+ $form['settings']['vocabularies'] = array(
'#title' => t('Limit to these vocabularies'),
'#type' => 'checkboxes',
'#options' => $options,
- '#default_value' => !empty($conf['vids']) ? $conf['vids'] : array(),
+ '#default_value' => !empty($conf['vocabularies']) ? $conf['vocabularies'] : array(),
'#description' => t('If no vocabularies are checked, terms from all vocabularies will be accepted.'),
);
@@ -123,6 +140,12 @@ function ctools_term_settings_form(&$form, &$form_state, $conf) {
// return $form;
}
+function ctools_term_settings_form_validate (&$form, &$form_state) {
+ // Filter the selected vocabularies to avoid storing redundant data.
+ $vocabularies = array_filter($form_state['values']['settings']['vocabularies']);
+ form_set_value($form['settings']['vocabularies'], $vocabularies, $form_state);
+}
+
/**
* Form fragment to get an argument to convert a placeholder for preview.
*/
@@ -161,3 +184,20 @@ function ctools_term_breadcrumb($conf, $context) {
$breadcrumb = array_merge(drupal_get_breadcrumb(), array_reverse($breadcrumb));
drupal_set_breadcrumb($breadcrumb);
}
+
+/**
+ * Helper function to convert convert legacy vocabulary ids into machine names.
+ *
+ * @param array $vids
+ * Array of either vids.
+ * @return array
+ * A keyed array of machine names.
+ */
+function _ctools_term_vocabulary_machine_name_convert($vids) {
+ $vocabularies = taxonomy_vocabulary_load_multiple($vids);
+ $return = array();
+ foreach($vocabularies as $vocabulary) {
+ $return[$vocabulary->machine_name] = $vocabulary->machine_name;
+ }
+ return $return;
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/terms.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/terms.inc
index 4298ea91..d31f28de 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/terms.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/arguments/terms.inc
@@ -65,6 +65,7 @@ function ctools_terms_breadcrumb($conf, $context) {
return;
}
+ $current = new stdClass();
$current->tid = $context->tids[0];
$breadcrumb = array();
while ($parents = taxonomy_get_parents($current->tid)) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/cache/export_ui.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/cache/export_ui.inc
index 53483a53..469edac8 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/cache/export_ui.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/cache/export_ui.inc
@@ -14,6 +14,10 @@ $plugin = array(
// Some operations use a 'finalize' but that really just means set
// for us, since we're not using temporary storage for subsystems.
'cache finalize' => 'ctools_cache_export_ui_cache_set',
+ // @todo The API specifications say that a 'cache clear' callback is required,
+ // but there is none provided?
+ // @see cache.inc
+ // 'cache clear' => ???
);
function ctools_cache_export_ui_cache_get($plugin_name, $key) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/block/block.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/block/block.inc
index 4d4c31c3..46b02e9e 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/block/block.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/block/block.inc
@@ -372,9 +372,9 @@ function profile_ctools_block_info($module, $delta, &$info) {
}
function book_ctools_block_info($module, $delta, &$info) {
- // Hide the book navigation block which isn't as rich as what we can
- // do with context.
- $info = NULL;
+ $info['title'] = t('Book navigation menu');
+ $info['icon'] = 'icon_core_block_menu.png';
+ $info['category'] = t('Node');
}
function blog_ctools_block_info($module, $delta, &$info) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_links.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_links.inc
index c8fefcca..fcca9703 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_links.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_links.inc
@@ -26,7 +26,7 @@ function ctools_comment_links_content_type_render($subtype, $conf, $panel_args,
return;
}
- $comment = isset($context->data) ? clone($context->data) : NULL;
+ $comment = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'comment';
$block->delta = $comment->cid;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_reply_form.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_reply_form.inc
index c05effb6..11e48b2a 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_reply_form.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/comment/comment_reply_form.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Ctools content-type plugin to provide a comment-reply form (replying either
+ * CTools content-type plugin to provide a comment-reply form (replying either
* to a node or to another comment).
*/
@@ -25,7 +25,7 @@ if (module_exists('comment')) {
function ctools_comment_reply_form_content_type_render($subtype, $conf, $panel_args, $context) {
- $comment = ($context[1]->identifier == t('No context')) ? NULL : clone($context[1]->data);
+ $comment = ($context[1]->identifier == t('No context')) ? NULL : clone $context[1]->data;
$block = new stdClass();
$block->module = 'comments';
if ($comment) $block->delta = $comment->cid;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/custom/custom.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/custom/custom.inc
index ac2f2a3f..d9ac79f5 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/custom/custom.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/custom/custom.inc
@@ -16,7 +16,7 @@
$plugin = array(
'title' => t('Custom content'),
'no title override' => TRUE,
- 'defaults' => array('admin_title' => '', 'title' => '', 'body' => '', 'format' => filter_default_format(), 'substitute' => TRUE),
+ 'defaults' => array('admin_title' => '', 'title' => '', 'title_heading' => 'h2', 'body' => '', 'format' => filter_default_format(), 'substitute' => TRUE),
'js' => array('misc/autocomplete.js', 'misc/textarea.js', 'misc/collapse.js'),
// Make sure the edit form is only used for some subtypes.
'edit form' => '',
@@ -135,6 +135,7 @@ function ctools_custom_content_type_get_conf($subtype, $conf) {
$settings = array(
'admin_title' => t('Missing/deleted content'),
'title' => '',
+ 'title_heading' => '',
'body' => '',
'format' => filter_default_format(),
'substitute' => TRUE,
@@ -180,6 +181,8 @@ function ctools_custom_content_type_render($subtype, $conf, $args, $contexts) {
$block = new stdClass();
$block->subtype = ++$delta;
$block->title = filter_xss_admin($settings['title']);
+ $block->title_heading = isset($settings['title_heading']) ? $settings['title_heading'] : 'h2';
+
// Add keyword substitutions if we were configured to do so.
$content = $settings['body'];
@@ -277,10 +280,36 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
'#description' => t('This title will be used administratively to identify this pane. If blank, the regular title will be used.'),
);
+ // Copy over the title override settings for a title heading.
+ $form['aligner_start'] = array(
+ '#markup' => '',
+ );
+
$form['title'] = array(
'#type' => 'textfield',
'#default_value' => $settings['title'],
'#title' => t('Title'),
+ '#id' => 'override-title-textfield',
+ );
+
+ $form['title_heading'] = array(
+ '#type' => 'select',
+ '#default_value' => isset($settings['title_heading']) ? $settings['title_heading'] : 'h2',
+ '#options' => array(
+ 'h1' => t('h1'),
+ 'h2' => t('h2'),
+ 'h3' => t('h3'),
+ 'h4' => t('h4'),
+ 'h5' => t('h5'),
+ 'h6' => t('h6'),
+ 'div' => t('div'),
+ 'span' => t('span'),
+ ),
+ '#id' => 'override-title-heading',
+ );
+
+ $form['aligner_stop'] = array(
+ '#markup' => '
',
);
$form['body'] = array(
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/entity_context/entity_field.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/entity_context/entity_field.inc
index 65367a02..9a02d2e9 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/entity_context/entity_field.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/entity_context/entity_field.inc
@@ -137,29 +137,32 @@ function ctools_entity_field_content_type_render($subtype, $conf, $panel_args, $
$field_settings['settings'] = $conf['formatter_settings'];
}
+ $clone = clone $entity;
$all_values = field_get_items($entity_type, $entity, $field_name, $language);
- if (!is_array($all_values)) {
- // Do not render if the field is empty.
- return;
- }
- // Reverse values.
- if (isset($conf['delta_reversed']) && $conf['delta_reversed']) {
- $all_values = array_reverse($all_values, TRUE);
- }
+ if (is_array($all_values)) {
+ // Reverse values.
+ if (isset($conf['delta_reversed']) && $conf['delta_reversed']) {
+ $all_values = array_reverse($all_values, TRUE);
+ }
+
+ if (isset($conf['delta_limit'])) {
+ $offset = intval($conf['delta_offset']);
+ $limit = !empty($conf['delta_limit']) ? $conf['delta_limit'] : NULL;
+ $all_values = array_slice($all_values, $offset, $limit, TRUE);
+ }
- if (isset($conf['delta_limit'])) {
- $offset = intval($conf['delta_offset']);
- $limit = !empty($conf['delta_limit']) ? $conf['delta_limit'] : NULL;
- $all_values = array_slice($all_values, $offset, $limit, TRUE);
+ $clone->{$field_name}[$language] = $all_values;
}
- $clone = clone $entity;
- $clone->{$field_name}[$language] = $all_values;
$field_output = field_view_field($entity_type, $clone, $field_name, $field_settings, $language);
- if (!empty($field_output) && !empty($conf['override_title'])) {
- $field_output['#title'] = filter_xss_admin($conf['override_title_text']);
+ if (!empty($field_output)) {
+ if (!empty($conf['override_title'])) {
+ $field_output['#title'] = filter_xss_admin($conf['override_title_text']);
+ }
+ $field_output['#ctools_context'] = $context;
+ $field_output['#post_render'][] = 'ctools_entity_field_content_type_substitute_keywords';
}
// Build the content type block.
@@ -175,6 +178,13 @@ function ctools_entity_field_content_type_render($subtype, $conf, $panel_args, $
return $block;
}
+/**
+ * Replace context keywords.
+ */
+function ctools_entity_field_content_type_substitute_keywords($markup, array $element) {
+ return ctools_context_keyword_substitute($markup, array(), array($element['#ctools_context']));
+}
+
/**
* Returns an edit form for custom type settings.
*/
@@ -231,6 +241,11 @@ function ctools_entity_field_content_type_formatter_styles($form, &$form_state)
ctools_form_include($form_state, 'field_ui.admin', 'field_ui', '');
ctools_form_include($form_state, 'fields');
+ $form['ctools_keywords'] = array(
+ '#type' => 'item',
+ '#description' => t('You may use keywords for substitutions.'),
+ );
+
$form['ctools_field_list'] = array(
'#type' => 'value',
'#value' => array(),
@@ -270,10 +285,7 @@ function ctools_entity_field_content_type_admin_title($subtype, $conf, $context)
$identifier = $context->identifier;
}
else {
- $type = 'ctools_entity_field_content_type_admin_title';
- $message = t('Context is missing for field: @name', array('@name' => $subtype));
- $variables = array($subtype, $conf, $context);
- watchdog($type, $message, $variables, $severity = WATCHDOG_NOTICE);
+ watchdog('ctools_entity_field_content_type_admin_title', 'Context is missing for field: @name', array('@name' => $subtype), WATCHDOG_NOTICE);
$identifier = t('Unknown');
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/form/entity_form_field.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/form/entity_form_field.inc
index 582bd785..62170ab0 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/form/entity_form_field.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/form/entity_form_field.inc
@@ -38,10 +38,13 @@ function ctools_entity_form_field_content_type_content_types() {
$types = array();
$content_types = array();
$entities = entity_get_info();
-
+ $field_instances = field_info_instances();
foreach ($entities as $entity_type => $entity) {
foreach ($entity['bundles'] as $type => $bundle) {
- foreach (field_info_instances($entity_type, $type) as $field_name => $field) {
+ if (!isset($field_instances[$entity_type][$type])) {
+ continue;
+ }
+ foreach ($field_instances[$entity_type][$type] as $field_name => $field) {
if (!isset($types[$entity_type . ':' . $field_name])) {
$types[$entity_type . ':' . $field_name] = array(
'category' => t('Form'),
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node/node.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node/node.inc
index 7e77194c..c49a71a6 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node/node.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node/node.inc
@@ -66,7 +66,7 @@ function ctools_node_content_type_render($subtype, $conf, $panel_args) {
// Don't store viewed node data on the node, this can mess up other
// views of the node.
- $node = clone($node);
+ $node = clone $node;
$block->module = 'node';
$block->delta = $node->nid;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_attachments.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_attachments.inc
index 380e2604..7142584a 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_attachments.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_attachments.inc
@@ -14,7 +14,7 @@ $plugin = array(
);
function ctools_node_attachments_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'attachments';
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_children.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_children.inc
index 5d017c5c..a44ae2ba 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_children.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_children.inc
@@ -16,7 +16,7 @@ if (module_exists('book')) {
}
function ctools_node_book_children_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'book_children';
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_menu.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_menu.inc
new file mode 100644
index 00000000..0b4dc48a
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_menu.inc
@@ -0,0 +1,101 @@
+ TRUE,
+ 'title' => t('Book navigation menu'),
+ 'icon' => drupal_get_path('module', 'ctools') . '/plugins/content_types/block/icon_core_block_menu.png',
+ 'description' => t('The book menu belonging to the current book node.'),
+ 'required context' => new ctools_context_required(t('Node'), 'node'),
+ 'category' => t('Node'),
+ );
+}
+
+function ctools_node_book_menu_content_type_render($subtype, $conf, $panel_args, $context) {
+ $node = isset($context->data) ? clone $context->data : NULL;
+ $block = new stdClass();
+ $block->module = 'book_menu';
+
+ if ($conf['override_title']) {
+ $block->title = t($conf['override_title_text']);
+ }
+ else {
+ $block->title = t('Book navigation menu');
+ }
+ if ($node) {
+ $block->delta = $node->nid;
+ // TODO: the value is not available somehow?!?
+ $book_block_mode = isset($conf['book_block_mode']) ? $conf['book_block_mode'] : 'book pages';
+
+ // Code below is taken from function book_block_view().
+ $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];
+
+ if ($book_block_mode === 'all pages') {
+ $block->subject = t('Book navigation');
+ $book_menus = array();
+ $pseudo_tree = array(0 => array('below' => FALSE));
+ foreach (book_get_books() as $book_id => $book) {
+ if ($book['bid'] === $current_bid) {
+ // If the current page is a node associated with a book, the menu
+ // needs to be retrieved.
+ $book_menus[$book_id] = menu_tree_output(menu_tree_all_data($node->book['menu_name'], $node->book));
+ }
+ else {
+ // Since we know we will only display a link to the top node, there
+ // is no reason to run an additional menu tree query for each book.
+ $book['in_active_trail'] = FALSE;
+ // Check whether user can access the book link.
+ $book_node = node_load($book['nid']);
+ $book['access'] = node_access('view', $book_node);
+ $pseudo_tree[0]['link'] = $book;
+ $book_menus[$book_id] = menu_tree_output($pseudo_tree);
+ }
+ }
+ $book_menus['#theme'] = 'book_all_books_block';
+ $block->content = $book_menus;
+ }
+ elseif ($current_bid) {
+ // Only display this block when the user is browsing a book.
+ $select = db_select('node', 'n')
+ ->fields('n', array('title'))
+ ->condition('n.nid', $node->book['bid'])
+ ->addTag('node_access');
+ $title = $select->execute()->fetchField();
+ // Only show the block if the user has view access for the top-level node.
+ if ($title) {
+ $tree = menu_tree_all_data($node->book['menu_name'], $node->book);
+ // There should only be one element at the top level.
+ $data = array_shift($tree);
+ // TODO: subject is not rendered
+ $block->subject = theme('book_title_link', array('link' => $data['link']));
+ $block->content = ($data['below']) ? menu_tree_output($data['below']) : '';
+ }
+ }
+ }
+ else {
+ $block->content = t('Book navigation pager goes here.');
+ $block->delta = 'unknown';
+ }
+
+ return $block;
+}
+
+function ctools_node_book_menu_content_type_admin_title($subtype, $conf, $context) {
+ return t('"@s" book navigation pager', array('@s' => $context->identifier));
+}
+
+function ctools_node_book_menu_content_type_edit_form($form, &$form_state) {
+ // Grab block form from the book module.
+ $block_form = book_block_configure($delta = '');
+ // TODO: this does not work yet.
+ // See TODO in: ctools_node_book_menu_content_type_render
+ if (isset($form_state['input']['book_block_mode'])) {
+ $block_form['book_block_mode']['#default_value'] = $form_state['input']['book_block_mode'];
+ }
+ $form += $block_form;
+ return $form;
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_nav.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_nav.inc
index 6c0d50df..ca108d81 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_nav.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_book_nav.inc
@@ -7,26 +7,26 @@ if (module_exists('book')) {
*/
$plugin = array(
'single' => TRUE,
- 'title' => t('Book navigation'),
- 'icon' => 'icon_node.png',
- 'description' => t('The navigation menu the book the node belongs to.'),
+ 'title' => t('Book navigation pager'),
+ 'icon' => drupal_get_path('module', 'ctools') . '/plugins/content_types/block/icon_core_booknavigation.png',
+ 'description' => t('The navigational pager and sub pages of the current book node.'),
'required context' => new ctools_context_required(t('Node'), 'node'),
'category' => t('Node'),
);
}
function ctools_node_book_nav_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'book_nav';
- $block->title = t('Book navigation');
+ $block->title = t('Book navigation pager');
if ($node) {
$block->content = isset($node->book) ? theme('book_navigation', array('book_link' => $node->book)) : '';
$block->delta = $node->nid;
}
else {
- $block->content = t('Book navigation goes here.');
+ $block->content = t('Book navigation pager goes here.');
$block->delta = 'unknown';
}
@@ -34,7 +34,7 @@ function ctools_node_book_nav_content_type_render($subtype, $conf, $panel_args,
}
function ctools_node_book_nav_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" book navigation', array('@s' => $context->identifier));
+ return t('"@s" book navigation pager', array('@s' => $context->identifier));
}
function ctools_node_book_nav_content_type_edit_form($form, &$form_state) {
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_form.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_form.inc
index c21e7bc7..e492de41 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_form.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_form.inc
@@ -17,17 +17,16 @@ if (module_exists('comment')) {
}
function ctools_node_comment_form_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ if (empty($context->data->nid)) {
+ return;
+ }
+ $node = clone $context->data;
$block = new stdClass();
$block->module = 'comments';
$block->delta = $node->nid;
-
$block->title = t('Add comment');
- if (empty($node)) {
- $block->content = t('Comment form here.');
- }
- else if ($node->comment == COMMENT_NODE_OPEN) {
+ if ($node->comment == COMMENT_NODE_OPEN) {
if (user_access('post comments')) {
$comment = new stdClass();
$comment->nid = $node->nid;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_wrapper.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
index 8e25429f..657a9e75 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comment_wrapper.inc
@@ -23,7 +23,7 @@ if (module_exists('comment')) {
* Render the node comments.
*/
function ctools_node_comment_wrapper_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'comments';
$block->delta = $node->nid;
@@ -77,7 +77,7 @@ function ctools_node_comment_wrapper_content_type_render($subtype, $conf, $panel
/**
* Returns an edit form for the comment wrapper.
- */
+ */
function ctools_node_comment_wrapper_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
$form['mode'] = array(
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comments.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comments.inc
index 0f0033d2..90006604 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comments.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_comments.inc
@@ -20,19 +20,17 @@ if (module_exists('comment')) {
}
function ctools_node_comments_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ if (empty($context->data->nid)) {
+ return;
+ }
+ $node = clone $context->data;
$block = new stdClass();
$block->module = 'comments';
$block->delta = $node->nid;
-
$block->title = t('Comments');
- if (empty($node)) {
- $block->content = t('Node comments go here.');
- }
- else if ($node->comment) {
+
+ if ($node->comment) {
$block->content = ctools_comment_render($node, $conf);
- // Update the history table, stating that this user viewed this node.
- node_tag_new($node);
}
return $block;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_content.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_content.inc
index 38c5b574..45deeafe 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_content.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_content.inc
@@ -27,11 +27,11 @@ $plugin = array(
* Render the node content.
*/
function ctools_node_content_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
+ if (!empty($context) && ( empty($context->data) || empty($context->data->nid)) ){
return;
}
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node';
$block->delta = $node->nid;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_created.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_created.inc
index 06d14427..eff700cd 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_created.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_created.inc
@@ -20,7 +20,7 @@ $plugin = array(
* Render the custom content type.
*/
function ctools_node_created_content_type_render($subtype, $conf, $panel_args, $context) {
- if (empty($context) || empty($context->data)) {
+ if (!empty($context) && ( empty($context->data) || empty($context->data->nid)) ){
return;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_links.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_links.inc
index 6096a44f..96d7a5a9 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_links.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_links.inc
@@ -29,7 +29,7 @@ function ctools_node_links_content_type_render($subtype, $conf, $panel_args, $co
return;
}
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node';
$block->delta = $node->nid;
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_title.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_title.inc
index bec89825..461287bb 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_title.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_title.inc
@@ -23,7 +23,7 @@ $plugin = array(
* Render the custom content type.
*/
function ctools_node_title_content_type_render($subtype, $conf, $panel_args, $context) {
- if (empty($context) || empty($context->data)) {
+ if (!empty($context) && ( empty($context->data) || empty($context->data->nid)) ){
return;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_type_desc.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_type_desc.inc
index f2005d08..b432c55a 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_type_desc.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/node_context/node_type_desc.inc
@@ -18,7 +18,7 @@ $plugin = array(
* based on the module and delta supplied in the configuration.
*/
function ctools_node_type_desc_content_type_render($subtype, $conf, $panel_args, $context) {
- $node = isset($context->data) ? clone($context->data) : NULL;
+ $node = isset($context->data) ? clone $context->data : NULL;
$block = new stdClass();
$block->module = 'node_type';
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/page/page_logo.inc b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/page/page_logo.inc
index c00ca5e8..fa7cdaea 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/page/page_logo.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/plugins/content_types/page/page_logo.inc
@@ -29,7 +29,7 @@ function ctools_page_logo_content_type_render($subtype, $conf, $panel_args) {
$block = new stdClass();
if (!empty($logo)) {
- $image = 'Unfiltered: ' . $filename1 . ' ' . $match . ''; -// $output .= '
' . file_get_contents($filename1) . ''; $this->assertEqual($filename2, ctools_css_retrieve('filtered-css-test'), 'Filtered css file succcesfully fetched'); $file_contents = file_get_contents($filename2); $this->assertEqual($filtered_css, $file_contents, 'Filtered css file contents are correct'); - // $match = $filename2 == ctools_css_retrieve('filtered-css-test') ? 'Match' : 'No match'; -// $output .= '
Filtered: ' . $filename2 . ' ' . $match . ''; -// $output .= '
' . file_get_contents($filename2) . ''; -// -// drupal_add_css($filename2, array('type' => 'file')); -// return array('#markup' => $output); + } + + /** + * @todo Test db-row-exist but file-not-exist case in ctools_css_retrieve(). + */ + /** + * Test that Stored CSS snippets can be correctly overwritten. + */ + public function testCssStoreOverwrite() { + $css1 = "#some-id .some-class {\n color: black;\n illegal-key: foo;\n}"; + + $css2 = "#other-id .other-class {\n color: blue;\n illegal-key: foo;\n}"; + $filtered_css2 = '#other-id .other-class{color:blue;}'; + + ctools_css_store('unfiltered-css-test', $css1, FALSE); + ctools_css_store('filtered-css-test', $css1, TRUE); + + // Now overwrite the first css with the second version. + + $filename3 = ctools_css_store('unfiltered-css-test', $css2, FALSE); + $filename4 = ctools_css_store('filtered-css-test', $css2, TRUE); + + $file_contents3 = file_get_contents($filename3); + $file_contents4 = file_get_contents($filename4); + + $this->assertEqual($css2, $file_contents3, 'Unfiltered CSS has overwritten earlier contents.'); + $this->assertEqual($filtered_css2, $file_contents4, 'Filtered CSS has overwritten earlier contents.'); + } - // Test that in case that url can be used, the value surives when a colon is in it. + /** + * Test that in case that url is used, the colons survives filtering. + */ + public function testCssFilterURLHandling() { $css = "#some-id {\n background-image: url(http://example.com/example.gif);\n}"; $css_data = ctools_css_disassemble($css); $empty_array = array(); $disallowed_values_regex = '/(expression)/'; - $filtered = ctools_css_assemble(ctools_css_filter_css_data($css_data, $empty_array, $empty_array, '', $disallowed_values_regex)); + + $intermediate = ctools_css_filter_css_data($css_data, $empty_array, $empty_array, '', $disallowed_values_regex); + $filtered = ctools_css_assemble($intermediate); + $url = (strpos($filtered, 'http://example.com/example.gif') !== FALSE); $this->assertTrue($url, 'CSS with multiple colons can survive.'); + } - // Test that in case the CSS has two properties defined are merged. + /** + * Test that when the CSS has two properties defined they are merged. + */ + public function testCssFilterMergeProperties() { $css = "#some-id {\n font-size: 12px;\n}\n#some-id {\n color: blue;\n}"; $filtered = ctools_css_filter($css); $font_size = (strpos($filtered, 'font-size:12px;') !== FALSE); @@ -78,4 +116,5 @@ class CtoolsCssTestCase extends DrupalWebTestCase { $color = (strpos($filtered, 'color:red') !== FALSE); $this->assertTrue($font_size && $color, 'Multiple properties are retained.'); } + } diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/css_cache.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/css_cache.test index e289b42c..bcbfd585 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/css_cache.test +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/css_cache.test @@ -1,30 +1,28 @@ 'Ctools CSS cache', + 'name' => 'CSS cache', 'description' => 'Tests the custom CSS cache handler.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } /** - * {@inheritdoc} + * {@inheritDoc} */ - public function setUp() { - parent::setUp('ctools'); + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); } /** diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.plugins.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.plugins.test index fe1829cf..78d0adbf 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.plugins.test +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.plugins.test @@ -1,26 +1,43 @@ 'Get plugin info', 'description' => 'Verify that plugin type definitions can properly set and overide values.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - function setUp() { - // Additionally enable contact module. - parent::setUp('ctools', 'ctools_plugin_test'); + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_plugin_test'; + parent::setUp($modules); } + /** + * Assert helper to check that a specific plugin function exists. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param $function + * The identifier of the function. For example, 'settings form'. + */ protected function assertPluginFunction($module, $type, $id, $function = 'function') { $func = ctools_plugin_load_function($module, $type, $id, $function); $this->assertTrue(function_exists($func), t('Plugin @plugin of plugin type @module:@type successfully retrieved @retrieved for @function.', array( @@ -32,6 +49,18 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { ))); } + /** + * Assert helper to check that a specific plugin function does NOT exist. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param $function + * The identifier of the function. For example, 'settings form'. + */ protected function assertPluginMissingFunction($module, $type, $id, $function = 'function') { $func = ctools_plugin_load_function($module, $type, $id, $function); $this->assertEqual($func, NULL, t('Plugin @plugin of plugin type @module:@type for @function with missing function successfully failed.', array( @@ -42,6 +71,18 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { ))); } + /** + * Assert helper to check that a plugin can be loaded using a named class. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param string $class + * The name of the PHP class to load. + */ protected function assertPluginClass($module, $type, $id, $class = 'handler') { $class_name = ctools_plugin_load_class($module, $type, $id, $class); $this->assertTrue(class_exists($class_name), t('Plugin @plugin of plugin type @module:@type successfully retrieved @retrieved for @class.', array( @@ -53,6 +94,18 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { ))); } + /** + * Assert helper to check that a plugin DOES NOT contain the named class. + * + * @param $module + * The module that owns the plugin. + * @param $type + * The type of plugin. + * @param $id + * The id of the specific plugin to load. + * @param string $class + * The name of the PHP class to load. + */ protected function assertPluginMissingClass($module, $type, $id, $class = 'handler') { $class_name = ctools_plugin_load_class($module, $type, $id, $class); $this->assertEqual($class_name, NULL, t('Plugin @plugin of plugin type @module:@type for @class with missing class successfully failed.', array( @@ -81,7 +134,7 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { $this->assertPluginClass($module, $type, 'plugin_array', 'handler'); $this->assertPluginClass($module, $type, 'plugin_array2', 'handler'); $this->assertPluginMissingClass($module, $type, 'plugin_array_dne', 'handler'); - // TODO Test big hook plugins. + // @todo Test big hook plugins. $type = 'cached'; @@ -95,6 +148,7 @@ class CtoolsPluginsGetInfoTestCase extends DrupalWebTestCase { $this->assertPluginClass($module, $type, 'plugin_array', 'handler'); $this->assertPluginClass($module, $type, 'plugin_array2', 'handler'); $this->assertPluginMissingClass($module, $type, 'plugin_array_dne', 'handler'); - // TODO Test big hook plugins. + // @todo Test big hook plugins. } + } diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.test new file mode 100644 index 00000000..8f738b6d --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools.test @@ -0,0 +1,238 @@ + 'Ctools module functions tests', + 'description' => 'Check functions in the ctools.module not otherwise tested.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + } + + /** + * Test that the break phrase function behaves as expected. + */ + public function testBreakPhrase() { + $tests = [ + NULL => ['value' => []], + '' => ['value' => []], + '1' => ['operator' => 'and', 'value' => [1]], + '99' => ['operator' => 'and', 'value' => [99]], + '+1' => ['invalid_input' => TRUE, 'value' => [-1]], + ' 1' => ['invalid_input' => TRUE, 'value' => [-1]], + '1 ' => ['invalid_input' => TRUE, 'value' => [-1]], + '-1' => ['invalid_input' => TRUE, 'value' => [-1]], + '-99' => ['invalid_input' => TRUE, 'value' => [-1]], + '1,2' => ['operator' => 'and', 'value' => [1, 2]], + '1 2' => ['operator' => 'or', 'value' => [1, 2]], + '1+2' => ['operator' => 'or', 'value' => [1, 2]], + '1,2,3' => ['operator' => 'and', 'value' => [1, 2, 3]], + '1 2 3' => ['operator' => 'or', 'value' => [1, 2, 3]], + '1+2+3' => ['operator' => 'or', 'value' => [1, 2, 3]], + '1 , 2 , 3' => ['invalid_input' => TRUE, 'value' => [-1]], + '1 + 2 + 3' => ['invalid_input' => TRUE, 'value' => [-1]], + '1,2,3,4,5,6,7,8,9' => [ + 'operator' => 'and', + 'value' => [1, 2, 3, 4, 5, 6, 7, 8, 9] + ], + '1 2,3,4 5 6 7 8 9' => ['invalid_input' => TRUE, 'value' => [-1]], + ]; + + foreach ($tests as $string => $expected) { + $result = ctools_break_phrase($string); + $expected = (object) $expected; + $this->assertEqual($result, $expected, 'Break Phrase test patterns: ' . $string); + } + } + + /** + * Test that the (deprecated) getuserroles returns expected array. + */ + public function testGetUserRoles() { + $result = ctools_get_roles(); + $this->assertTrue(is_array($result), 'get_roles returns an array'); + + // A key-value array of integers. + foreach ($result as $k => $v) { + $this->assertTrue(is_numeric($k), 'Role key is numeric; ' . $k); + $this->assertTrue(is_string($v), 'Role id is string; ' . $v); + } + } + + /** + * Test the ctools_attach_js function returns the expected paths. + */ + public function testAttachJs() { + $taxonomy_path = drupal_get_path('module', 'taxonomy'); + $ctools_path = drupal_get_path('module', 'ctools'); + + // Func should probably do a different thing but this is current behaviour. + $path = ctools_attach_js(''); + $this->assertEqual($path, $ctools_path . '/js/.js', 'Attach an empty string'); + + $path = ctools_attach_js('foo'); + $this->assertEqual($path, $ctools_path . '/js/foo.js', 'Attach simple string'); + + $path = ctools_attach_js('foo', 'ctools', ''); + $this->assertEqual($path, $ctools_path . '//foo.js', 'Attach string with empty subdir'); + + $path = ctools_attach_js('foo', 'ctools', 'javascript'); + $this->assertEqual($path, $ctools_path . '/javascript/foo.js', 'Attach string with alternate subdir'); + + $path = ctools_attach_js('foo', 'taxonomy', 'javascript'); + $this->assertEqual($path, $taxonomy_path . '/javascript/foo.js', 'Attach string from different module'); + } + + /** + * Test the ctools_attach_css function returns the expected paths. + */ + public function testAttachCss() { + $taxonomy_path = drupal_get_path('module', 'taxonomy'); + $ctools_path = drupal_get_path('module', 'ctools'); + + // Func should probably do a different thing but this is current behaviour. + $path = ctools_attach_css(''); + $this->assertEqual($path, $ctools_path . '/css/.css', 'Attach empty string'); + + $path = ctools_attach_css('foo'); + $this->assertEqual($path, $ctools_path . '/css/foo.css', 'Attach simple string'); + + $path = ctools_attach_css('foo', 'ctools', ''); + $this->assertEqual($path, $ctools_path . '//foo.css', 'Attach string with empty subdir'); + + $path = ctools_attach_css('foo', 'ctools', 'theme'); + $this->assertEqual($path, $ctools_path . '/theme/foo.css', 'Attach string with alternate subdir'); + + $path = ctools_attach_css('foo', 'taxonomy', 'theme'); + $this->assertEqual($path, $taxonomy_path . '/theme/foo.css', 'Attach string from different module'); + } + + /** + * Test the ctools version compare function. + */ + public function testApiVersionCompare() { + // We're beyond version 1. + $ok = ctools_api_version('1.0'); + $this->assertTrue($ok, 'Check API version 1.0 is ok'); + + // We're beyond version 1.0.1 too. + $ok = ctools_api_version('1.0.1'); + $this->assertTrue($ok, 'Check API version 1.0.1 is ok'); + + // Not (yet) on api version 10. + $ok = ctools_api_version('10.0'); + $this->assertFalse($ok, 'Check API version 10.0 is not ok'); + + // We are (currently) between version 1.1 and version 4.0 + $ok = ctools_api_version('1.1', '4.0'); + $this->assertTrue($ok, 'Check API is between 1 and 4'); + } + + /** + * Test that the ctools_classs_add works + */ + public function testClassesAdd() { + ctools_class_reset(); + + ctools_class_add('testclass'); + + $classes = ctools_get_classes(); + $this->assertEqual(is_array($classes), 1, 'Classes should be an array'); + $this->assertEqual(count($classes), 1, 'Classes array has one element'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + $this->assertTrue(isset($classes['html']['add']), 'Classes array has element: html/add'); + $this->assertEqual($classes['html']['add'], ['testclass'], 'Classes array has expected value'); + + ctools_class_add('class2 class3'); + + $classes = ctools_get_classes(); + $this->assertEqual(is_array($classes), 1, 'Classes should be an array'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + // TODO: An undesirable result: ['testclass', 'class2', 'class3'] is better. + $this->assertEqual($classes['html']['add'], [ + 'testclass', + 'class2 class3' + ], 'Classes array has expected value'); + } + + /** + * Test that the ctools_classs_remove works + */ + public function testClassesRemove() { + ctools_class_reset(); + + ctools_class_remove('testclass'); + + $classes = ctools_get_classes(); + $this->assertEqual(is_array($classes), 1, 'Classes should be an array'); + $this->assertEqual(count($classes), 1, 'Classes array has one element'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + $this->assertTrue(isset($classes['html']['remove']), 'Classes array has element: html/remove'); + $this->assertEqual($classes['html']['remove'], ['testclass'], 'Classes array has expected value'); + + ctools_class_remove('class2 class3'); + + $classes = ctools_get_classes(); + $this->assertEqual(count($classes), 1, 'Classes array has one element'); + $this->assertEqual(count($classes['html']), 1, 'Classes array has element: html'); + // This is an undesirable result, is ['testclass', 'class2', 'class3'] better. + $this->assertEqual($classes['html']['remove'], [ + 'testclass', + 'class2 class3' + ], 'Classes array has expected value'); + } + + /** + * Test that the ctools_classs_add and ctools_classs_remove interact well. + */ + public function testClassesAddRemove() { + ctools_class_reset(); + + ctools_class_add('testclass'); + ctools_class_remove('testclass'); + + $classes = ctools_get_classes(); + $this->assertTrue(isset($classes['html']['add']), 'Classes array has an add set'); + $this->assertEqual($classes['html']['add'], ['testclass'], 'testclass is in the add set'); + $this->assertTrue(isset($classes['html']['remove']), 'Classes array has a remove set'); + // TODO: Is it really good to let this happen? + $this->assertEqual($classes['html']['remove'], ['testclass'], 'testclass is in the remove set'); + } + + /** + * Test that the ctools_classs_add and ctools_classs_remove interact well .. 2. + */ + public function testClassesAddRemove2() { + ctools_class_reset(); + + ctools_class_add('class2 class3'); + ctools_class_remove('class3'); + + $classes = ctools_get_classes(); + $this->assertTrue(isset($classes['html']['add']), 'Classes array has an add set'); + $this->assertEqual($classes['html']['add'], ['class2 class3'], 'Added class2 class3 is in add set'); + $this->assertTrue(isset($classes['html']['remove']), 'Classes array has a remove set'); + // TODO: Is it really good to let this happen? + $this->assertEqual($classes['html']['remove'], ['class3'], 'class3 in remove set'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export.test index 1accfd74..c826d3b6 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export.test +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export.test @@ -1,26 +1,28 @@ 'CTools export CRUD tests', + 'name' => 'Export CRUD', 'description' => 'Test the CRUD functionality for the ctools export system.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', ); } - protected function setUp() { - parent::setUp('ctools_export_test'); - $this->resetAll(); + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_export_test'; + parent::setUp($modules); } /** @@ -135,7 +137,8 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { // Check the exportable is now in_code_only. $this->assertTrue($default_export->in_code_only, 'The loaded exportable is in the database only.'); - // Make sure the default object loaded matches the same overridden one in the database. + // Make sure the default object loaded matches the same overridden one in + // the database. $this->assertEqual($original_export->machine, $default_export->machine, 'The default exportable has been loaded and matches the overridden exportable.'); } @@ -158,6 +161,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase { $machine = $database_export->machine; ctools_export_crud_delete('ctools_export_test', $database_export); + // Clear the exportable caches as it's been loaded above. ctools_export_load_object_reset('ctools_export_test'); $result = ctools_export_crud_load('ctools_export_test', $machine); diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info index e016aeb5..ec69a862 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info @@ -8,9 +8,9 @@ hidden = TRUE files[] = ctools_export.test -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.x-1.9" +; Information added by Drupal.org packaging script on 2018-02-04 +version = "7.x-1.13" core = "7.x" project = "ctools" -datestamp = "1440020680" +datestamp = "1517704095" diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.info b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.info index 15a510b6..03391f6a 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.info +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.info @@ -4,17 +4,11 @@ package = Chaos tool suite version = CTOOLS_MODULE_VERSION core = 7.x dependencies[] = ctools -files[] = ctools.plugins.test -files[] = object_cache.test -files[] = css.test -files[] = context.test -files[] = math_expression.test -files[] = math_expression_stack.test hidden = TRUE -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.x-1.9" +; Information added by Drupal.org packaging script on 2018-02-04 +version = "7.x-1.13" core = "7.x" project = "ctools" -datestamp = "1440020680" +datestamp = "1517704095" diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.module b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.module index 567f6e73..a1c587d9 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.module +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/ctools_plugin_test.module @@ -1,10 +1,12 @@ array( @@ -50,6 +55,11 @@ function ctools_plugin_test_ctools_plugin_type() { ); } +/** + * Plugin callback. + * + * @see ctools_plugin_test_ctools_plugin_type() + */ function ctools_plugin_test_ctools_plugin_test_big_hook_cached() { return array( 'test1' => array( @@ -59,6 +69,11 @@ function ctools_plugin_test_ctools_plugin_test_big_hook_cached() { ); } +/** + * Plugin callback. + * + * @see ctools_plugin_test_ctools_plugin_type() + */ function ctools_plugin_test_ctools_plugin_test_big_hook_not_cached() { return array( 'test1' => array( @@ -68,5 +83,16 @@ function ctools_plugin_test_ctools_plugin_test_big_hook_not_cached() { ); } +/** + * Callback for the big_hook_cached plugin. + * + * @see ctools_plugin_test_ctools_plugin_test_big_hook_cached + */ function ctools_plugin_test_hook_cached_test() {} + +/** + * Callback for the big_hook_not_cached plugin. + * + * @see ctools_plugin_test_ctools_plugin_test_big_hook_not_cached() + */ function ctools_plugin_test_hook_not_cached_test() {} diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression.test index 730e079a..f89d3953 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression.test +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression.test @@ -1,24 +1,29 @@ 'CTools math expression tests', + 'name' => 'Math expressions', 'description' => 'Test the math expression library of ctools.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - public function setUp() { - parent::setUp('ctools', 'ctools_plugin_test'); + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_plugin_test'; + parent::setUp($modules); } /** @@ -35,6 +40,9 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { return $this->assert(abs($first - $second) <= $delta, $message ? $message : t('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group); } + /** + * Test some arithmetic handling. + */ public function testArithmetic() { $math_expression = new ctools_math_expr(); @@ -66,10 +74,13 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { $this->assertEqual(pow($random_number_a, $random_number_b), $math_expression->e("$random_number_a ^ $random_number_b")); } + /** + * Test the basic built-in functions in the math expression library. + */ public function testBuildInFunctions() { $math_expression = new ctools_math_expr(); - // @todo: maybe run this code multiple times to test different values. + // @todo Maybe run this code multiple times to test different values. $random_double = $this->rand01(); $random_int = rand(5, 10); $this->assertFloat(sin($random_double), $math_expression->e("sin($random_double)")); @@ -94,6 +105,9 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { // $this->assertFloat(min($random_double_a, $random_double_b), $math_expression->e("min($random_double_a, $random_double_b)")); } + /** + * Test variable handling. + */ public function testVariables() { $math_expression = new ctools_math_expr(); @@ -108,6 +122,9 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { $this->assertEqual($random_number_a / $random_number_b, $math_expression->e("var / $random_number_b")); } + /** + * Test custom function handling. + */ public function testCustomFunctions() { $math_expression = new ctools_math_expr(); @@ -126,4 +143,5 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase { // Use a custom function in another function. $this->assertEqual(($random_number_a * 2 + $random_number_b) * 2, $math_expression->e("f(g($random_number_a, $random_number_b))")); } + } diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression_stack.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression_stack.test index 8143a55b..a87d1b2b 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression_stack.test +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/math_expression_stack.test @@ -1,26 +1,34 @@ 'CTools math expression stack tests', + 'name' => 'Math expressions stack', 'description' => 'Test the stack class of the math expression library.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - public function setUp() { - parent::setUp('ctools', 'ctools_plugin_test'); + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + $modules[] = 'ctools_plugin_test'; + parent::setUp($modules); } + /** + * Test the math expression stack system. + */ public function testStack() { $stack = new ctools_math_expr_stack(); @@ -35,13 +43,15 @@ class CtoolsMathExpressionStackTestCase extends DrupalWebTestCase { $this->assertIdentical($value, $stack->pop()); $this->assertNull($stack->pop()); - // Add multiple elements and see whether they are returned in the right order. + // Add multiple elements and see whether they are returned in the right + // order. $values = array($this->randomName(), $this->randomName(), $this->randomName()); foreach ($values as $value) { $stack->push($value); } - // Test the different elements at different positions with the last() method. + // Test the different elements at different positions with the last() + // method. $count = count($values); foreach ($values as $key => $value) { $this->assertEqual($value, $stack->last($count - $key)); @@ -58,6 +68,6 @@ class CtoolsMathExpressionStackTestCase extends DrupalWebTestCase { $this->assertEqual($stack->pop(), $value); } $this->assertNull($stack->pop()); - } + } diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache.test index 8791d7e7..22a0e89f 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache.test +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache.test @@ -1,27 +1,36 @@ 'Ctools object cache storage', + 'name' => 'Object cache storage (UI tests)', 'description' => 'Verify that objects are written, readable and lockable.', - 'group' => 'Chaos Tools Suite', + 'group' => 'ctools', + 'dependencies' => array('ctools'), ); } - public function setUp() { - // Additionally enable ctools module. - parent::setUp('ctools'); + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); } + /** + * + */ public function testObjectStorage() { + ctools_include('cache'); + $account1 = $this->drupalCreateUser(array()); $this->drupalLogin($account1); diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache_unit.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache_unit.test new file mode 100644 index 00000000..97b672fb --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/object_cache_unit.test @@ -0,0 +1,141 @@ + 'Object cache storage (unit tests)', + 'description' => 'Verify that objects are written, readable and lockable.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + } + + /** + * Check that the supplied array looks like a ctools cache plugin. + * + * @param mixed $p + * The value to check. + * @param string $msg + * Prefix of the assertion message. + */ + public function assertValidCachePlugin($p, $msg) { + //$this->pass(var_export($p, TRUE)); + $this->assertTrue(is_array($p), $msg . ': plugin is an array'); + + $this->assertEqual($p['plugin type'], 'cache', $msg . ': type is cache'); + + $this->assertTrue(array_key_exists('title', $p), $msg . ': title element exists'); + $this->assertTrue(!empty($p['title']) && is_string($p['title']), $msg . ': title is a string'); + + $this->assertTrue(array_key_exists('cache get', $p), $msg . ': has a get function'); + $this->assertTrue(!empty($p['cache get']) && is_callable($p['cache get']), $msg . ': get is executable'); + + $this->assertTrue(array_key_exists('cache set', $p), $msg . ': has a set function'); + $this->assertTrue(!empty($p['cache set']) && is_callable($p['cache set']), $msg . ': set is executable'); + + // @todo Clear is required by the spec (cache.inc:40..48): but export_ui + // cache doesn't implement it. Enable the assertions when that problem is + // solved. + // $this->assertTrue(array_key_exists('cache clear', $p), $msg . ': has a clear function'); + // $this->assertTrue(is_callable($p['cache clear']), $msg . ': clear is executable'); + + // @todo Break is optional acc'd to spec but does anything implement it? + $this->assertTrue(!array_key_exists('cache break', $p) || is_callable($p['cache break']), $msg . ': break is executable'); + + // @todo Finalize is optional so don't fail if not there?? + $this->assertTrue(!array_key_exists('cache finalize', $p) || is_callable($p['cache finalize']), $msg . ': finalize is executable'); + } + + /** + * Check the return value of the ctools_cache_find_plugin function. + * + * @param mixed $p the value to check. + * @param string $msg prefix of the assertion message. + */ + public function assertPluginNotFound($p, $msg) { + //$this->pass(var_export($p, TRUE)); + $this->assertTrue(is_array($p), $msg . ': is an array'); + $plugin = array_shift($p); + $this->assertNull($plugin, $msg . ': no plugin info'); + $data = array_shift($p); + $this->assertTrue(empty($data) || is_string($data), $msg . ': data string-like'); + $this->assertTrue(empty($p), $msg . ': just two elements'); + } + + /** + * Check the return value of the ctools_cache_find_plugin function. + * + * @param mixed $p the value to check. + * @param string $msg prefix of the assertion message. + */ + public function assertPluginFound($p, $msg) { + //$this->pass(var_export($p, TRUE)); + $this->assertTrue(is_array($p), $msg . ': is an array'); + $plugin = array_shift($p); + $this->assertTrue(is_array($plugin), $msg . ': has plugin data'); + $data = array_shift($p); + $this->assertTrue(empty($data) || is_string($data), $msg . ': data is string-like'); + $this->assertTrue(empty($p), $msg . ': just two elements'); + } + + /** + * Test to see that we can find the standard simple plugin. + */ + public function testFindSimpleCachePlugin() { + ctools_include('cache'); + + // The simple plugin. + $plugin = ctools_cache_find_plugin('simple'); + $this->assertPluginFound($plugin, 'The Simple Cache plugin is present'); + $this->assertValidCachePlugin($plugin[0], 'The Simple Cache plugin'); + + // The simple plugin, with ::. + $plugin = ctools_cache_find_plugin('simple::data'); + $this->assertPluginFound($plugin, 'The Simple Cache plugin is present, with data'); + } + + /** + * Test to see that we can find the standard export_ui plugin. + */ + public function testFindExportUICachePlugin() { + ctools_include('cache'); + + // The export plugin. + $plugin = ctools_cache_find_plugin('export_ui'); + $this->assertPluginFound($plugin, 'The Export UI Cache plugin is present'); + $this->assertValidCachePlugin($plugin[0], 'The Export Cache plugin'); + + // The export plugin, with ::. + $plugin = ctools_cache_find_plugin('export_ui::data'); + $this->assertTrue(is_array($plugin), 'The Export UI Cache plugin is present, with data'); + } + + /** + * Test to see that we don't find plugins that aren't there. + */ + public function testFindFoobarbazCachePlugin() { + ctools_include('cache'); + + // An imaginary foobarbaz plugin. + $plugin = ctools_cache_find_plugin('foobarbaz'); + $this->assertPluginNotFound($plugin, 'The Foobarbaz Cache plugin is absent'); + $plugin = ctools_cache_find_plugin('foobarbaz::data'); + $this->assertPluginNotFound($plugin, 'The Foobarbaz Cache plugin is absent, with data'); + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/page_tokens.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/page_tokens.test new file mode 100644 index 00000000..6ab973ec --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/page_tokens.test @@ -0,0 +1,134 @@ + 'Page token processing', + 'description' => 'Verify that page tokens can be set and read.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + + // Start each test anew. + ctools_reset_page_tokens(); + } + + /** + * Test that we can set page tokens. + */ + public function testSetPageToken() { + ctools_set_page_token('id', 'variable', 'test'); + + $tokens = ctools_set_page_token(); + $this->assertTrue(is_array($tokens) && count($tokens) === 1, 'Page tokens no longer empty.'); + $this->assertEqual($tokens['id'], array('variable', 'test'), 'Page token has correct value.'); + } + + /** + * Test that we can set page tokens. + */ + public function testSetVariableToken() { + $string = ctools_set_variable_token('title'); + $tokens = ctools_set_page_token(); + + $this->assertTrue(is_array($tokens) && count($tokens) === 1, 'Page tokens no longer empty'); + $this->assertEqual($tokens[$string], array('variable', 'title'), 'Page tokens no longer empty'); + } + + /** + * Test that we can set page tokens. + */ + public function testReplaceVariableToken() { + $string = ctools_set_variable_token('title'); + $this->assertEqual($string, '', 'Expected form of token was found'); + + $elements = array( + '#type' => 'container', + '#attributes' => array('class' => array('test')), + 'title' => '
Title
', + 'content' => array( + '#type' => 'markup', + '#markup' => t('This is my test markup'), + '#prefix' => $string, + ), + 'link' => array( + '#type' => 'link', + '#title' => t('My link'), + '#href' => 'node/1', + ), + ); + $markup = 'This is my test markupMy link
';
+
+ $new_markup = ctools_page_token_processing($markup, $elements);
+
+ $this->assertTrue(is_string($new_markup) && strlen($new_markup) > 1, 'Should return string');
+
+ $this->assertTrue(strstr($new_markup, ''), 'Variable Token Markup should contain h2 element');
+ $this->assertFalse(strstr($new_markup, 'ctools-page-title'), 'Variable Token Markup should not contain comment element');
+ }
+
+ /**
+ * Test that we can set page tokens.
+ */
+ public function testReplaceCallbackToken() {
+ $string = ctools_set_callback_token('title', 'test_ctools_page_callback_token');
+ $this->assertEqual($string, '', 'Expected form of token was found');
+
+ $elements = array(
+ '#type' => 'container',
+ '#attributes' => array('class' => array('test')),
+ 'content' => array(
+ '#type' => 'markup',
+ '#markup' => t('This is my test markup'),
+ '#prefix' => $string,
+ ),
+ 'link' => array(
+ '#type' => 'link',
+ '#title' => t('My link'),
+ '#href' => 'node/1',
+ ),
+ );
+ $markup = 'This is my test markupMy link';
+
+ $new_markup = ctools_page_token_processing($markup, $elements);
+
+ $this->assertTrue(is_string($new_markup) && strlen($new_markup) > 1, 'Should return a non-empty string');
+
+ $this->assertTrue(strstr($new_markup, ''), 'Callback Token Markup should contain h2 element');
+ $this->assertFalse(strstr($new_markup, 'ctools-page-title'), 'Callback Token Markup should not contain comment element');
+ }
+
+}
+
+/**
+ *
+ * @param $elements
+ *
+ * @return string
+ */
+function test_ctools_page_callback_token($elements) {
+ // Check that 'elements' array looks good.
+ if (isset($elements['content'])) {
+ return 'Title
';
+ }
+ else {
+ return '';
+ }
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_with_uuid.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_with_uuid.test
new file mode 100644
index 00000000..13ff0ac2
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_with_uuid.test
@@ -0,0 +1,55 @@
+ 'UUID handing, with UUID module',
+ 'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is installed.',
+ 'group' => 'ctools',
+ 'dependencies' => array('ctools'),
+ // 'dependencies' => array('ctools', 'uuid'),
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ function setUp(array $modules = array()) {
+ $modules[] = 'ctools';
+ // @todo Add UUID as a test dependency and then add comment out this line.
+ // $modules[] = 'uuid';
+ parent::setUp($modules);
+ }
+
+ /**
+ * Check we can get a UUID.
+ *
+ * NB: This test will use one (and only one) of the mechanisms available
+ * from pear,
+ *
+ * @todo Fix this so testbot doesn't fail.
+ */
+ public function DISABLED_testMakeNewUUID() {
+ // drupal_get_filename will report even if the module is disabled.
+ if (drupal_get_filename('module', 'uuid') && !module_exists('uuid')) {
+ module_enable(array('uuid'));
+ }
+ // if we now have uuid module, use it.
+ if (module_exists('uuid')) {
+ $uuid = ctools_uuid_generate();
+ $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (uuid): ' . $uuid);
+ }
+ else {
+ // otherwise say we can't...
+ $this->verbose('uuid module not present');
+ }
+ }
+
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_without_uuid.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_without_uuid.test
new file mode 100644
index 00000000..6d62ebf4
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_without_uuid.test
@@ -0,0 +1,101 @@
+ 'UUID handing, without UUID module',
+ 'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is not installed.',
+ 'group' => 'ctools',
+ 'dependencies' => array('ctools'),
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ function setUp(array $modules = array()) {
+ $modules[] = 'ctools';
+ parent::setUp($modules);
+ }
+
+ /**
+ * Check the UUID_PATTERN constant exists.
+ *
+ * @todo Fix this so testbot doesn't fail.
+ */
+ public function DISABLED_testHaveUUIDpattern() {
+ ctools_include('uuid');
+ $this->assertTrue(defined('UUID_PATTERN'), 'The UUID_PATTERN constant exists.');
+ $this->assertTrue(is_string(UUID_PATTERN) && strlen(UUID_PATTERN) > 12, 'The UUID_PATTERN has an appropriate value.');
+ }
+
+ /**
+ * Check we can get a UUID when .
+ *
+ * NB: This test will use one (and only one) of the mechanisms available
+ * from pear,
+ *
+ * @todo Fix this so testbot doesn't fail.
+ */
+ public function DISABLED_testMakeNewUUIDRaw() {
+ // drupal_get_filename will report even if the module is disabled.
+ if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) {
+ module_disable(array('uuid'));
+ }
+
+ ctools_include('uuid');
+ $uuid = _ctools_uuid_generate_php();
+ $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (ctoolsphp): ' . $uuid);
+ }
+
+ /**
+ * Check we can get a UUID when .
+ *
+ * NB: This test will use one (and only one) of the mechanisms available
+ * from pear,
+ *
+ * @todo Fix this so testbot doesn't fail.
+ */
+ public function DISABLED_testMakeNewUUIDWrapper() {
+ // drupal_get_filename will report even if the module is disabled.
+ if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) {
+ module_disable(array('uuid'));
+ }
+
+ $uuid = ctools_uuid_generate();
+ $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (ctools): ' . $uuid);
+ }
+
+ /**
+ * Check we can verify that a string looks like a UUID.
+ *
+ * @todo Fix this so testbot doesn't fail.
+ */
+ public function DISABLED_testVerifyUUID() {
+ $checks = array(
+ NULL => FALSE,
+ '' => FALSE,
+ '0' => FALSE,
+ 'b5827a5cadd311e69a1f936389a27663' => FALSE, // version 1, no dashes
+ '15ff2566-add3-11e6-b98f' => FALSE, // incomplete
+
+ '15ff2566-add3-11e6-b98f-080027dc4f7a' => TRUE, // version 1
+ 'b5827a5c-add3-11e6-9a1f-936389a27663' => TRUE, // version 1
+ '02d9e6d5-9467-382e-8f9b-9300a64ac3cd' => TRUE, // version 3 url-based
+ '5e330afb-50c6-45c2-a292-99c3168696d2' => TRUE, // version 4 uuid
+ '8f4ca4fd-154e-5063-b6db-aa91af137037' => TRUE, // version 5
+ );
+
+ foreach ($checks as $uuid => $exp) {
+ $this->assertEqual(ctools_uuid_is_valid($uuid), $exp, 'Is Valid: UUIDs match expectations: ' . $uuid);
+ }
+ }
+
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc
index e4dded23..6f691c06 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc
@@ -209,7 +209,12 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
$view->override_path = $conf['path'];
}
else if ($path = $view->display_handler->get_option('inherit_panels_path')) {
- $view->override_path = $_GET['q'];
+ if (drupal_is_front_page()) {
+ $view->override_path = '';
+ }
+ else {
+ $view->override_path = $_GET['q'];
+ }
}
$block = new stdClass();
@@ -321,6 +326,10 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a
function views_content_views_panes_add_defaults(&$conf, $view) {
$pager = $view->display_handler->get_option('pager');
+ if (empty($conf)) {
+ $conf = array();
+ }
+
$conf += array(
'link_to_view' => $view->display_handler->get_option('link_to_view'),
'more_link' => $view->display_handler->get_option('use_more'),
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc
index 644ac547..186ef4f7 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc
@@ -25,7 +25,7 @@ function views_content_views_plugins() {
'use more' => TRUE,
'accept attachments' => TRUE,
'help topic' => 'display-pane',
- 'contextual links locations' => array('panel_pane'),
+ 'contextual links locations' => array('panel_pane', 'view'),
),
'ctools_context' => array(
'title' => t('Context'),
diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info
index 6e284018..9252a70a 100644
--- a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info
+++ b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info
@@ -10,9 +10,9 @@ files[] = plugins/views/views_content_plugin_display_ctools_context.inc
files[] = plugins/views/views_content_plugin_display_panel_pane.inc
files[] = plugins/views/views_content_plugin_style_ctools_context.inc
-; Information added by Drupal.org packaging script on 2015-08-19
-version = "7.x-1.9"
+; Information added by Drupal.org packaging script on 2018-02-04
+version = "7.x-1.13"
core = "7.x"
project = "ctools"
-datestamp = "1440020680"
+datestamp = "1517704095"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/.gitignore b/profiles/commerce_kickstart/modules/contrib/date/.gitignore
new file mode 100644
index 00000000..a0238825
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/date/.gitignore
@@ -0,0 +1,4 @@
+*.patch
+*.diff
+.idea/
+.idea/*
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc b/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc
index 47de0847..6c61e23c 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc
@@ -15,8 +15,14 @@ function date_devel_generate($entity, $field, $instance, $bundle) {
$entity_field = array();
if (isset($instance['widget']['settings']['year_range'])) {
$split = explode(':', $instance['widget']['settings']['year_range']);
- $back = str_replace('-', '', $split[0]);
- $forward = str_replace('+', '', $split[1]);
+ // Determine how much to go back and forward depending on whether a relative
+ // number of years (with - or + sign) or an absolute year is given.
+ $back = strpos($split[0], '-') === 0
+ ? str_replace('-', '', $split[0])
+ : date_format(date_now(), 'Y') - $split[0];
+ $forward = strpos($split[1], '+') === 0
+ ? str_replace('+', '', $split[1])
+ : $split[1] - date_format(date_now(), 'Y');
}
else {
$back = 2;
@@ -61,9 +67,11 @@ function date_devel_generate($entity, $field, $instance, $bundle) {
case 'date':
$format = DATE_FORMAT_ISO;
break;
+
case 'datestamp':
$format = DATE_FORMAT_UNIX;
break;
+
case 'datetime':
$format = DATE_FORMAT_DATETIME;
break;
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.field.inc b/profiles/commerce_kickstart/modules/contrib/date/date.field.inc
index 46ea317b..7aef97be 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.field.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.field.inc
@@ -19,6 +19,7 @@ function date_field_formatter_info() {
'multiple_from' => '',
'multiple_to' => '',
'fromto' => 'both',
+ 'show_remaining_days' => FALSE,
),
),
'format_interval' => array(
@@ -27,6 +28,7 @@ function date_field_formatter_info() {
'settings' => array(
'interval' => 2,
'interval_display' => 'time ago',
+ 'use_end_date' => false,
),
),
'date_plain' => array(
@@ -48,6 +50,7 @@ function date_field_formatter_settings_form($field, $instance, $view_mode, $form
case 'format_interval':
$form = date_interval_formatter_settings_form($field, $instance, $view_mode, $form, $form_state);
break;
+
default:
$form = date_default_formatter_settings_form($field, $instance, $view_mode, $form, $form_state);
break;
@@ -72,6 +75,7 @@ function date_field_formatter_settings_summary($field, $instance, $view_mode) {
case 'format_interval':
$summary = date_interval_formatter_settings_summary($field, $instance, $view_mode);
break;
+
default:
$summary = date_default_formatter_settings_summary($field, $instance, $view_mode);
break;
@@ -169,11 +173,16 @@ function date_field_formatter_view($entity_type, $entity, $field, $instance, $la
$element[$delta] = array('#markup' => $item['value']);
}
else {
- $element[$delta] = array('#markup' => t('!start-date to !end-date', array('!start-date' => $item['value'], '!end-date' => $item['value2'])));
+ $element[$delta] = array(
+ '#markup' => t('!start-date to !end-date', array(
+ '!start-date' => $item['value'],
+ '!end-date' => $item['value2']
+ )));
}
}
}
break;
+
case 'format_interval':
foreach ($items as $delta => $item) {
if (!empty($entity->date_id) && !in_array($delta, $selected_deltas)) {
@@ -188,6 +197,7 @@ function date_field_formatter_view($entity_type, $entity, $field, $instance, $la
}
}
break;
+
default:
foreach ($items as $delta => $item) {
if (!empty($entity->date_id) && !in_array($delta, $selected_deltas)) {
@@ -198,6 +208,7 @@ function date_field_formatter_view($entity_type, $entity, $field, $instance, $la
$variables['item'] = $item;
$variables['dates'] = date_formatter_process($formatter, $entity_type, $entity, $field, $instance, $langcode, $item, $display);
$variables['attributes'] = !empty($rdf_mapping) ? rdf_rdfa_attributes($rdf_mapping, $item['value']) : array();
+ $variables['show_remaining_days'] = isset($display['settings']['show_remaining_days']) ? $display['settings']['show_remaining_days'] : FALSE;
$output = theme('date_display_combination', $variables);
if (!empty($output)) {
$element[$delta] = array('#markup' => $output);
@@ -231,10 +242,11 @@ function date_field_is_empty($item, $field) {
* Implements hook_field_info().
*/
function date_field_info() {
+ $granularity = array('year', 'month', 'day', 'hour', 'minute');
$settings = array(
'settings' => array(
'todate' => '',
- 'granularity' => drupal_map_assoc(array('year', 'month', 'day', 'hour', 'minute')),
+ 'granularity' => drupal_map_assoc($granularity),
'tz_handling' => 'site',
'timezone_db' => 'UTC',
),
@@ -250,26 +262,26 @@ function date_field_info() {
);
return array(
'datetime' => array(
- 'label' => 'Date',
+ 'label' => t('Date'),
'description' => t('Store a date in the database as a datetime field, recommended for complete dates and times that may need timezone conversion.'),
'default_widget' => 'date_select',
'default_formatter' => 'date_default',
'default_token_formatter' => 'date_plain',
- ) + $settings,
+ ) + $settings,
'date' => array(
- 'label' => 'Date (ISO format)',
+ 'label' => t('Date (ISO format)'),
'description' => t('Store a date in the database as an ISO date, recommended for historical or partial dates.'),
'default_widget' => 'date_select',
'default_formatter' => 'date_default',
'default_token_formatter' => 'date_plain',
- ) + $settings,
+ ) + $settings,
'datestamp' => array(
- 'label' => 'Date (Unix timestamp)',
+ 'label' => t('Date (Unix timestamp)'),
'description' => t('Store a date in the database as a timestamp, deprecated format to support legacy data.'),
'default_widget' => 'date_select',
'default_formatter' => 'date_default',
'default_token_formatter' => 'date_plain',
- ) + $settings,
+ ) + $settings,
);
}
@@ -294,24 +306,24 @@ function date_field_widget_info() {
$info = array(
'date_select' => array(
- 'label' => t('Select list'),
+ 'label' => t('Select list'),
'field types' => array('date', 'datestamp', 'datetime'),
) + $settings,
'date_text' => array(
- 'label' => t('Text field'),
+ 'label' => t('Text field'),
'field types' => array('date', 'datestamp', 'datetime'),
- ) + $settings,
+ ) + $settings,
);
if (module_exists('date_popup')) {
$info['date_popup'] = array(
- 'label' => t('Pop-up calendar'),
+ 'label' => t('Pop-up calendar'),
'field types' => array('date', 'datestamp', 'datetime'),
) + $settings;
}
// The date text widget should use an increment of 1.
- $info['date_text']['increment'] = 1;
+ $info['date_text']['settings']['increment'] = 1;
return $info;
}
@@ -451,6 +463,14 @@ function date_field_instance_settings_form($field, $instance) {
return _date_field_instance_settings_form($field, $instance);
}
+/**
+ * Form validation handler for _date_field_instance_settings_form().
+ */
+function date_field_instance_settings_form_validate(&$form, &$form_state) {
+ module_load_include('inc', 'date', 'date_admin');
+ return _date_field_instance_settings_form_validate($form, $form_state);
+}
+
/**
* Implements hook_field_widget_settings_form().
*/
@@ -459,6 +479,14 @@ function date_field_widget_settings_form($field, $instance) {
return _date_field_widget_settings_form($field, $instance);
}
+/**
+ * Form validation handler for _date_field_widget_settings_form().
+ */
+function date_field_widget_settings_form_validate(&$form, &$form_state) {
+ module_load_include('inc', 'date', 'date_admin');
+ return _date_field_widget_settings_form_validate($form, $form_state);
+}
+
/**
* Implements hook_field_settings_form().
*/
@@ -467,6 +495,14 @@ function date_field_settings_form($field, $instance, $has_data) {
return _date_field_settings_form($field, $instance, $has_data);
}
+/**
+ * Form validation handler for _date_field_settings_form().
+ */
+function date_field_settings_validate(&$form, &$form_state) {
+ module_load_include('inc', 'date', 'date_admin');
+ return _date_field_settings_validate($form, $form_state);
+}
+
/**
* Implements hook_content_migrate_field_alter().
*
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.info b/profiles/commerce_kickstart/modules/contrib/date/date.info
index a1731de0..28263b42 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.info
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.info
@@ -11,10 +11,13 @@ files[] = tests/date_field.test
files[] = tests/date_migrate.test
files[] = tests/date_validation.test
files[] = tests/date_timezone.test
+files[] = tests/date_views_pager.test
+files[] = tests/date_views_popup.test
+files[] = tests/date_form.test
-; Information added by Drupal.org packaging script on 2014-07-29
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
core = "7.x"
project = "date"
-datestamp = "1406653438"
+datestamp = "1491562090"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.install b/profiles/commerce_kickstart/modules/contrib/date/date.install
index 23fb07eb..765b90cf 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.install
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.install
@@ -19,6 +19,7 @@ function date_field_schema($field) {
'views' => TRUE,
);
break;
+
case 'datetime':
$db_columns['value'] = array(
'type' => 'datetime',
@@ -31,6 +32,7 @@ function date_field_schema($field) {
'views' => TRUE,
);
break;
+
default:
$db_columns['value'] = array(
'type' => 'varchar',
@@ -66,7 +68,12 @@ function date_field_schema($field) {
'views' => FALSE,
);
if (!empty($field['settings']['todate'])) {
- $db_columns['offset2'] = array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE, 'views' => FALSE);
+ $db_columns['offset2'] = array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'sortable' => TRUE,
+ 'views' => FALSE
+ );
}
}
if (isset($field['settings']['repeat']) && $field['settings']['repeat'] == 1) {
@@ -88,8 +95,9 @@ function date_update_last_removed() {
}
/**
- * Get rid of the individual formatters for each format type,
- * these are now settings in the default formatter.
+ * Get rid of the individual formatters for each format type.
+ *
+ * These are now settings in the default formatter.
*/
function date_update_7000() {
$instances = field_info_instances();
@@ -115,8 +123,9 @@ function date_update_7000() {
}
/**
- * Get rid of the separate widgets for repeating dates. The code now handles
- * repeating dates correctly using the regular widgets.
+ * Get rid of the separate widgets for repeating dates.
+ *
+ * The code now handles repeating dates correctly using the regular widgets.
*/
function date_update_7001() {
$query = db_select('field_config_instance', 'fci', array('fetch' => PDO::FETCH_ASSOC));
@@ -127,7 +136,11 @@ function date_update_7001() {
foreach ($results as $record) {
$instance = unserialize($record['data']);
- if (in_array($instance['widget']['type'], array('date_popup_repeat', 'date_text_repeat', 'date_select_repeat'))) {
+ if (in_array($instance['widget']['type'], array(
+ 'date_popup_repeat',
+ 'date_text_repeat',
+ 'date_select_repeat'
+ ))) {
$instance['widget']['type'] = str_replace('_repeat', '', $instance['widget']['type']);
db_update('field_config_instance')
->fields(array(
@@ -192,3 +205,10 @@ function date_update_7004() {
drupal_set_message(t('Date text widgets have been updated to use an increment of 1.'));
}
+/**
+ * Revisited: Date text widgets should always use an increment of 1.
+ */
+function date_update_7005() {
+ // @see https://www.drupal.org/node/1355256
+ date_update_7004();
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.js b/profiles/commerce_kickstart/modules/contrib/date/date.js
index 2e60175f..b58d3be6 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.js
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.js
@@ -27,7 +27,7 @@ Drupal.date.EndDateHandler = function (widget) {
this.$widget = $(widget);
this.$start = this.$widget.find('.form-type-date-select[class$=value]');
this.$end = this.$widget.find('.form-type-date-select[class$=value2]');
- if (this.$end.length == 0) {
+ if (this.$end.length === 0) {
return;
}
this.initializeSelects();
@@ -68,7 +68,7 @@ Drupal.date.EndDateHandler.prototype.endDateIsBlank = function () {
var id;
for (id in this.selects) {
if (this.selects.hasOwnProperty(id)) {
- if (this.selects[id].end.val() != '') {
+ if (this.selects[id].end.val() !== '') {
return false;
}
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc b/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc
index 095c789e..90c1ec51 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc
@@ -1,10 +1,13 @@
$from, 'value2' => $to, 'timezone' => $timezone);
+ $item = array(
+ 'value' => $from,
+ 'value2' => $to,
+ 'timezone' => $timezone,
+ );
// Can be de-uglified when http://drupal.org/node/1159404 is committed.
$return[$language] = date_repeat_build_dates(NULL, date_ical_parse_rrule($field_info, $rrule), $field_info, $item);
}
else {
$return[$language][$delta]['value'] = $from;
+ $return[$language][$delta]['timezone'] = $timezone;
if (!empty($to)) {
$return[$language][$delta]['value2'] = $to;
}
@@ -190,6 +202,9 @@ class DateMigrateFieldHandler extends MigrateFieldHandler {
return $return;
}
+ /**
+ * {@inheritdoc}
+ */
public function fields($migration = NULL) {
return array(
'timezone' => t('Timezone'),
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.module b/profiles/commerce_kickstart/modules/contrib/date/date.module
index 91c0b65a..e667b5dd 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.module
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.module
@@ -1,8 +1,10 @@
field_name;
break;
+
default:
$bundle = field_extract_bundle($entity_type, $entity);
break;
@@ -40,13 +43,20 @@ function date_default_format($type) {
* Wrapper function around each of the widget types for creating a date object.
*/
function date_input_date($field, $instance, $element, $input) {
+ // Trim extra spacing off user input of text fields.
+ if (isset($input['date'])) {
+ $input['date'] = trim($input['date']);
+ }
+
switch ($instance['widget']['type']) {
case 'date_text':
$function = 'date_text_input_date';
break;
+
case 'date_popup':
$function = 'date_popup_input_date';
break;
+
default:
$function = 'date_select_input_date';
}
@@ -66,6 +76,7 @@ function date_theme() {
);
$themes = array(
'date_combo' => $base + array('render element' => 'element'),
+ 'date_form_element' => $base + array('render element' => 'element'),
'date_text_parts' => $base + array('render element' => 'element'),
'date' => $base + array('render element' => 'element'),
'date_display_single' => $base + array(
@@ -97,7 +108,13 @@ function date_theme() {
'add_rdf' => NULL,
'microdata' => NULL,
'add_microdata' => NULL,
- )),
+ ),
+ ),
+ 'date_display_remaining' => $base + array(
+ 'variables' => array(
+ 'remaining_days' => NULL,
+ ),
+ ),
'date_display_combination' => $base + array(
'variables' => array(
'entity_type' => NULL,
@@ -130,7 +147,7 @@ function date_theme() {
'attributes' => array(),
'rdf_mapping' => NULL,
'add_rdf' => NULL,
- ),
+ ),
),
);
@@ -209,8 +226,10 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst
$settings = $display['settings'];
$field_name = $field['field_name'];
$format = date_formatter_format($formatter, $settings, $granularity, $langcode);
- $timezone = isset($item['timezone']) ? $item['timezone'] : '';
- $timezone = date_get_timezone($field['settings']['tz_handling'], $timezone);
+ if (!isset($field['settings']['tz_handling']) || $field['settings']['tz_handling'] !== 'utc') {
+ $timezone = isset($item['timezone']) ? $item['timezone'] : '';
+ $timezone = date_get_timezone($field['settings']['tz_handling'], $timezone);
+ }
$timezone_db = date_get_timezone_db($field['settings']['tz_handling']);
$db_format = date_type_format($field['type']);
$process = date_process_values($field);
@@ -246,10 +265,10 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst
$dates[$processed]['formatted_iso'] = date_format_date($date, 'custom', 'c');
if (is_object($date)) {
if ($format == 'format_interval') {
- $dates[$processed]['interval'] = date_format_interval($date);
+ $dates[$processed]['interval'] = date_format_interval($date);
}
elseif ($format == 'format_calendar_day') {
- $dates[$processed]['calendar_day'] = date_format_calendar_day($date);
+ $dates[$processed]['calendar_day'] = date_format_calendar_day($date);
}
elseif ($format == 'U' || $format == 'r' || $format == 'c') {
$dates[$processed]['formatted'] = date_format_date($date, 'custom', $format);
@@ -258,10 +277,11 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst
$dates[$processed]['formatted_timezone'] = '';
}
elseif (!empty($format)) {
- $dates[$processed]['formatted'] = date_format_date($date, 'custom', $format);
- $dates[$processed]['formatted_date'] = date_format_date($date, 'custom', date_limit_format($format, array('year', 'month', 'day')));
- $dates[$processed]['formatted_time'] = date_format_date($date, 'custom', date_limit_format($format, array('hour', 'minute', 'second')));
- $dates[$processed]['formatted_timezone'] = date_format_date($date, 'custom', date_limit_format($format, array('timezone')));
+ $formats = _get_custom_date_format($date, $format);
+ $dates[$processed]['formatted'] = $formats['formatted'];
+ $dates[$processed]['formatted_date'] = $formats['date'];
+ $dates[$processed]['formatted_time'] = $formats['time'];
+ $dates[$processed]['formatted_timezone'] = $formats['zone'];
}
}
}
@@ -288,6 +308,30 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst
return $dates;
}
+/**
+ * Get a custom date format.
+ */
+function _get_custom_date_format($date, $format) {
+ $custom = array();
+ $custom['granularities'] = array(
+ 'date' => array('year', 'month', 'day'),
+ 'time' => array('hour', 'minute', 'second'),
+ 'zone' => array('timezone'),
+ );
+ $custom['limits'] = array(
+ 'date' => date_limit_format($format, $custom['granularities']['date']),
+ 'time' => date_limit_format($format, $custom['granularities']['time']),
+ 'zone' => date_limit_format($format, $custom['granularities']['zone']),
+ );
+
+ return array(
+ 'formatted' => date_format_date($date, 'custom', $format),
+ 'date' => date_format_date($date, 'custom', $custom['limits']['date']),
+ 'time' => date_format_date($date, 'custom', $custom['limits']['time']),
+ 'zone' => date_format_date($date, 'custom', $custom['limits']['zone']),
+ );
+}
+
/**
* Retrieves the granularity for a field.
*
@@ -301,14 +345,14 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst
*/
function date_granularity($field) {
if (!is_array($field) || !is_array($field['settings']['granularity'])) {
- $field['settings']['granularity'] = drupal_map_assoc(array('year', 'month', 'day'));
+ $granularity = drupal_map_assoc(array('year', 'month', 'day'));
+ $field['settings']['granularity'] = $granularity;
}
return array_values(array_filter($field['settings']['granularity']));
}
/**
- * Helper function to create an array of the date values in a
- * field that need to be processed.
+ * Helper function to create an array of the date values in a field that need to be processed.
*/
function date_process_values($field) {
return $field['settings']['todate'] ? array('value', 'value2') : array('value');
@@ -394,12 +438,17 @@ function date_formatter_format($formatter, $settings, $granularity = array(), $l
switch ($formatter) {
case 'format_interval':
return 'format_interval';
- break;
+
case 'date_plain':
return 'date_plain';
- break;
+
default:
- $format = date_format_type_format($format_type, $langcode);
+ if ($format_type == 'custom') {
+ $format = $settings['custom_date_format'];
+ }
+ else {
+ $format = date_format_type_format($format_type, $langcode);
+ }
break;
}
@@ -410,6 +459,7 @@ function date_formatter_format($formatter, $settings, $granularity = array(), $l
/**
* Helper function to get the right format for a format type.
+ *
* Checks for locale-based format first.
*/
function date_format_type_format($format_type, $langcode = NULL) {
@@ -432,27 +482,30 @@ function date_format_type_format($format_type, $langcode = NULL) {
case 'short':
$default = 'm/d/Y - H:i';
break;
+
case 'long':
$default = 'l, F j, Y - H:i';
break;
+
// If it's not one of the core date types and isn't stored in the
// database, we'll fall back on using the same default format as the
// 'medium' type.
case 'medium':
default:
// @todo: If a non-core module provides a date type and does not
- // variable_set() a default for it, the default assumed here may
- // not be correct (since the default format used by 'medium' may
- // not even be one of the allowed formats for the date type in
- // question). To fix this properly, we should really call
- // system_get_date_formats($format_type) and take the first
- // format from that list as the default. However, this function
- // is called often (on many different page requests), so calling
- // system_get_date_formats() from here would be a performance hit
- // since that function writes several records to the database
- // during each page request that calls it.
+ // variable_set() a default for it, the default assumed here may
+ // not be correct (since the default format used by 'medium' may
+ // not even be one of the allowed formats for the date type in
+ // question). To fix this properly, we should really call
+ // system_get_date_formats($format_type) and take the first
+ // format from that list as the default. However, this function
+ // is called often (on many different page requests), so calling
+ // system_get_date_formats() from here would be a performance hit
+ // since that function writes several records to the database
+ // during each page request that calls it.
$default = 'D, m/d/Y - H:i';
break;
+
}
$format = variable_get('date_format_' . $format_type, $default);
}
@@ -506,7 +559,7 @@ function date_prepare_entity($formatter, $entity_type, $entity, $field, $instanc
elseif ((!empty($max_count) && is_numeric($max_count) && $count >= $max_count) ||
(!empty($value['value']) && $value['value'] < $start) ||
(!empty($value['value2']) && $value['value2'] > $end)) {
- unset($entity->{$field_name}[$langcode][$delta]);
+ unset($entity->{$field_name}[$langcode][$delta]);
}
else {
$count++;
@@ -647,7 +700,7 @@ function date_entity_metadata_field_setter(&$entity, $name, $value, $langcode, $
}
/**
- * Auto creation callback for fields which contain two date values in one
+ * Auto creation callback for fields which contain two date values in one.
*/
function date_entity_metadata_struct_create($name, $property_info) {
return array(
@@ -658,10 +711,10 @@ function date_entity_metadata_struct_create($name, $property_info) {
/**
* Callback for setting an individual field value if a to-date may be there too.
+ *
* Based on entity_property_verbatim_set().
*
- * The passed in unix timestamp (UTC) is converted to the right value and
- * format dependent on the field.
+ * The passed in unix timestamp (UTC) is converted to the right value and format dependent on the field.
*
* $name is either 'value' or 'value2'.
*/
@@ -683,9 +736,9 @@ function date_entity_metadata_struct_setter(&$item, $name, $value, $langcode, $t
}
/**
- * Duplicate functionality of what is now date_all_day_field() in
- * the Date All Day module. Copy left here to avoid breaking other
- * modules that use this function.
+ * Duplicate functionality of what is now date_all_day_field() in the Date All Day module.
+ *
+ * Copy left here to avoid breaking other modules that use this function.
*
* DEPRECATED!, will be removed at some time in the future.
*/
@@ -759,7 +812,7 @@ function date_field_widget_properties_alter(&$widget, $context) {
$entity = $context['entity'];
$info = entity_get_info($entity_type);
$id = $info['entity keys']['id'];
- $widget['is_new']= FALSE;
+ $widget['is_new'] = FALSE;
if (empty($entity->$id)) {
$widget['is_new'] = TRUE;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.theme b/profiles/commerce_kickstart/modules/contrib/date/date.theme
index a1f7d939..c4ea352a 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date.theme
+++ b/profiles/commerce_kickstart/modules/contrib/date/date.theme
@@ -77,6 +77,7 @@ function theme_date_display_combination($variables) {
$microdata = $variables['microdata'];
$add_microdata = $variables['add_microdata'];
$precision = date_granularity_precision($field['settings']['granularity']);
+ $show_remaining_days = $variables['show_remaining_days'];
$output = '';
@@ -121,10 +122,12 @@ function theme_date_display_combination($variables) {
$date1 = $dates['value']['formatted'];
$date2 = $date1;
break;
+
case 'value2':
$date2 = $dates['value2']['formatted'];
$date1 = $date2;
break;
+
default:
$date1 = $dates['value']['formatted'];
$date2 = $dates['value2']['formatted'];
@@ -151,6 +154,20 @@ function theme_date_display_combination($variables) {
$has_time_string = FALSE;
}
+ // Check remaining days.
+ $show_remaining_days = '';
+ if (!empty($variables['show_remaining_days'])) {
+ $remaining_days = floor((strtotime($variables['dates']['value']['formatted_iso'])
+ - strtotime('now')) / (24 * 3600));
+
+ // Show remaining days only for future events.
+ if ($remaining_days >= 0) {
+ $show_remaining_days = theme('date_display_remaining', array(
+ 'remaining_days' => $remaining_days,
+ ));
+ }
+ }
+
// No date values, display nothing.
if (empty($date1) && empty($date2)) {
$output .= '';
@@ -167,6 +184,7 @@ function theme_date_display_combination($variables) {
'microdata' => $microdata,
'add_microdata' => $add_microdata,
'dates' => $dates,
+ 'show_remaining_days' => $show_remaining_days,
));
}
// Same day, different times, don't repeat the date but show both Start and
@@ -186,6 +204,7 @@ function theme_date_display_combination($variables) {
'microdata' => $microdata,
'add_microdata' => $add_microdata,
'dates' => $dates,
+ 'show_remaining_days' => $show_remaining_days,
));
$replaced = str_replace($time1, $time, $date1);
$output .= theme('date_display_single', array(
@@ -209,6 +228,7 @@ function theme_date_display_combination($variables) {
'microdata' => $microdata,
'add_microdata' => $add_microdata,
'dates' => $dates,
+ 'show_remaining_days' => $show_remaining_days,
));
}
@@ -236,12 +256,12 @@ function template_preprocess_date_display_single(&$variables) {
// Because the Entity API integration for Date has a variable data
// structure depending on whether there is an end value, the attributes
// could be attached to the field or to the value property.
- if(!empty($variables['microdata']['#attributes']['itemprop'])) {
+ if (!empty($variables['microdata']['#attributes']['itemprop'])) {
$variables['microdata']['value']['#attributes'] = $variables['microdata']['#attributes'];
}
// Add the machine readable time using the content attribute.
- if(!empty($variables['microdata']['value']['#attributes'])) {
+ if (!empty($variables['microdata']['value']['#attributes'])) {
$variables['microdata']['value']['#attributes']['content'] = $variables['dates']['value']['formatted_iso'];
}
else {
@@ -257,6 +277,7 @@ function theme_date_display_single($variables) {
$date = $variables['date'];
$timezone = $variables['timezone'];
$attributes = $variables['attributes'];
+ $show_remaining_days = isset($variables['show_remaining_days']) ? $variables['show_remaining_days'] : '';
// Wrap the result with the attributes.
$output = '' . $date . $timezone . '';
@@ -265,7 +286,8 @@ function theme_date_display_single($variables) {
$output .= ''. $element['#children'] .'
Title
'; + } + else { + return ''; + } +} diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_with_uuid.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_with_uuid.test new file mode 100644 index 00000000..13ff0ac2 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_with_uuid.test @@ -0,0 +1,55 @@ + 'UUID handing, with UUID module', + 'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is installed.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + // 'dependencies' => array('ctools', 'uuid'), + ); + } + + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + // @todo Add UUID as a test dependency and then add comment out this line. + // $modules[] = 'uuid'; + parent::setUp($modules); + } + + /** + * Check we can get a UUID. + * + * NB: This test will use one (and only one) of the mechanisms available + * from pear, + * + * @todo Fix this so testbot doesn't fail. + */ + public function DISABLED_testMakeNewUUID() { + // drupal_get_filename will report even if the module is disabled. + if (drupal_get_filename('module', 'uuid') && !module_exists('uuid')) { + module_enable(array('uuid')); + } + // if we now have uuid module, use it. + if (module_exists('uuid')) { + $uuid = ctools_uuid_generate(); + $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (uuid): ' . $uuid); + } + else { + // otherwise say we can't... + $this->verbose('uuid module not present'); + } + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_without_uuid.test b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_without_uuid.test new file mode 100644 index 00000000..6d62ebf4 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/ctools/tests/uuid_without_uuid.test @@ -0,0 +1,101 @@ + 'UUID handing, without UUID module', + 'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is not installed.', + 'group' => 'ctools', + 'dependencies' => array('ctools'), + ); + } + + /** + * {@inheritDoc} + */ + function setUp(array $modules = array()) { + $modules[] = 'ctools'; + parent::setUp($modules); + } + + /** + * Check the UUID_PATTERN constant exists. + * + * @todo Fix this so testbot doesn't fail. + */ + public function DISABLED_testHaveUUIDpattern() { + ctools_include('uuid'); + $this->assertTrue(defined('UUID_PATTERN'), 'The UUID_PATTERN constant exists.'); + $this->assertTrue(is_string(UUID_PATTERN) && strlen(UUID_PATTERN) > 12, 'The UUID_PATTERN has an appropriate value.'); + } + + /** + * Check we can get a UUID when . + * + * NB: This test will use one (and only one) of the mechanisms available + * from pear, + * + * @todo Fix this so testbot doesn't fail. + */ + public function DISABLED_testMakeNewUUIDRaw() { + // drupal_get_filename will report even if the module is disabled. + if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) { + module_disable(array('uuid')); + } + + ctools_include('uuid'); + $uuid = _ctools_uuid_generate_php(); + $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (ctoolsphp): ' . $uuid); + } + + /** + * Check we can get a UUID when . + * + * NB: This test will use one (and only one) of the mechanisms available + * from pear, + * + * @todo Fix this so testbot doesn't fail. + */ + public function DISABLED_testMakeNewUUIDWrapper() { + // drupal_get_filename will report even if the module is disabled. + if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) { + module_disable(array('uuid')); + } + + $uuid = ctools_uuid_generate(); + $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (ctools): ' . $uuid); + } + + /** + * Check we can verify that a string looks like a UUID. + * + * @todo Fix this so testbot doesn't fail. + */ + public function DISABLED_testVerifyUUID() { + $checks = array( + NULL => FALSE, + '' => FALSE, + '0' => FALSE, + 'b5827a5cadd311e69a1f936389a27663' => FALSE, // version 1, no dashes + '15ff2566-add3-11e6-b98f' => FALSE, // incomplete + + '15ff2566-add3-11e6-b98f-080027dc4f7a' => TRUE, // version 1 + 'b5827a5c-add3-11e6-9a1f-936389a27663' => TRUE, // version 1 + '02d9e6d5-9467-382e-8f9b-9300a64ac3cd' => TRUE, // version 3 url-based + '5e330afb-50c6-45c2-a292-99c3168696d2' => TRUE, // version 4 uuid + '8f4ca4fd-154e-5063-b6db-aa91af137037' => TRUE, // version 5 + ); + + foreach ($checks as $uuid => $exp) { + $this->assertEqual(ctools_uuid_is_valid($uuid), $exp, 'Is Valid: UUIDs match expectations: ' . $uuid); + } + } + +} diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc index e4dded23..6f691c06 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc +++ b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc @@ -209,7 +209,12 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a $view->override_path = $conf['path']; } else if ($path = $view->display_handler->get_option('inherit_panels_path')) { - $view->override_path = $_GET['q']; + if (drupal_is_front_page()) { + $view->override_path = ''; + } + else { + $view->override_path = $_GET['q']; + } } $block = new stdClass(); @@ -321,6 +326,10 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a function views_content_views_panes_add_defaults(&$conf, $view) { $pager = $view->display_handler->get_option('pager'); + if (empty($conf)) { + $conf = array(); + } + $conf += array( 'link_to_view' => $view->display_handler->get_option('link_to_view'), 'more_link' => $view->display_handler->get_option('use_more'), diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc index 644ac547..186ef4f7 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc +++ b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/plugins/views/views_content.views.inc @@ -25,7 +25,7 @@ function views_content_views_plugins() { 'use more' => TRUE, 'accept attachments' => TRUE, 'help topic' => 'display-pane', - 'contextual links locations' => array('panel_pane'), + 'contextual links locations' => array('panel_pane', 'view'), ), 'ctools_context' => array( 'title' => t('Context'), diff --git a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info index 6e284018..9252a70a 100644 --- a/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info +++ b/profiles/commerce_kickstart/modules/contrib/ctools/views_content/views_content.info @@ -10,9 +10,9 @@ files[] = plugins/views/views_content_plugin_display_ctools_context.inc files[] = plugins/views/views_content_plugin_display_panel_pane.inc files[] = plugins/views/views_content_plugin_style_ctools_context.inc -; Information added by Drupal.org packaging script on 2015-08-19 -version = "7.x-1.9" +; Information added by Drupal.org packaging script on 2018-02-04 +version = "7.x-1.13" core = "7.x" project = "ctools" -datestamp = "1440020680" +datestamp = "1517704095" diff --git a/profiles/commerce_kickstart/modules/contrib/date/.gitignore b/profiles/commerce_kickstart/modules/contrib/date/.gitignore new file mode 100644 index 00000000..a0238825 --- /dev/null +++ b/profiles/commerce_kickstart/modules/contrib/date/.gitignore @@ -0,0 +1,4 @@ +*.patch +*.diff +.idea/ +.idea/* diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc b/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc index 47de0847..6c61e23c 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date.devel_generate.inc @@ -15,8 +15,14 @@ function date_devel_generate($entity, $field, $instance, $bundle) { $entity_field = array(); if (isset($instance['widget']['settings']['year_range'])) { $split = explode(':', $instance['widget']['settings']['year_range']); - $back = str_replace('-', '', $split[0]); - $forward = str_replace('+', '', $split[1]); + // Determine how much to go back and forward depending on whether a relative + // number of years (with - or + sign) or an absolute year is given. + $back = strpos($split[0], '-') === 0 + ? str_replace('-', '', $split[0]) + : date_format(date_now(), 'Y') - $split[0]; + $forward = strpos($split[1], '+') === 0 + ? str_replace('+', '', $split[1]) + : $split[1] - date_format(date_now(), 'Y'); } else { $back = 2; @@ -61,9 +67,11 @@ function date_devel_generate($entity, $field, $instance, $bundle) { case 'date': $format = DATE_FORMAT_ISO; break; + case 'datestamp': $format = DATE_FORMAT_UNIX; break; + case 'datetime': $format = DATE_FORMAT_DATETIME; break; diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.field.inc b/profiles/commerce_kickstart/modules/contrib/date/date.field.inc index 46ea317b..7aef97be 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.field.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date.field.inc @@ -19,6 +19,7 @@ function date_field_formatter_info() { 'multiple_from' => '', 'multiple_to' => '', 'fromto' => 'both', + 'show_remaining_days' => FALSE, ), ), 'format_interval' => array( @@ -27,6 +28,7 @@ function date_field_formatter_info() { 'settings' => array( 'interval' => 2, 'interval_display' => 'time ago', + 'use_end_date' => false, ), ), 'date_plain' => array( @@ -48,6 +50,7 @@ function date_field_formatter_settings_form($field, $instance, $view_mode, $form case 'format_interval': $form = date_interval_formatter_settings_form($field, $instance, $view_mode, $form, $form_state); break; + default: $form = date_default_formatter_settings_form($field, $instance, $view_mode, $form, $form_state); break; @@ -72,6 +75,7 @@ function date_field_formatter_settings_summary($field, $instance, $view_mode) { case 'format_interval': $summary = date_interval_formatter_settings_summary($field, $instance, $view_mode); break; + default: $summary = date_default_formatter_settings_summary($field, $instance, $view_mode); break; @@ -169,11 +173,16 @@ function date_field_formatter_view($entity_type, $entity, $field, $instance, $la $element[$delta] = array('#markup' => $item['value']); } else { - $element[$delta] = array('#markup' => t('!start-date to !end-date', array('!start-date' => $item['value'], '!end-date' => $item['value2']))); + $element[$delta] = array( + '#markup' => t('!start-date to !end-date', array( + '!start-date' => $item['value'], + '!end-date' => $item['value2'] + ))); } } } break; + case 'format_interval': foreach ($items as $delta => $item) { if (!empty($entity->date_id) && !in_array($delta, $selected_deltas)) { @@ -188,6 +197,7 @@ function date_field_formatter_view($entity_type, $entity, $field, $instance, $la } } break; + default: foreach ($items as $delta => $item) { if (!empty($entity->date_id) && !in_array($delta, $selected_deltas)) { @@ -198,6 +208,7 @@ function date_field_formatter_view($entity_type, $entity, $field, $instance, $la $variables['item'] = $item; $variables['dates'] = date_formatter_process($formatter, $entity_type, $entity, $field, $instance, $langcode, $item, $display); $variables['attributes'] = !empty($rdf_mapping) ? rdf_rdfa_attributes($rdf_mapping, $item['value']) : array(); + $variables['show_remaining_days'] = isset($display['settings']['show_remaining_days']) ? $display['settings']['show_remaining_days'] : FALSE; $output = theme('date_display_combination', $variables); if (!empty($output)) { $element[$delta] = array('#markup' => $output); @@ -231,10 +242,11 @@ function date_field_is_empty($item, $field) { * Implements hook_field_info(). */ function date_field_info() { + $granularity = array('year', 'month', 'day', 'hour', 'minute'); $settings = array( 'settings' => array( 'todate' => '', - 'granularity' => drupal_map_assoc(array('year', 'month', 'day', 'hour', 'minute')), + 'granularity' => drupal_map_assoc($granularity), 'tz_handling' => 'site', 'timezone_db' => 'UTC', ), @@ -250,26 +262,26 @@ function date_field_info() { ); return array( 'datetime' => array( - 'label' => 'Date', + 'label' => t('Date'), 'description' => t('Store a date in the database as a datetime field, recommended for complete dates and times that may need timezone conversion.'), 'default_widget' => 'date_select', 'default_formatter' => 'date_default', 'default_token_formatter' => 'date_plain', - ) + $settings, + ) + $settings, 'date' => array( - 'label' => 'Date (ISO format)', + 'label' => t('Date (ISO format)'), 'description' => t('Store a date in the database as an ISO date, recommended for historical or partial dates.'), 'default_widget' => 'date_select', 'default_formatter' => 'date_default', 'default_token_formatter' => 'date_plain', - ) + $settings, + ) + $settings, 'datestamp' => array( - 'label' => 'Date (Unix timestamp)', + 'label' => t('Date (Unix timestamp)'), 'description' => t('Store a date in the database as a timestamp, deprecated format to support legacy data.'), 'default_widget' => 'date_select', 'default_formatter' => 'date_default', 'default_token_formatter' => 'date_plain', - ) + $settings, + ) + $settings, ); } @@ -294,24 +306,24 @@ function date_field_widget_info() { $info = array( 'date_select' => array( - 'label' => t('Select list'), + 'label' => t('Select list'), 'field types' => array('date', 'datestamp', 'datetime'), ) + $settings, 'date_text' => array( - 'label' => t('Text field'), + 'label' => t('Text field'), 'field types' => array('date', 'datestamp', 'datetime'), - ) + $settings, + ) + $settings, ); if (module_exists('date_popup')) { $info['date_popup'] = array( - 'label' => t('Pop-up calendar'), + 'label' => t('Pop-up calendar'), 'field types' => array('date', 'datestamp', 'datetime'), ) + $settings; } // The date text widget should use an increment of 1. - $info['date_text']['increment'] = 1; + $info['date_text']['settings']['increment'] = 1; return $info; } @@ -451,6 +463,14 @@ function date_field_instance_settings_form($field, $instance) { return _date_field_instance_settings_form($field, $instance); } +/** + * Form validation handler for _date_field_instance_settings_form(). + */ +function date_field_instance_settings_form_validate(&$form, &$form_state) { + module_load_include('inc', 'date', 'date_admin'); + return _date_field_instance_settings_form_validate($form, $form_state); +} + /** * Implements hook_field_widget_settings_form(). */ @@ -459,6 +479,14 @@ function date_field_widget_settings_form($field, $instance) { return _date_field_widget_settings_form($field, $instance); } +/** + * Form validation handler for _date_field_widget_settings_form(). + */ +function date_field_widget_settings_form_validate(&$form, &$form_state) { + module_load_include('inc', 'date', 'date_admin'); + return _date_field_widget_settings_form_validate($form, $form_state); +} + /** * Implements hook_field_settings_form(). */ @@ -467,6 +495,14 @@ function date_field_settings_form($field, $instance, $has_data) { return _date_field_settings_form($field, $instance, $has_data); } +/** + * Form validation handler for _date_field_settings_form(). + */ +function date_field_settings_validate(&$form, &$form_state) { + module_load_include('inc', 'date', 'date_admin'); + return _date_field_settings_validate($form, $form_state); +} + /** * Implements hook_content_migrate_field_alter(). * diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.info b/profiles/commerce_kickstart/modules/contrib/date/date.info index a1731de0..28263b42 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.info +++ b/profiles/commerce_kickstart/modules/contrib/date/date.info @@ -11,10 +11,13 @@ files[] = tests/date_field.test files[] = tests/date_migrate.test files[] = tests/date_validation.test files[] = tests/date_timezone.test +files[] = tests/date_views_pager.test +files[] = tests/date_views_popup.test +files[] = tests/date_form.test -; Information added by Drupal.org packaging script on 2014-07-29 -version = "7.x-2.8" +; Information added by Drupal.org packaging script on 2017-04-07 +version = "7.x-2.10" core = "7.x" project = "date" -datestamp = "1406653438" +datestamp = "1491562090" diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.install b/profiles/commerce_kickstart/modules/contrib/date/date.install index 23fb07eb..765b90cf 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.install +++ b/profiles/commerce_kickstart/modules/contrib/date/date.install @@ -19,6 +19,7 @@ function date_field_schema($field) { 'views' => TRUE, ); break; + case 'datetime': $db_columns['value'] = array( 'type' => 'datetime', @@ -31,6 +32,7 @@ function date_field_schema($field) { 'views' => TRUE, ); break; + default: $db_columns['value'] = array( 'type' => 'varchar', @@ -66,7 +68,12 @@ function date_field_schema($field) { 'views' => FALSE, ); if (!empty($field['settings']['todate'])) { - $db_columns['offset2'] = array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE, 'views' => FALSE); + $db_columns['offset2'] = array( + 'type' => 'int', + 'not null' => FALSE, + 'sortable' => TRUE, + 'views' => FALSE + ); } } if (isset($field['settings']['repeat']) && $field['settings']['repeat'] == 1) { @@ -88,8 +95,9 @@ function date_update_last_removed() { } /** - * Get rid of the individual formatters for each format type, - * these are now settings in the default formatter. + * Get rid of the individual formatters for each format type. + * + * These are now settings in the default formatter. */ function date_update_7000() { $instances = field_info_instances(); @@ -115,8 +123,9 @@ function date_update_7000() { } /** - * Get rid of the separate widgets for repeating dates. The code now handles - * repeating dates correctly using the regular widgets. + * Get rid of the separate widgets for repeating dates. + * + * The code now handles repeating dates correctly using the regular widgets. */ function date_update_7001() { $query = db_select('field_config_instance', 'fci', array('fetch' => PDO::FETCH_ASSOC)); @@ -127,7 +136,11 @@ function date_update_7001() { foreach ($results as $record) { $instance = unserialize($record['data']); - if (in_array($instance['widget']['type'], array('date_popup_repeat', 'date_text_repeat', 'date_select_repeat'))) { + if (in_array($instance['widget']['type'], array( + 'date_popup_repeat', + 'date_text_repeat', + 'date_select_repeat' + ))) { $instance['widget']['type'] = str_replace('_repeat', '', $instance['widget']['type']); db_update('field_config_instance') ->fields(array( @@ -192,3 +205,10 @@ function date_update_7004() { drupal_set_message(t('Date text widgets have been updated to use an increment of 1.')); } +/** + * Revisited: Date text widgets should always use an increment of 1. + */ +function date_update_7005() { + // @see https://www.drupal.org/node/1355256 + date_update_7004(); +} diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.js b/profiles/commerce_kickstart/modules/contrib/date/date.js index 2e60175f..b58d3be6 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.js +++ b/profiles/commerce_kickstart/modules/contrib/date/date.js @@ -27,7 +27,7 @@ Drupal.date.EndDateHandler = function (widget) { this.$widget = $(widget); this.$start = this.$widget.find('.form-type-date-select[class$=value]'); this.$end = this.$widget.find('.form-type-date-select[class$=value2]'); - if (this.$end.length == 0) { + if (this.$end.length === 0) { return; } this.initializeSelects(); @@ -68,7 +68,7 @@ Drupal.date.EndDateHandler.prototype.endDateIsBlank = function () { var id; for (id in this.selects) { if (this.selects.hasOwnProperty(id)) { - if (this.selects[id].end.val() != '') { + if (this.selects[id].end.val() !== '') { return false; } } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc b/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc index 095c789e..90c1ec51 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date.migrate.inc @@ -1,10 +1,13 @@ $from, 'value2' => $to, 'timezone' => $timezone); + $item = array( + 'value' => $from, + 'value2' => $to, + 'timezone' => $timezone, + ); // Can be de-uglified when http://drupal.org/node/1159404 is committed. $return[$language] = date_repeat_build_dates(NULL, date_ical_parse_rrule($field_info, $rrule), $field_info, $item); } else { $return[$language][$delta]['value'] = $from; + $return[$language][$delta]['timezone'] = $timezone; if (!empty($to)) { $return[$language][$delta]['value2'] = $to; } @@ -190,6 +202,9 @@ class DateMigrateFieldHandler extends MigrateFieldHandler { return $return; } + /** + * {@inheritdoc} + */ public function fields($migration = NULL) { return array( 'timezone' => t('Timezone'), diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.module b/profiles/commerce_kickstart/modules/contrib/date/date.module index 91c0b65a..e667b5dd 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.module +++ b/profiles/commerce_kickstart/modules/contrib/date/date.module @@ -1,8 +1,10 @@ field_name; break; + default: $bundle = field_extract_bundle($entity_type, $entity); break; @@ -40,13 +43,20 @@ function date_default_format($type) { * Wrapper function around each of the widget types for creating a date object. */ function date_input_date($field, $instance, $element, $input) { + // Trim extra spacing off user input of text fields. + if (isset($input['date'])) { + $input['date'] = trim($input['date']); + } + switch ($instance['widget']['type']) { case 'date_text': $function = 'date_text_input_date'; break; + case 'date_popup': $function = 'date_popup_input_date'; break; + default: $function = 'date_select_input_date'; } @@ -66,6 +76,7 @@ function date_theme() { ); $themes = array( 'date_combo' => $base + array('render element' => 'element'), + 'date_form_element' => $base + array('render element' => 'element'), 'date_text_parts' => $base + array('render element' => 'element'), 'date' => $base + array('render element' => 'element'), 'date_display_single' => $base + array( @@ -97,7 +108,13 @@ function date_theme() { 'add_rdf' => NULL, 'microdata' => NULL, 'add_microdata' => NULL, - )), + ), + ), + 'date_display_remaining' => $base + array( + 'variables' => array( + 'remaining_days' => NULL, + ), + ), 'date_display_combination' => $base + array( 'variables' => array( 'entity_type' => NULL, @@ -130,7 +147,7 @@ function date_theme() { 'attributes' => array(), 'rdf_mapping' => NULL, 'add_rdf' => NULL, - ), + ), ), ); @@ -209,8 +226,10 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst $settings = $display['settings']; $field_name = $field['field_name']; $format = date_formatter_format($formatter, $settings, $granularity, $langcode); - $timezone = isset($item['timezone']) ? $item['timezone'] : ''; - $timezone = date_get_timezone($field['settings']['tz_handling'], $timezone); + if (!isset($field['settings']['tz_handling']) || $field['settings']['tz_handling'] !== 'utc') { + $timezone = isset($item['timezone']) ? $item['timezone'] : ''; + $timezone = date_get_timezone($field['settings']['tz_handling'], $timezone); + } $timezone_db = date_get_timezone_db($field['settings']['tz_handling']); $db_format = date_type_format($field['type']); $process = date_process_values($field); @@ -246,10 +265,10 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst $dates[$processed]['formatted_iso'] = date_format_date($date, 'custom', 'c'); if (is_object($date)) { if ($format == 'format_interval') { - $dates[$processed]['interval'] = date_format_interval($date); + $dates[$processed]['interval'] = date_format_interval($date); } elseif ($format == 'format_calendar_day') { - $dates[$processed]['calendar_day'] = date_format_calendar_day($date); + $dates[$processed]['calendar_day'] = date_format_calendar_day($date); } elseif ($format == 'U' || $format == 'r' || $format == 'c') { $dates[$processed]['formatted'] = date_format_date($date, 'custom', $format); @@ -258,10 +277,11 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst $dates[$processed]['formatted_timezone'] = ''; } elseif (!empty($format)) { - $dates[$processed]['formatted'] = date_format_date($date, 'custom', $format); - $dates[$processed]['formatted_date'] = date_format_date($date, 'custom', date_limit_format($format, array('year', 'month', 'day'))); - $dates[$processed]['formatted_time'] = date_format_date($date, 'custom', date_limit_format($format, array('hour', 'minute', 'second'))); - $dates[$processed]['formatted_timezone'] = date_format_date($date, 'custom', date_limit_format($format, array('timezone'))); + $formats = _get_custom_date_format($date, $format); + $dates[$processed]['formatted'] = $formats['formatted']; + $dates[$processed]['formatted_date'] = $formats['date']; + $dates[$processed]['formatted_time'] = $formats['time']; + $dates[$processed]['formatted_timezone'] = $formats['zone']; } } } @@ -288,6 +308,30 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst return $dates; } +/** + * Get a custom date format. + */ +function _get_custom_date_format($date, $format) { + $custom = array(); + $custom['granularities'] = array( + 'date' => array('year', 'month', 'day'), + 'time' => array('hour', 'minute', 'second'), + 'zone' => array('timezone'), + ); + $custom['limits'] = array( + 'date' => date_limit_format($format, $custom['granularities']['date']), + 'time' => date_limit_format($format, $custom['granularities']['time']), + 'zone' => date_limit_format($format, $custom['granularities']['zone']), + ); + + return array( + 'formatted' => date_format_date($date, 'custom', $format), + 'date' => date_format_date($date, 'custom', $custom['limits']['date']), + 'time' => date_format_date($date, 'custom', $custom['limits']['time']), + 'zone' => date_format_date($date, 'custom', $custom['limits']['zone']), + ); +} + /** * Retrieves the granularity for a field. * @@ -301,14 +345,14 @@ function date_formatter_process($formatter, $entity_type, $entity, $field, $inst */ function date_granularity($field) { if (!is_array($field) || !is_array($field['settings']['granularity'])) { - $field['settings']['granularity'] = drupal_map_assoc(array('year', 'month', 'day')); + $granularity = drupal_map_assoc(array('year', 'month', 'day')); + $field['settings']['granularity'] = $granularity; } return array_values(array_filter($field['settings']['granularity'])); } /** - * Helper function to create an array of the date values in a - * field that need to be processed. + * Helper function to create an array of the date values in a field that need to be processed. */ function date_process_values($field) { return $field['settings']['todate'] ? array('value', 'value2') : array('value'); @@ -394,12 +438,17 @@ function date_formatter_format($formatter, $settings, $granularity = array(), $l switch ($formatter) { case 'format_interval': return 'format_interval'; - break; + case 'date_plain': return 'date_plain'; - break; + default: - $format = date_format_type_format($format_type, $langcode); + if ($format_type == 'custom') { + $format = $settings['custom_date_format']; + } + else { + $format = date_format_type_format($format_type, $langcode); + } break; } @@ -410,6 +459,7 @@ function date_formatter_format($formatter, $settings, $granularity = array(), $l /** * Helper function to get the right format for a format type. + * * Checks for locale-based format first. */ function date_format_type_format($format_type, $langcode = NULL) { @@ -432,27 +482,30 @@ function date_format_type_format($format_type, $langcode = NULL) { case 'short': $default = 'm/d/Y - H:i'; break; + case 'long': $default = 'l, F j, Y - H:i'; break; + // If it's not one of the core date types and isn't stored in the // database, we'll fall back on using the same default format as the // 'medium' type. case 'medium': default: // @todo: If a non-core module provides a date type and does not - // variable_set() a default for it, the default assumed here may - // not be correct (since the default format used by 'medium' may - // not even be one of the allowed formats for the date type in - // question). To fix this properly, we should really call - // system_get_date_formats($format_type) and take the first - // format from that list as the default. However, this function - // is called often (on many different page requests), so calling - // system_get_date_formats() from here would be a performance hit - // since that function writes several records to the database - // during each page request that calls it. + // variable_set() a default for it, the default assumed here may + // not be correct (since the default format used by 'medium' may + // not even be one of the allowed formats for the date type in + // question). To fix this properly, we should really call + // system_get_date_formats($format_type) and take the first + // format from that list as the default. However, this function + // is called often (on many different page requests), so calling + // system_get_date_formats() from here would be a performance hit + // since that function writes several records to the database + // during each page request that calls it. $default = 'D, m/d/Y - H:i'; break; + } $format = variable_get('date_format_' . $format_type, $default); } @@ -506,7 +559,7 @@ function date_prepare_entity($formatter, $entity_type, $entity, $field, $instanc elseif ((!empty($max_count) && is_numeric($max_count) && $count >= $max_count) || (!empty($value['value']) && $value['value'] < $start) || (!empty($value['value2']) && $value['value2'] > $end)) { - unset($entity->{$field_name}[$langcode][$delta]); + unset($entity->{$field_name}[$langcode][$delta]); } else { $count++; @@ -647,7 +700,7 @@ function date_entity_metadata_field_setter(&$entity, $name, $value, $langcode, $ } /** - * Auto creation callback for fields which contain two date values in one + * Auto creation callback for fields which contain two date values in one. */ function date_entity_metadata_struct_create($name, $property_info) { return array( @@ -658,10 +711,10 @@ function date_entity_metadata_struct_create($name, $property_info) { /** * Callback for setting an individual field value if a to-date may be there too. + * * Based on entity_property_verbatim_set(). * - * The passed in unix timestamp (UTC) is converted to the right value and - * format dependent on the field. + * The passed in unix timestamp (UTC) is converted to the right value and format dependent on the field. * * $name is either 'value' or 'value2'. */ @@ -683,9 +736,9 @@ function date_entity_metadata_struct_setter(&$item, $name, $value, $langcode, $t } /** - * Duplicate functionality of what is now date_all_day_field() in - * the Date All Day module. Copy left here to avoid breaking other - * modules that use this function. + * Duplicate functionality of what is now date_all_day_field() in the Date All Day module. + * + * Copy left here to avoid breaking other modules that use this function. * * DEPRECATED!, will be removed at some time in the future. */ @@ -759,7 +812,7 @@ function date_field_widget_properties_alter(&$widget, $context) { $entity = $context['entity']; $info = entity_get_info($entity_type); $id = $info['entity keys']['id']; - $widget['is_new']= FALSE; + $widget['is_new'] = FALSE; if (empty($entity->$id)) { $widget['is_new'] = TRUE; } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date.theme b/profiles/commerce_kickstart/modules/contrib/date/date.theme index a1f7d939..c4ea352a 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date.theme +++ b/profiles/commerce_kickstart/modules/contrib/date/date.theme @@ -77,6 +77,7 @@ function theme_date_display_combination($variables) { $microdata = $variables['microdata']; $add_microdata = $variables['add_microdata']; $precision = date_granularity_precision($field['settings']['granularity']); + $show_remaining_days = $variables['show_remaining_days']; $output = ''; @@ -121,10 +122,12 @@ function theme_date_display_combination($variables) { $date1 = $dates['value']['formatted']; $date2 = $date1; break; + case 'value2': $date2 = $dates['value2']['formatted']; $date1 = $date2; break; + default: $date1 = $dates['value']['formatted']; $date2 = $dates['value2']['formatted']; @@ -151,6 +154,20 @@ function theme_date_display_combination($variables) { $has_time_string = FALSE; } + // Check remaining days. + $show_remaining_days = ''; + if (!empty($variables['show_remaining_days'])) { + $remaining_days = floor((strtotime($variables['dates']['value']['formatted_iso']) + - strtotime('now')) / (24 * 3600)); + + // Show remaining days only for future events. + if ($remaining_days >= 0) { + $show_remaining_days = theme('date_display_remaining', array( + 'remaining_days' => $remaining_days, + )); + } + } + // No date values, display nothing. if (empty($date1) && empty($date2)) { $output .= ''; @@ -167,6 +184,7 @@ function theme_date_display_combination($variables) { 'microdata' => $microdata, 'add_microdata' => $add_microdata, 'dates' => $dates, + 'show_remaining_days' => $show_remaining_days, )); } // Same day, different times, don't repeat the date but show both Start and @@ -186,6 +204,7 @@ function theme_date_display_combination($variables) { 'microdata' => $microdata, 'add_microdata' => $add_microdata, 'dates' => $dates, + 'show_remaining_days' => $show_remaining_days, )); $replaced = str_replace($time1, $time, $date1); $output .= theme('date_display_single', array( @@ -209,6 +228,7 @@ function theme_date_display_combination($variables) { 'microdata' => $microdata, 'add_microdata' => $add_microdata, 'dates' => $dates, + 'show_remaining_days' => $show_remaining_days, )); } @@ -236,12 +256,12 @@ function template_preprocess_date_display_single(&$variables) { // Because the Entity API integration for Date has a variable data // structure depending on whether there is an end value, the attributes // could be attached to the field or to the value property. - if(!empty($variables['microdata']['#attributes']['itemprop'])) { + if (!empty($variables['microdata']['#attributes']['itemprop'])) { $variables['microdata']['value']['#attributes'] = $variables['microdata']['#attributes']; } // Add the machine readable time using the content attribute. - if(!empty($variables['microdata']['value']['#attributes'])) { + if (!empty($variables['microdata']['value']['#attributes'])) { $variables['microdata']['value']['#attributes']['content'] = $variables['dates']['value']['formatted_iso']; } else { @@ -257,6 +277,7 @@ function theme_date_display_single($variables) { $date = $variables['date']; $timezone = $variables['timezone']; $attributes = $variables['attributes']; + $show_remaining_days = isset($variables['show_remaining_days']) ? $variables['show_remaining_days'] : ''; // Wrap the result with the attributes. $output = '' . $date . $timezone . ''; @@ -265,7 +286,8 @@ function theme_date_display_single($variables) { $output .= '' . $show_remaining_text . '
';
+}
+
/** @} End of addtogroup themeable */
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_admin.inc b/profiles/commerce_kickstart/modules/contrib/date/date_admin.inc
index 0e32fc5a..b800201e 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_admin.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_admin.inc
@@ -14,15 +14,24 @@ function date_default_formatter_settings_form($field, $instance, $view_mode, $fo
$formatter = $display['type'];
$form = array();
+ $date_formats = date_format_type_options();
$form['format_type'] = array(
'#title' => t('Choose how users view dates and times:'),
'#type' => 'select',
- '#options' => date_format_type_options(),
+ '#options' => $date_formats + array('custom' => t('Custom')),
'#default_value' => $settings['format_type'],
'#description' => t('To add or edit options, visit Date and time settings.', array('@date-time-page' => url('admin/config/regional/date-time'))),
'#weight' => 0,
);
+ $form['custom_date_format'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Custom date format'),
+ '#description' => t('If "Custom", see the PHP manual for date formats. Otherwise, enter the number of different time units to display, which defaults to 2.', array('@url' => 'http://php.net/manual/function.date.php')),
+ '#default_value' => isset($settings['custom_date_format']) ? $settings['custom_date_format'] : '',
+ '#dependency' => array('edit-options-settings-format-type' => array('custom')),
+ );
+
$form['fromto'] = array(
'#title' => t('Display:'),
'#type' => 'select',
@@ -74,6 +83,12 @@ function date_default_formatter_settings_form($field, $instance, $view_mode, $fo
'#description' => t('Identify specific start and/or end dates in the format YYYY-MM-DDTHH:MM:SS, or leave blank for all available dates.'),
);
+ $form['show_remaining_days'] = array(
+ '#title' => t('Show remaining days'),
+ '#type' => 'checkbox',
+ '#default_value' => $settings['show_remaining_days'],
+ '#weight' => 0,
+ );
return $form;
}
@@ -110,6 +125,14 @@ function date_interval_formatter_settings_form($field, $instance, $view_mode, $f
'#default_value' => $settings['interval_display'],
'#weight' => 0,
);
+ if (!empty($field['settings']['todate'])) {
+ $form['use_end_date'] = array(
+ '#title' => t('Use End date'),
+ '#description' => 'Use the End date, instead of the start date',
+ '#type' => 'checkbox',
+ '#default_value' => $settings['use_end_date'],
+ );
+ }
return $form;
}
@@ -127,9 +150,11 @@ function date_default_formatter_settings_summary($field, $instance, $view_mode)
case 'date_plain':
$format = t('Plain');
break;
+
case 'format_interval':
$format = t('Interval');
break;
+
default:
if (!empty($format_types[$settings['format_type']])) {
$format = $format_types[$settings['format_type']];
@@ -148,7 +173,9 @@ function date_default_formatter_settings_summary($field, $instance, $view_mode)
'value' => t('Display Start date only'),
'value2' => t('Display End date only'),
);
- $summary[] = $options[$settings['fromto']];
+ if (isset($options[$settings['fromto']])) {
+ $summary[] = $options[$settings['fromto']];
+ }
}
if (array_key_exists('multiple_number', $settings) && !empty($field['cardinality'])) {
@@ -159,6 +186,10 @@ function date_default_formatter_settings_summary($field, $instance, $view_mode)
));
}
+ if (array_key_exists('show_remaining_days', $settings)) {
+ $summary[] = t('Show remaining days: @value', array('@value' => ($settings['show_remaining_days'] ? 'yes' : 'no')));
+ }
+
return $summary;
}
@@ -172,7 +203,9 @@ function date_interval_formatter_settings_summary($field, $instance, $view_mode)
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
$formatter = $display['type'];
- $summary[] = t('Display time ago, showing @interval units.', array('@interval' => $settings['interval']));
+ $field = ($settings['use_end_date'] == 1) ? 'End' : 'Start';
+ $summary[] = t('Display time ago, showing @interval units. Using @field Date',
+ array('@interval' => $settings['interval'], '@field' => $field));
return $summary;
}
@@ -191,7 +224,11 @@ function _date_field_instance_settings_form($field, $instance) {
'#type' => 'select',
'#title' => t('Default date'),
'#default_value' => $settings['default_value'],
- '#options' => array('blank' => t('No default value'), 'now' => t('Now'), 'strtotime' => t('Relative')),
+ '#options' => array(
+ 'blank' => t('No default value'),
+ 'now' => t('Now'),
+ 'strtotime' => t('Relative'),
+ ),
'#weight' => 1,
'#fieldset' => 'default_values',
);
@@ -204,8 +241,11 @@ function _date_field_instance_settings_form($field, $instance) {
'#default_value' => $settings['default_value_code'],
'#states' => array(
'visible' => array(
- ':input[name="instance[settings][default_value]"]' => array('value' => 'strtotime')),
+ ':input[name="instance[settings][default_value]"]' => array(
+ 'value' => 'strtotime',
+ ),
),
+ ),
'#weight' => 1.1,
'#fieldset' => 'default_values',
);
@@ -213,7 +253,12 @@ function _date_field_instance_settings_form($field, $instance) {
'#type' => !empty($field['settings']['todate']) ? 'select' : 'hidden',
'#title' => t('Default end date'),
'#default_value' => $settings['default_value2'],
- '#options' => array('same' => t('Same as Default date'), 'blank' => t('No default value'), 'now' => t('Now'), 'strtotime' => t('Relative')),
+ '#options' => array(
+ 'same' => t('Same as Default date'),
+ 'blank' => t('No default value'),
+ 'now' => t('Now'),
+ 'strtotime' => t('Relative'),
+ ),
'#weight' => 2,
'#fieldset' => 'default_values',
);
@@ -224,8 +269,11 @@ function _date_field_instance_settings_form($field, $instance) {
'#default_value' => $settings['default_value_code2'],
'#states' => array(
'visible' => array(
- ':input[name="instance[settings][default_value2]"]' => array('value' => 'strtotime')),
+ ':input[name="instance[settings][default_value2]"]' => array(
+ 'value' => 'strtotime',
+ ),
),
+ ),
'#weight' => 2.1,
'#fieldset' => 'default_values',
);
@@ -244,7 +292,7 @@ function _date_field_instance_settings_form($field, $instance) {
/**
* Form validation handler for _date_field_instance_settings_form().
*/
-function date_field_instance_settings_form_validate(&$form, &$form_state) {
+function _date_field_instance_settings_form_validate(&$form, &$form_state) {
$settings = $form_state['values']['instance']['settings'];
if ($settings['default_value'] == 'strtotime') {
@@ -284,6 +332,7 @@ function _date_field_widget_settings_form($field, $instance) {
$formats = drupal_map_assoc($formats);
}
$now = date_example_date();
+ $options['site-wide'] = t('Short date format: @date', array('@date' => date_format_date($now, 'short')));
foreach ($formats as $f) {
$options[$f] = date_format_date($now, 'custom', $f);
}
@@ -369,11 +418,18 @@ function _date_field_widget_settings_form($field, $instance) {
'#weight' => 9,
);
if (in_array($widget['type'], array('date_select'))) {
- $options = array('above' => t('Above'), 'within' => t('Within'), 'none' => t('None'));
+ $options = array(
+ 'above' => t('Above'),
+ 'within' => t('Within'),
+ 'none' => t('None'),
+ );
$description = t("The location of date part labels, like 'Year', 'Month', or 'Day' . 'Above' displays the label as titles above each date part. 'Within' inserts the label as the first option in the select list and in blank textfields. 'None' doesn't visually label any of the date parts. Theme functions like 'date_part_label_year' and 'date_part_label_month' control label text.");
}
else {
- $options = array('above' => t('Above'), 'none' => t('None'));
+ $options = array(
+ 'above' => t('Above'),
+ 'none' => t('None'),
+ );
$description = t("The location of date part labels, like 'Year', 'Month', or 'Day' . 'Above' displays the label as titles above each date part. 'None' doesn't visually label any of the date parts. Theme functions like 'date_part_label_year' and 'date_part_label_month' control label text.");
}
$form['advanced']['label_position'] = array(
@@ -403,6 +459,13 @@ function _date_field_widget_settings_form($field, $instance) {
}
}
+ $form['advanced']['no_fieldset'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Render as a regular field'),
+ '#default_value' => !empty($settings['no_fieldset']),
+ '#description' => t('Whether to render this field as a regular field instead of a fieldset. The date field elements are wrapped in a fieldset by default, and may not display well without it.'),
+ );
+
$context = array(
'field' => $field,
'instance' => $instance,
@@ -415,7 +478,7 @@ function _date_field_widget_settings_form($field, $instance) {
/**
* Form validation handler for _date_field_widget_settings_form().
*/
-function date_field_widget_settings_form_validate(&$form, &$form_state) {
+function _date_field_widget_settings_form_validate(&$form, &$form_state) {
// The widget settings are in the wrong place in the form because of #tree on
// the top level.
$settings = $form_state['values']['instance']['widget']['settings'];
@@ -470,7 +533,9 @@ function _date_field_settings_form($field, $instance, $has_data) {
'#title' => t('Date attributes to collect'),
'#default_value' => $granularity,
'#options' => $options,
- '#attributes' => array('class' => array('container-inline')),
+ '#attributes' => array(
+ 'class' => array('container-inline'),
+ ),
'#description' => $description,
'year' => $checkbox_year,
);
@@ -515,7 +580,7 @@ function _date_field_settings_form($field, $instance, $has_data) {
$form['cache_enabled'] = array(
'#type' => 'checkbox',
'#title' => t('Cache dates'),
- '#description' => t('Date objects can be created and cached as date fields are loaded rather than when they are displayed to improve performance.'),
+ '#description' => t('Date objects can be created and cached as date fields are loaded, rather than when they are displayed, to improve performance.'),
'#default_value' => !empty($settings['cache_enabled']),
'#weight' => 10,
);
@@ -528,7 +593,9 @@ function _date_field_settings_form($field, $instance, $has_data) {
'#weight' => 11,
'#states' => array(
'visible' => array(
- 'input[name="field[settings][cache_enabled]"]' => array('checked' => TRUE),
+ 'input[name="field[settings][cache_enabled]"]' => array(
+ 'checked' => TRUE,
+ ),
),
),
);
@@ -546,7 +613,7 @@ function _date_field_settings_form($field, $instance, $has_data) {
/**
* Form validation handler for _date_field_settings_form().
*/
-function date_field_settings_validate(&$form, &$form_state) {
+function _date_field_settings_validate(&$form, &$form_state) {
$field = &$form_state['values']['field'];
if ($field['settings']['tz_handling'] == 'none') {
@@ -600,7 +667,7 @@ function date_timezone_handling_options() {
'site' => t("Site's time zone"),
'date' => t("Date's time zone"),
'user' => t("User's time zone"),
- 'utc' => 'UTC',
+ 'utc' => 'UTC',
'none' => t('No time zone conversion'),
);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.info b/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.info
index 8eeb7325..fcdc673a 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.info
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.info
@@ -5,9 +5,9 @@ dependencies[] = date
package = Date/Time
core = 7.x
-; Information added by Drupal.org packaging script on 2014-07-29
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
core = "7.x"
project = "date"
-datestamp = "1406653438"
+datestamp = "1491562090"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.module b/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.module
index 93fc61ba..e79bc944 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.module
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_all_day/date_all_day.module
@@ -31,11 +31,11 @@ function date_all_day_theme() {
'format' => NULL,
'entity_type' => NULL,
'entity' => NULL,
- 'view' => NULL
- )
+ 'view' => NULL,
+ ),
),
'date_all_day_label' => array(
- 'variables' => array()
+ 'variables' => array(),
),
);
@@ -91,14 +91,29 @@ function date_all_day_date_formatter_dates_alter(&$dates, $context) {
/**
* Adjust start/end date format to account for 'all day' .
*
- * @param array $field, the field definition for this date field.
- * @param string $which, which value to return, 'date1' or 'date2' .
- * @param object $date1, a date/time object for the 'start' date.
- * @param object $date2, a date/time object for the 'end' date.
- * @param string $format
- * @param object $entity, the node this date comes from (may be incomplete, always contains nid).
- * @param object $view, the view this node comes from, if applicable.
- * @return formatted date.
+ * @params array $field
+ * The field definition for this date field.
+ *
+ * @params string $which
+ * Which value to return, 'date1' or 'date2'.
+ *
+ * @params object $date1
+ * A date/time object for the 'start' date.
+ *
+ * @params object $date2
+ * A date/time object for the 'end' date.
+ *
+ * @params string $format
+ * A date/time format
+ *
+ * @params object $entity
+ * The node this date comes from (may be incomplete, always contains nid).
+ *
+ * @params object $view
+ * The view this node comes from, if applicable.
+ *
+ * @return string
+ * Formatted date.
*/
function theme_date_all_day($vars) {
$field = $vars['field'];
@@ -135,23 +150,32 @@ function theme_date_all_day($vars) {
}
return trim(date_format_date($$which, 'custom', $format) . $suffix);
-
}
/**
* Theme the way an 'all day' label will look.
*/
function theme_date_all_day_label() {
- return '(' . t('All day', array(), array('context' => 'datetime')) .')';
+ return '(' . t('All day', array(), array('context' => 'datetime')) . ')';
}
/**
* Determine if a Start/End date combination qualify as 'All day'.
*
- * @param array $field, the field definition for this date field.
- * @param object $date1, a date/time object for the 'Start' date.
- * @param object $date2, a date/time object for the 'End' date.
- * @return TRUE or FALSE.
+ * @param array $field
+ * The field definition for this date field.
+ *
+ * @param array $instance
+ * The field instance for this date field.
+ *
+ * @param object $date1
+ * A date/time object for the 'Start' date.
+ *
+ * @param object $date2
+ * A date/time object for the 'End' date.
+ *
+ * @return bool
+ * TRUE or FALSE.
*/
function date_all_day_field($field, $instance, $date1, $date2 = NULL) {
if (empty($date1) || !is_object($date1)) {
@@ -167,7 +191,6 @@ function date_all_day_field($field, $instance, $date1, $date2 = NULL) {
$granularity = date_granularity_precision($field['settings']['granularity']);
$increment = isset($instance['widget']['settings']['increment']) ? $instance['widget']['settings']['increment'] : 1;
return date_is_all_day(date_format($date1, DATE_FORMAT_DATETIME), date_format($date2, DATE_FORMAT_DATETIME), $granularity, $increment);
-
}
/**
@@ -222,7 +245,8 @@ function date_all_day_date_combo_process_alter(&$element, &$form_state, $context
function date_all_day_date_text_process_alter(&$element, &$form_state, $context) {
$all_day_id = !empty($element['#date_all_day_id']) ? $element['#date_all_day_id'] : '';
if ($all_day_id != '') {
- // All Day handling on text dates works only if the user leaves the time out of the input value.
+ // All Day handling on text dates works only
+ // if the user leaves the time out of the input value.
// There is no element to hide or show.
}
}
@@ -234,10 +258,11 @@ function date_all_day_date_text_process_alter(&$element, &$form_state, $context)
*/
function date_all_day_date_select_process_alter(&$element, &$form_state, $context) {
- // Hide or show this element in reaction to the all_day status for this element.
+ // Hide or show this element in reaction
+ // to the all_day status for this element.
$all_day_id = !empty($element['#date_all_day_id']) ? $element['#date_all_day_id'] : '';
if ($all_day_id != '') {
- foreach(array('hour', 'minute', 'second', 'ampm') as $field) {
+ foreach (array('hour', 'minute', 'second', 'ampm') as $field) {
if (array_key_exists($field, $element)) {
$element[$field]['#states'] = array(
'visible' => array(
@@ -255,7 +280,8 @@ function date_all_day_date_select_process_alter(&$element, &$form_state, $contex
*/
function date_all_day_date_popup_process_alter(&$element, &$form_state, $context) {
- // Hide or show this element in reaction to the all_day status for this element.
+ // Hide or show this element in reaction to
+ // the all_day status for this element.
$all_day_id = !empty($element['#date_all_day_id']) ? $element['#date_all_day_id'] : '';
if ($all_day_id != '' && array_key_exists('time', $element)) {
$element['time']['#states'] = array(
@@ -272,7 +298,8 @@ function date_all_day_date_popup_process_alter(&$element, &$form_state, $context
* of the date_select validation gets fired.
*/
function date_all_day_date_text_pre_validate_alter(&$element, &$form_state, &$input) {
- // Let Date module massage the format for all day values so they will pass validation.
+ // Let Date module massage the format for all day
+ // values so they will pass validation.
// The All day flag, if used, actually exists on the parent element.
date_all_day_value($element, $form_state);
}
@@ -284,7 +311,8 @@ function date_all_day_date_text_pre_validate_alter(&$element, &$form_state, &$in
* of the date_select validation gets fired.
*/
function date_all_day_date_select_pre_validate_alter(&$element, &$form_state, &$input) {
- // Let Date module massage the format for all day values so they will pass validation.
+ // Let Date module massage the format for all
+ // day values so they will pass validation.
// The All day flag, if used, actually exists on the parent element.
date_all_day_value($element, $form_state);
}
@@ -296,13 +324,16 @@ function date_all_day_date_select_pre_validate_alter(&$element, &$form_state, &$
* of the date_popup validation gets fired.
*/
function date_all_day_date_popup_pre_validate_alter(&$element, &$form_state, &$input) {
- // Let Date module massage the format for all day values so they will pass validation.
+ // Let Date module massage the format for all
+ // day values so they will pass validation.
// The All day flag, if used, actually exists on the parent element.
date_all_day_value($element, $form_state);
}
/**
- * A helper function to check if the all day flag is set on the parent of an
+ * A helper function date_all_day_value().
+ *
+ * To check if the all day flag is set on the parent of an
* element, and adjust the date_format accordingly so the missing time will
* not cause validation errors.
*/
@@ -332,7 +363,8 @@ function date_all_day_date_combo_pre_validate_alter(&$element, &$form_state, $co
$field = $context['field'];
// If we have an all day flag on this date and the time is empty,
- // change the format to match the input value so we don't get validation errors.
+ // change the format to match the input value
+ // so we don't get validation errors.
$element['#date_is_all_day'] = TRUE;
$element['value']['#date_format'] = date_part_format('date', $element['value']['#date_format']);
if (!empty($field['settings']['todate'])) {
@@ -344,29 +376,29 @@ function date_all_day_date_combo_pre_validate_alter(&$element, &$form_state, $co
/**
* Implements hook_date_combo_validate_date_start_alter().
*
- * This hook lets us alter the local date objects created by the date_combo validation
- * before they are converted back to the database timezone and stored.
+ * This hook lets us alter the local date objects
+ * created by the date_combo validation before they are
+ * converted back to the database timezone and stored.
*/
function date_all_day_date_combo_validate_date_start_alter(&$date, &$form_state, $context) {
-
- // If this is an 'All day' value, set the time to midnight.
- if (!empty($context['element']['#date_is_all_day'])) {
- $date->setTime(0, 0, 0);
- }
+ // If this is an 'All day' value, set the time to midnight.
+ if (!empty($context['element']['#date_is_all_day'])) {
+ $date->setTime(0, 0, 0);
+ }
}
/**
* Implements hook_date_combo_validate_date_end_alter().
*
- * This hook lets us alter the local date objects created by the date_combo validation
- * before they are converted back to the database timezone and stored.
+ * This hook lets us alter the local date objects
+ * created by the date_combo validation before
+ * they are converted back to the database timezone and stored.
*/
function date_all_day_date_combo_validate_date_end_alter(&$date, &$form_state, $context) {
-
- // If this is an 'All day' value, set the time to midnight.
- if (!empty($context['element']['#date_is_all_day'])) {
- $date->setTime(0, 0, 0);
- }
+ // If this is an 'All day' value, set the time to midnight.
+ if (!empty($context['element']['#date_is_all_day'])) {
+ $date->setTime(0, 0, 0);
+ }
}
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date.css b/profiles/commerce_kickstart/modules/contrib/date/date_api/date.css
index 9b72ecdb..e47a2ae2 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date.css
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date.css
@@ -15,9 +15,11 @@
.container-inline-date > .form-item {
display: inline-block;
margin-right: 0.5em; /* LTR */
- margin-bottom: 10px;
vertical-align: top;
}
+fieldset.date-combo .container-inline-date > .form-item {
+ margin-bottom: 10px;
+}
.container-inline-date .form-item .form-item {
float: left; /* LTR */
}
@@ -52,9 +54,11 @@
/* The exposed Views form doesn't need some of these styles */
.container-inline-date .date-padding {
- padding: 10px;
float: left;
}
+fieldset.date-combo .container-inline-date .date-padding {
+ padding: 10px;
+}
.views-exposed-form .container-inline-date .date-padding {
padding: 0;
}
@@ -116,7 +120,7 @@ span.date-display-end {
}
/* Add space between the date and time portions of the date_select widget. */
-.form-type-date-select .form-type-select[class$=hour] {
+.form-type-date-select .form-type-select[class*=hour] {
margin-left: .75em; /* LTR */
}
@@ -173,6 +177,10 @@ div.date-calendar-day span.year {
padding: 2px;
}
+.date-form-element-content-multiline {
+ padding: 10px;
+ border: 1px solid #CCC;
+}
/* Admin styling */
.form-item.form-item-instance-widget-settings-input-format-custom,
.form-item.form-item-field-settings-enddate-required {
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.admin.inc b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.admin.inc
index 966b1a42..3c706aeb 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.admin.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.admin.inc
@@ -10,112 +10,112 @@
*/
function _date_timezone_replacement($old) {
$replace = array(
- 'Brazil/Acre' => 'America/Rio_Branco',
- 'Brazil/DeNoronha' => 'America/Noronha',
- 'Brazil/East' => 'America/Recife',
- 'Brazil/West' => 'America/Manaus',
- 'Canada/Atlantic' => 'America/Halifax',
- 'Canada/Central' => 'America/Winnipeg',
- 'Canada/East-Saskatchewan' => 'America/Regina',
- 'Canada/Eastern' => 'America/Toronto',
- 'Canada/Mountain' => 'America/Edmonton',
- 'Canada/Newfoundland' => 'America/St_Johns',
- 'Canada/Pacific' => 'America/Vancouver',
- 'Canada/Saskatchewan' => 'America/Regina',
- 'Canada/Yukon' => 'America/Whitehorse',
- 'CET' => 'Europe/Berlin',
- 'Chile/Continental' => 'America/Santiago',
- 'Chile/EasterIsland' => 'Pacific/Easter',
- 'CST6CDT' => 'America/Chicago',
- 'Cuba' => 'America/Havana',
- 'EET' => 'Europe/Bucharest',
- 'Egypt' => 'Africa/Cairo',
- 'Eire' => 'Europe/Belfast',
- 'EST' => 'America/New_York',
- 'EST5EDT' => 'America/New_York',
- 'GB' => 'Europe/London',
- 'GB-Eire' => 'Europe/Belfast',
- 'Etc/GMT' => 'UTC',
- 'Etc/GMT+0' => 'UTC',
- 'Etc/GMT+1' => 'UTC',
- 'Etc/GMT+10' => 'UTC',
- 'Etc/GMT+11' => 'UTC',
- 'Etc/GMT+12' => 'UTC',
- 'Etc/GMT+2' => 'UTC',
- 'Etc/GMT+3' => 'UTC',
- 'Etc/GMT+4' => 'UTC',
- 'Etc/GMT+5' => 'UTC',
- 'Etc/GMT+6' => 'UTC',
- 'Etc/GMT+7' => 'UTC',
- 'Etc/GMT+8' => 'UTC',
- 'Etc/GMT+9' => 'UTC',
- 'Etc/GMT-0' => 'UTC',
- 'Etc/GMT-1' => 'UTC',
- 'Etc/GMT-10' => 'UTC',
- 'Etc/GMT-11' => 'UTC',
- 'Etc/GMT-12' => 'UTC',
- 'Etc/GMT-13' => 'UTC',
- 'Etc/GMT-14' => 'UTC',
- 'Etc/GMT-2' => 'UTC',
- 'Etc/GMT-3' => 'UTC',
- 'Etc/GMT-4' => 'UTC',
- 'Etc/GMT-5' => 'UTC',
- 'Etc/GMT-6' => 'UTC',
- 'Etc/GMT-7' => 'UTC',
- 'Etc/GMT-8' => 'UTC',
- 'Etc/GMT-9' => 'UTC',
- 'Etc/GMT0' => 'UTC',
- 'Etc/Greenwich' => 'UTC',
- 'Etc/UCT' => 'UTC',
- 'Etc/Universal' => 'UTC',
- 'Etc/UTC' => 'UTC',
- 'Etc/Zulu' => 'UTC',
- 'Factory' => 'UTC',
- 'GMT' => 'UTC',
- 'GMT+0' => 'UTC',
- 'GMT-0' => 'UTC',
- 'GMT0' => 'UTC',
- 'Hongkong' => 'Asia/Hong_Kong',
- 'HST' => 'Pacific/Honolulu',
- 'Iceland' => 'Atlantic/Reykjavik',
- 'Iran' => 'Asia/Tehran',
- 'Israel' => 'Asia/Tel_Aviv',
- 'Jamaica' => 'America/Jamaica',
- 'Japan' => 'Asia/Tokyo',
- 'Kwajalein' => 'Pacific/Kwajalein',
- 'Libya' => 'Africa/Tunis',
- 'MET' => 'Europe/Budapest',
- 'Mexico/BajaNorte' => 'America/Tijuana',
- 'Mexico/BajaSur' => 'America/Mazatlan',
- 'Mexico/General' => 'America/Mexico_City',
- 'MST' => 'America/Boise',
- 'MST7MDT' => 'America/Boise',
- 'Navajo' => 'America/Phoenix',
- 'NZ' => 'Pacific/Auckland',
- 'NZ-CHAT' => 'Pacific/Chatham',
- 'Poland' => 'Europe/Warsaw',
- 'Portugal' => 'Europe/Lisbon',
- 'PRC' => 'Asia/Chongqing',
- 'PST8PDT' => 'America/Los_Angeles',
- 'ROC' => 'Asia/Taipei',
- 'ROK' => 'Asia/Seoul',
- 'Singapore' => 'Asia/Singapore',
- 'Turkey' => 'Europe/Istanbul',
- 'US/Alaska' => 'America/Anchorage',
- 'US/Aleutian' => 'America/Adak',
- 'US/Arizona' => 'America/Phoenix',
- 'US/Central' => 'America/Chicago',
- 'US/East-Indiana' => 'America/Indianapolis',
- 'US/Eastern' => 'America/New_York',
- 'US/Hawaii' => 'Pacific/Honolulu',
- 'US/Indiana-Starke' => 'America/Indiana/Knox',
- 'US/Michigan' => 'America/Detroit',
- 'US/Mountain' => 'America/Boise',
- 'US/Pacific' => 'America/Los_Angeles',
- 'US/Pacific-New' => 'America/Los_Angeles',
- 'US/Samoa' => 'Pacific/Samoa',
- 'W-SU' => 'Europe/Moscow',
- 'WET' => 'Europe/Paris',
+ 'Brazil/Acre' => 'America/Rio_Branco',
+ 'Brazil/DeNoronha' => 'America/Noronha',
+ 'Brazil/East' => 'America/Recife',
+ 'Brazil/West' => 'America/Manaus',
+ 'Canada/Atlantic' => 'America/Halifax',
+ 'Canada/Central' => 'America/Winnipeg',
+ 'Canada/East-Saskatchewan' => 'America/Regina',
+ 'Canada/Eastern' => 'America/Toronto',
+ 'Canada/Mountain' => 'America/Edmonton',
+ 'Canada/Newfoundland' => 'America/St_Johns',
+ 'Canada/Pacific' => 'America/Vancouver',
+ 'Canada/Saskatchewan' => 'America/Regina',
+ 'Canada/Yukon' => 'America/Whitehorse',
+ 'CET' => 'Europe/Berlin',
+ 'Chile/Continental' => 'America/Santiago',
+ 'Chile/EasterIsland' => 'Pacific/Easter',
+ 'CST6CDT' => 'America/Chicago',
+ 'Cuba' => 'America/Havana',
+ 'EET' => 'Europe/Bucharest',
+ 'Egypt' => 'Africa/Cairo',
+ 'Eire' => 'Europe/Belfast',
+ 'EST' => 'America/New_York',
+ 'EST5EDT' => 'America/New_York',
+ 'GB' => 'Europe/London',
+ 'GB-Eire' => 'Europe/Belfast',
+ 'Etc/GMT' => 'UTC',
+ 'Etc/GMT+0' => 'UTC',
+ 'Etc/GMT+1' => 'UTC',
+ 'Etc/GMT+10' => 'UTC',
+ 'Etc/GMT+11' => 'UTC',
+ 'Etc/GMT+12' => 'UTC',
+ 'Etc/GMT+2' => 'UTC',
+ 'Etc/GMT+3' => 'UTC',
+ 'Etc/GMT+4' => 'UTC',
+ 'Etc/GMT+5' => 'UTC',
+ 'Etc/GMT+6' => 'UTC',
+ 'Etc/GMT+7' => 'UTC',
+ 'Etc/GMT+8' => 'UTC',
+ 'Etc/GMT+9' => 'UTC',
+ 'Etc/GMT-0' => 'UTC',
+ 'Etc/GMT-1' => 'UTC',
+ 'Etc/GMT-10' => 'UTC',
+ 'Etc/GMT-11' => 'UTC',
+ 'Etc/GMT-12' => 'UTC',
+ 'Etc/GMT-13' => 'UTC',
+ 'Etc/GMT-14' => 'UTC',
+ 'Etc/GMT-2' => 'UTC',
+ 'Etc/GMT-3' => 'UTC',
+ 'Etc/GMT-4' => 'UTC',
+ 'Etc/GMT-5' => 'UTC',
+ 'Etc/GMT-6' => 'UTC',
+ 'Etc/GMT-7' => 'UTC',
+ 'Etc/GMT-8' => 'UTC',
+ 'Etc/GMT-9' => 'UTC',
+ 'Etc/GMT0' => 'UTC',
+ 'Etc/Greenwich' => 'UTC',
+ 'Etc/UCT' => 'UTC',
+ 'Etc/Universal' => 'UTC',
+ 'Etc/UTC' => 'UTC',
+ 'Etc/Zulu' => 'UTC',
+ 'Factory' => 'UTC',
+ 'GMT' => 'UTC',
+ 'GMT+0' => 'UTC',
+ 'GMT-0' => 'UTC',
+ 'GMT0' => 'UTC',
+ 'Hongkong' => 'Asia/Hong_Kong',
+ 'HST' => 'Pacific/Honolulu',
+ 'Iceland' => 'Atlantic/Reykjavik',
+ 'Iran' => 'Asia/Tehran',
+ 'Israel' => 'Asia/Tel_Aviv',
+ 'Jamaica' => 'America/Jamaica',
+ 'Japan' => 'Asia/Tokyo',
+ 'Kwajalein' => 'Pacific/Kwajalein',
+ 'Libya' => 'Africa/Tunis',
+ 'MET' => 'Europe/Budapest',
+ 'Mexico/BajaNorte' => 'America/Tijuana',
+ 'Mexico/BajaSur' => 'America/Mazatlan',
+ 'Mexico/General' => 'America/Mexico_City',
+ 'MST' => 'America/Boise',
+ 'MST7MDT' => 'America/Boise',
+ 'Navajo' => 'America/Phoenix',
+ 'NZ' => 'Pacific/Auckland',
+ 'NZ-CHAT' => 'Pacific/Chatham',
+ 'Poland' => 'Europe/Warsaw',
+ 'Portugal' => 'Europe/Lisbon',
+ 'PRC' => 'Asia/Chongqing',
+ 'PST8PDT' => 'America/Los_Angeles',
+ 'ROC' => 'Asia/Taipei',
+ 'ROK' => 'Asia/Seoul',
+ 'Singapore' => 'Asia/Singapore',
+ 'Turkey' => 'Europe/Istanbul',
+ 'US/Alaska' => 'America/Anchorage',
+ 'US/Aleutian' => 'America/Adak',
+ 'US/Arizona' => 'America/Phoenix',
+ 'US/Central' => 'America/Chicago',
+ 'US/East-Indiana' => 'America/Indianapolis',
+ 'US/Eastern' => 'America/New_York',
+ 'US/Hawaii' => 'Pacific/Honolulu',
+ 'US/Indiana-Starke' => 'America/Indiana/Knox',
+ 'US/Michigan' => 'America/Detroit',
+ 'US/Mountain' => 'America/Boise',
+ 'US/Pacific' => 'America/Los_Angeles',
+ 'US/Pacific-New' => 'America/Los_Angeles',
+ 'US/Samoa' => 'Pacific/Samoa',
+ 'W-SU' => 'Europe/Moscow',
+ 'WET' => 'Europe/Paris',
);
if (array_key_exists($old, $replace)) {
return $replace[$old];
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.info b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.info
index 3ca86e65..c537ca04 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.info
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.info
@@ -9,9 +9,9 @@ stylesheets[all][] = date.css
files[] = date_api.module
files[] = date_api_sql.inc
-; Information added by Drupal.org packaging script on 2014-07-29
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
core = "7.x"
project = "date"
-datestamp = "1406653438"
+datestamp = "1491562090"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.install b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.install
index ce5b746d..d5a68bbd 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.install
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.install
@@ -96,7 +96,7 @@ function date_api_uninstall() {
'date_php_min_year',
'date_db_tz_support',
'date_api_use_iso8601',
- );
+ );
foreach ($variables as $variable) {
variable_del($variable);
}
@@ -118,8 +118,9 @@ function date_api_update_last_removed() {
}
/**
- * Move old date format data to new date format tables, and delete the old
- * tables. Insert only values that don't already exist in the new tables, in
+ * Move old date format to new date format tables,and delete the old tables.
+ *
+ * Insert only values that don't already exist in the new tables, in
* case new version of those custom values have already been created.
*/
function date_api_update_7000() {
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.module b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.module
index b1be6e5f..160bc9fb 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.module
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api.module
@@ -59,16 +59,16 @@ function date_help($path, $arg) {
}
if (module_exists('date_tools')) {
- $output .= 'Date Tools
' . t('Dates and calendars can be complicated to set up. The !date_wizard makes it easy to create a simple date content type and with a date field. ', array('!date_wizard' => l(t('Date wizard'), 'admin/config/date/tools/date_wizard'))); + $output .= 'Date Tools
' . t('Dates and calendars can be complicated to set up. The !date_wizard makes it easy to create a simple date content type and with a date field.', array('!date_wizard' => l(t('Date wizard'), 'admin/config/date/tools/date_wizard'))); } else { - $output .= 'Date Tools
' . t('Dates and calendars can be complicated to set up. If you enable the Date Tools module, it provides a Date Wizard that makes it easy to create a simple date content type with a date field. '); + $output .= 'Date Tools
' . t('Dates and calendars can be complicated to set up. If you enable the Date Tools module, it provides a Date Wizard that makes it easy to create a simple date content type with a date field.'); } $output .= 'More Information
' . t('Complete documentation for the Date and Date API modules is available at http://drupal.org/node/92460.', array('@link' => 'http://drupal.org/node/262062')) . '
'; return $output; - break; + } } @@ -101,7 +101,7 @@ function date_api_status() { $value = variable_get('date_format_medium'); if (isset($value)) { $now = date_now(); - $success_messages[] = $t('The medium date format type has been set to to @value. You may find it helpful to add new format types like Date, Time, Month, or Year, with appropriate formats, at Date and time settings.', array('@value' => $now->format($value), '@regional_date_time' => url('admin/config/regional/date-time'))); + $success_messages[] = $t('The medium date format type has been set to @value. You may find it helpful to add new format types like Date, Time, Month, or Year, with appropriate formats, at Date and time settings.', array('@value' => $now->format($value), '@regional_date_time' => url('admin/config/regional/date-time'))); } else { $error_messages[] = $t('The Date API requires that you set up the system date formats to function correctly.', array('@regional_date_time' => url('admin/config/regional/date-time'))); @@ -143,7 +143,15 @@ function date_api_menu() { class DateObject extends DateTime { public $granularity = array(); public $errors = array(); - protected static $allgranularity = array('year', 'month', 'day', 'hour', 'minute', 'second', 'timezone'); + protected static $allgranularity = array( + 'year', + 'month', + 'day', + 'hour', + 'minute', + 'second', + 'timezone' + ); private $serializedTime; private $serializedTimezone; @@ -402,7 +410,7 @@ class DateObject extends DateTime { * A single date part. */ public function removeGranularity($g) { - if ($key = array_search($g, $this->granularity)) { + if (($key = array_search($g, $this->granularity)) !== FALSE) { unset($this->granularity[$key]); } } @@ -458,23 +466,35 @@ class DateObject extends DateTime { $true = $this->hasGranularity() && (!$granularity || $flexible || $this->hasGranularity($granularity)); if (!$true && $granularity) { foreach ((array) $granularity as $part) { - if (!$this->hasGranularity($part) && in_array($part, array('second', 'minute', 'hour', 'day', 'month', 'year'))) { + if (!$this->hasGranularity($part) && in_array($part, array( + 'second', + 'minute', + 'hour', + 'day', + 'month', + 'year') + )) { switch ($part) { case 'second': $this->errors[$part] = t('The second is missing.'); break; + case 'minute': $this->errors[$part] = t('The minute is missing.'); break; + case 'hour': $this->errors[$part] = t('The hour is missing.'); break; + case 'day': $this->errors[$part] = t('The day is missing.'); break; + case 'month': $this->errors[$part] = t('The month is missing.'); break; + case 'year': $this->errors[$part] = t('The year is missing.'); break; @@ -537,7 +557,14 @@ class DateObject extends DateTime { $temp = date_parse($time); // Special case for 'now'. if ($time == 'now') { - $this->granularity = array('year', 'month', 'day', 'hour', 'minute', 'second'); + $this->granularity = array( + 'year', + 'month', + 'day', + 'hour', + 'minute', + 'second', + ); } else { // This PHP date_parse() method currently doesn't have resolution down to @@ -600,7 +627,14 @@ class DateObject extends DateTime { return FALSE; } $this->granularity = array(); - $final_date = array('hour' => 0, 'minute' => 0, 'second' => 0, 'month' => 1, 'day' => 1, 'year' => 0); + $final_date = array( + 'hour' => 0, + 'minute' => 0, + 'second' => 0, + 'month' => 1, + 'day' => 1, + 'year' => 0, + ); foreach ($letters as $i => $letter) { $value = $values[$i]; switch ($letter) { @@ -609,21 +643,25 @@ class DateObject extends DateTime { $final_date['day'] = intval($value); $this->addGranularity('day'); break; + case 'n': case 'm': $final_date['month'] = intval($value); $this->addGranularity('month'); break; + case 'F': $array_month_long = array_flip(date_month_names()); $final_date['month'] = array_key_exists($value, $array_month_long) ? $array_month_long[$value] : -1; $this->addGranularity('month'); break; + case 'M': $array_month = array_flip(date_month_names_abbr()); $final_date['month'] = array_key_exists($value, $array_month) ? $array_month[$value] : -1; $this->addGranularity('month'); break; + case 'Y': $final_date['year'] = $value; $this->addGranularity('year'); @@ -631,16 +669,19 @@ class DateObject extends DateTime { $this->errors['year'] = t('The year is invalid. Please check that entry includes four digits.'); } break; + case 'y': $year = $value; // If no century, we add the current one ("06" => "2006"). $final_date['year'] = str_pad($year, 4, substr(date("Y"), 0, 2), STR_PAD_LEFT); $this->addGranularity('year'); break; + case 'a': case 'A': $ampm = strtolower($value); break; + case 'g': case 'h': case 'G': @@ -648,14 +689,17 @@ class DateObject extends DateTime { $final_date['hour'] = intval($value); $this->addGranularity('hour'); break; + case 'i': $final_date['minute'] = intval($value); $this->addGranularity('minute'); break; + case 's': $final_date['second'] = intval($value); $this->addGranularity('second'); break; + case 'U': parent::__construct($value, $tz ? $tz : new DateTimeZone("UTC")); $this->addGranularity('year'); @@ -665,7 +709,7 @@ class DateObject extends DateTime { $this->addGranularity('minute'); $this->addGranularity('second'); return $this; - break; + } } if (isset($ampm) && $ampm == 'pm' && $final_date['hour'] < 12) { @@ -758,10 +802,24 @@ class DateObject extends DateTime { // date or we will get date slippage, i.e. a value of 2011-00-00 will get // interpreted as November of 2010 by PHP. if ($full) { - $arr += array('year' => 0, 'month' => 1, 'day' => 1, 'hour' => 0, 'minute' => 0, 'second' => 0); + $arr += array( + 'year' => 0, + 'month' => 1, + 'day' => 1, + 'hour' => 0, + 'minute' => 0, + 'second' => 0, + ); } else { - $arr += array('year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => '', 'second' => ''); + $arr += array( + 'year' => '', + 'month' => '', + 'day' => '', + 'hour' => '', + 'minute' => '', + 'second' => '', + ); } $datetime = ''; if ($arr['year'] !== '') { @@ -839,28 +897,27 @@ class DateObject extends DateTime { case 'year': $fallback = $now->format('Y'); return !is_int($value) || empty($value) || $value < variable_get('date_min_year', 1) || $value > variable_get('date_max_year', 4000) ? $fallback : $value; - break; + case 'month': $fallback = $default == 'first' ? 1 : $now->format('n'); return !is_int($value) || empty($value) || $value <= 0 || $value > 12 ? $fallback : $value; - break; + case 'day': $fallback = $default == 'first' ? 1 : $now->format('j'); $max_day = isset($year) && isset($month) ? date_days_in_month($year, $month) : 31; return !is_int($value) || empty($value) || $value <= 0 || $value > $max_day ? $fallback : $value; - break; + case 'hour': $fallback = $default == 'first' ? 0 : $now->format('G'); return !is_int($value) || $value < 0 || $value > 23 ? $fallback : $value; - break; + case 'minute': $fallback = $default == 'first' ? 0 : $now->format('i'); return !is_int($value) || $value < 0 || $value > 59 ? $fallback : $value; - break; + case 'second': $fallback = $default == 'first' ? 0 : $now->format('s'); return !is_int($value) || $value < 0 || $value > 59 ? $fallback : $value; - break; } } @@ -898,18 +955,23 @@ class DateObject extends DateTime { case 'year': $errors['year'] = t('The year is invalid.'); break; + case 'month': $errors['month'] = t('The month is invalid.'); break; + case 'day': $errors['day'] = t('The day is invalid.'); break; + case 'hour': $errors['hour'] = t('The hour is invalid.'); break; + case 'minute': $errors['minute'] = t('The minute is invalid.'); break; + case 'second': $errors['second'] = t('The second is invalid.'); break; @@ -929,7 +991,7 @@ class DateObject extends DateTime { * The stop date. * @param string $measure * (optional) A granularity date part. Defaults to 'seconds'. - * @param boolean $absolute + * @param bool $absolute * (optional) Indicate whether the absolute value of the difference should * be returned or if the sign should be retained. Defaults to TRUE. */ @@ -955,10 +1017,13 @@ class DateObject extends DateTime { // The easy cases first. case 'seconds': return $diff; + case 'minutes': return $diff / 60; + case 'hours': return $diff / 3600; + case 'years': return $year_diff; @@ -1013,7 +1078,7 @@ class DateObject extends DateTime { $sign = ($year_diff < 0) ? -1 : 1; for ($i = 1; $i <= abs($year_diff); $i++) { - date_modify($date1, (($sign > 0) ? '+': '-').'1 year'); + date_modify($date1, (($sign > 0) ? '+' : '-') . '1 year'); $week_diff += (date_iso_weeks_in_year($date1) * $sign); } return $week_diff; @@ -1060,10 +1125,13 @@ function date_type_format($type) { switch ($type) { case DATE_ISO: return DATE_FORMAT_ISO; + case DATE_UNIX: return DATE_FORMAT_UNIX; + case DATE_DATETIME: return DATE_FORMAT_DATETIME; + case DATE_ICAL: return DATE_FORMAT_ICAL; } @@ -1119,7 +1187,7 @@ function date_month_names($required = FALSE) { } /** - * Constructs a translated array of month name abbreviations + * Constructs a translated array of month name abbreviations. * * @param bool $required * (optional) If FALSE, the returned array will include a blank value. @@ -1211,9 +1279,11 @@ function date_week_days_abbr($required = FALSE, $refresh = TRUE, $length = 3) { case 1: $context = 'day_abbr1'; break; + case 2: $context = 'day_abbr2'; break; + default: $context = ''; break; @@ -1248,10 +1318,10 @@ function date_week_days_ordered($weekdays) { /** * Constructs an array of years. * - * @param int $min - * The minimum year in the array. - * @param int $max - * The maximum year in the array. + * @param int $start + * The start year in the array. + * @param int $end + * The end year in the array. * @param bool $required * (optional) If FALSE, the returned array will include a blank value. * Defaults to FALSE. @@ -1259,16 +1329,16 @@ function date_week_days_ordered($weekdays) { * @return array * An array of years in the selected range. */ -function date_years($min = 0, $max = 0, $required = FALSE) { +function date_years($start = 0, $end = 0, $required = FALSE) { // Ensure $min and $max are valid values. - if (empty($min)) { - $min = intval(date('Y', REQUEST_TIME) - 3); + if (empty($start)) { + $start = intval(date('Y', REQUEST_TIME) - 3); } - if (empty($max)) { - $max = intval(date('Y', REQUEST_TIME) + 3); + if (empty($end)) { + $end = intval(date('Y', REQUEST_TIME) + 3); } $none = array(0 => ''); - return !$required ? $none + drupal_map_assoc(range($min, $max)) : drupal_map_assoc(range($min, $max)); + return !$required ? $none + drupal_map_assoc(range($start, $end)) : drupal_map_assoc(range($start, $end)); } /** @@ -1474,7 +1544,14 @@ function date_granularity_names() { * An array of date parts. */ function date_granularity_sorted($granularity) { - return array_intersect(array('year', 'month', 'day', 'hour', 'minute', 'second'), $granularity); + return array_intersect(array( + 'year', + 'month', + 'day', + 'hour', + 'minute', + 'second', + ), $granularity); } /** @@ -1492,14 +1569,19 @@ function date_granularity_array_from_precision($precision) { switch ($precision) { case 'year': return array_slice($granularity_array, -6, 1); + case 'month': return array_slice($granularity_array, -6, 2); + case 'day': return array_slice($granularity_array, -6, 3); + case 'hour': return array_slice($granularity_array, -6, 4); + case 'minute': return array_slice($granularity_array, -6, 5); + default: return $granularity_array; } @@ -1533,14 +1615,19 @@ function date_granularity_format($granularity) { switch ($granularity) { case 'year': return substr($format, 0, 1); + case 'month': return substr($format, 0, 3); + case 'day': return substr($format, 0, 5); + case 'hour'; return substr($format, 0, 7); + case 'minute': return substr($format, 0, 9); + default: return $format; } @@ -1657,40 +1744,51 @@ function date_format_date($date, $type = 'medium', $format = '', $langcode = NUL case 'l': $datestring .= t($date->format('l'), array(), array('context' => '', 'langcode' => $langcode)); break; + case 'D': $datestring .= t($date->format('D'), array(), array('context' => '', 'langcode' => $langcode)); break; + case 'F': $datestring .= t($date->format('F'), array(), array('context' => 'Long month name', 'langcode' => $langcode)); break; + case 'M': $datestring .= t($date->format('M'), array(), array('langcode' => $langcode)); break; + case 'A': case 'a': $datestring .= t($date->format($c), array(), array('context' => 'ampm', 'langcode' => $langcode)); break; + // The timezone name translations can use t(). case 'e': case 'T': $datestring .= t($date->format($c)); break; + // Remaining date parts need no translation. case 'O': $datestring .= sprintf('%s%02d%02d', (date_offset_get($date) < 0 ? '-' : '+'), abs(date_offset_get($date) / 3600), abs(date_offset_get($date) % 3600) / 60); break; + case 'P': $datestring .= sprintf('%s%02d:%02d', (date_offset_get($date) < 0 ? '-' : '+'), abs(date_offset_get($date) / 3600), abs(date_offset_get($date) % 3600) / 60); break; + case 'Z': $datestring .= date_offset_get($date); break; + case '\\': $datestring .= $format[++$i]; break; + case 'r': - $datestring .= date_format_date($date, 'custom', 'D, d M Y H:i:s O', $langcode); + $datestring .= date_format_date($date, 'custom', 'D, d M Y H:i:s O', 'en'); break; + default: if (strpos('BdcgGhHiIjLmnNosStTuUwWYyz', $c) !== FALSE) { $datestring .= $date->format($c); @@ -1735,22 +1833,28 @@ function date_format_interval($date, $granularity = 2, $display_ago = TRUE) { /** * A date object for the current time. * - * @param object $timezone - * (optional) Optionally force time to a specific timezone, defaults to user - * timezone, if set, otherwise site timezone. Defaults to NULL. + * @param object|string|null $timezone + * (optional) PHP DateTimeZone object, string or NULL allowed. Optionally + * force time to a specific timezone, defaults to user timezone, if set, + * otherwise site timezone. Defaults to NULL. * - * @param boolean $reset [optional] - * Static cache reset + * @param bool $reset + * (optional) Static cache reset. * * @return object * The current time as a date object. */ function date_now($timezone = NULL, $reset = FALSE) { + $static_var = __FUNCTION__ . $timezone; + if ($timezone instanceof DateTimeZone) { + $static_var = __FUNCTION__ . $timezone->getName(); + } + if ($reset) { - drupal_static_reset(__FUNCTION__ . $timezone); + drupal_static_reset($static_var); } - $now = &drupal_static(__FUNCTION__ . $timezone); + $now = &drupal_static($static_var); if (!isset($now)) { $now = new DateObject('now', $timezone); @@ -1822,7 +1926,12 @@ function date_days_in_month($year, $month) { // Pick a day in the middle of the month to avoid timezone shifts. $datetime = date_pad($year, 4) . '-' . date_pad($month) . '-15 00:00:00'; $date = new DateObject($datetime); - return $date->format('t'); + if ($date->errors) { + return FALSE; + } + else { + return $date->format('t'); + } } /** @@ -1831,7 +1940,7 @@ function date_days_in_month($year, $month) { * @param mixed $date * (optional) The current date object, or a date string. Defaults to NULL. * - * @return integer + * @return int * The number of days in the year. */ function date_days_in_year($date = NULL) { @@ -1860,7 +1969,7 @@ function date_days_in_year($date = NULL) { * @param mixed $date * (optional) The current date object, or a date string. Defaults to NULL. * - * @return integer + * @return int * The number of ISO weeks in a year. */ function date_iso_weeks_in_year($date = NULL) { @@ -1952,7 +2061,7 @@ function date_week_range($week, $year) { // Move forwards to the last day of the week. $max_date = clone($min_date); - date_modify($max_date, '+7 days'); + date_modify($max_date, '+6 days'); if (date_format($min_date, 'Y') != $year) { $min_date = new DateObject($year . '-01-01 00:00:00'); @@ -1977,6 +2086,9 @@ function date_iso_week_range($week, $year) { date_timezone_set($min_date, date_default_timezone_object()); // Find the first day of the first ISO week in the year. + // If it's already a Monday, date_modify won't add a Monday, + // it will remain the same day. So add a Sunday first, then a Monday. + date_modify($min_date, '+1 Sunday'); date_modify($min_date, '+1 Monday'); // Jump ahead to the desired week for the beginning of the week range. @@ -1986,7 +2098,7 @@ function date_iso_week_range($week, $year) { // Move forwards to the last day of the week. $max_date = clone($min_date); - date_modify($max_date, '+7 days'); + date_modify($max_date, '+6 days'); return array($min_date, $max_date); } @@ -2094,7 +2206,8 @@ function date_has_time($granularity) { if (!is_array($granularity)) { $granularity = array(); } - return (bool) count(array_intersect($granularity, array('hour', 'minute', 'second'))); + $options = array('hour', 'minute', 'second'); + return (bool) count(array_intersect($granularity, $options)); } /** @@ -2110,7 +2223,8 @@ function date_has_date($granularity) { if (!is_array($granularity)) { $granularity = array(); } - return (bool) count(array_intersect($granularity, array('year', 'month', 'day'))); + $options = array('year', 'month', 'day'); + return (bool) count(array_intersect($granularity, $options)); } /** @@ -2128,8 +2242,10 @@ function date_part_format($part, $format) { switch ($part) { case 'date': return date_limit_format($format, array('year', 'month', 'day')); + case 'time': return date_limit_format($format, array('hour', 'minute', 'second')); + default: return date_limit_format($format, array($part)); } @@ -2157,7 +2273,7 @@ function date_limit_format($format, $granularity) { $drupal_static_fast['formats'] = &drupal_static(__FUNCTION__); } $formats = &$drupal_static_fast['formats']; - $format_granularity_cid = $format .'|'. implode(',', $granularity); + $format_granularity_cid = $format . '|' . implode(',', $granularity); if (isset($formats[$format_granularity_cid])) { return $formats[$format_granularity_cid]; } @@ -2191,21 +2307,27 @@ function date_limit_format($format, $granularity) { case 'year': $regex[] = '([\-/\.,:]?\s?(? "$path/theme", ); return array( - 'date_nav_title' => $base + array('variables' => array('granularity' => NULL, 'view' => NULL, 'link' => NULL, 'format' => NULL)), + 'date_nav_title' => $base + array( + 'variables' => array( + 'granularity' => NULL, 'view' => NULL, 'link' => NULL, 'format' => NULL + ), + ), 'date_timezone' => $base + array('render element' => 'element'), 'date_select' => $base + array('render element' => 'element'), 'date_text' => $base + array('render element' => 'element'), @@ -2355,7 +2495,11 @@ function date_api_theme($existing, $type, $theme, $path) { 'date_part_label_time' => $base + array('variables' => array('date_part' => NULL, 'element' => NULL)), 'date_views_filter_form' => $base + array('template' => 'date-views-filter-form', 'render element' => 'form'), 'date_calendar_day' => $base + array('variables' => array('date' => NULL)), - 'date_time_ago' => $base + array('variables' => array('start_date' => NULL, 'end_date' => NULL, 'interval' => NULL)), + 'date_time_ago' => $base + array( + 'variables' => array( + 'start_date' => NULL, 'end_date' => NULL, 'interval' => NULL + ), + ), ); } @@ -2375,9 +2519,11 @@ function date_get_timezone($handling, $timezone = '') { case 'date': $timezone = !empty($timezone) ? $timezone : date_default_timezone(); break; + case 'utc': $timezone = 'UTC'; break; + default: $timezone = date_default_timezone(); } @@ -2404,6 +2550,7 @@ function date_get_timezone_db($handling, $timezone = NULL) { // These handling modes all convert to UTC before storing in the DB. $timezone = 'UTC'; break; + case ('date'): if ($timezone == NULL) { // This shouldn't happen, since it's meaning is undefined. But we need @@ -2411,6 +2558,7 @@ function date_get_timezone_db($handling, $timezone = NULL) { $timezone = date_default_timezone(); } break; + case ('none'): default: $timezone = date_default_timezone(); @@ -2465,12 +2613,12 @@ function date_order() { * TRUE if the date range is valid, FALSE otherwise. */ function date_range_valid($string) { - $matches = preg_match('@^(\-[0-9]+|[0-9]{4}):([\+|\-][0-9]+|[0-9]{4})$@', $string); + $matches = preg_match('@^([\+\-][0-9]+|[0-9]{4}):([\+\-][0-9]+|[0-9]{4})$@', $string); return $matches < 1 ? FALSE : TRUE; } /** - * Splits a string like -3:+3 or 2001:2010 into an array of min and max years. + * Splits a string like -3:+3 or 2001:2010 into an array of start and end years. * * Center the range around the current year, if any, but expand it far * enough so it will pick up the year value in the field in case @@ -2482,45 +2630,44 @@ function date_range_valid($string) { * (optional) A date object. Defaults to NULL. * * @return array - * A numerically indexed array, containing a minimum and maximum year. + * A numerically indexed array, containing a start and end year. */ function date_range_years($string, $date = NULL) { $this_year = date_format(date_now(), 'Y'); - list($min_year, $max_year) = explode(':', $string); + list($start_year, $end_year) = explode(':', $string); // Valid patterns would be -5:+5, 0:+1, 2008:2010. - $plus_pattern = '@[\+|\-][0-9]{1,4}@'; + $plus_pattern = '@[\+\-][0-9]{1,4}@'; $year_pattern = '@^[0-9]{4}@'; - if (!preg_match($year_pattern, $min_year, $matches)) { - if (preg_match($plus_pattern, $min_year, $matches)) { - $min_year = $this_year + $matches[0]; + if (!preg_match($year_pattern, $start_year, $matches)) { + if (preg_match($plus_pattern, $start_year, $matches)) { + $start_year = $this_year + $matches[0]; } else { - $min_year = $this_year; + $start_year = $this_year; } } - if (!preg_match($year_pattern, $max_year, $matches)) { - if (preg_match($plus_pattern, $max_year, $matches)) { - $max_year = $this_year + $matches[0]; + if (!preg_match($year_pattern, $end_year, $matches)) { + if (preg_match($plus_pattern, $end_year, $matches)) { + $end_year = $this_year + $matches[0]; } else { - $max_year = $this_year; + $end_year = $this_year; } } - // We expect the $min year to be less than the $max year. - // Some custom values for -99:+99 might not obey that. - if ($min_year > $max_year) { - $temp = $max_year; - $max_year = $min_year; - $min_year = $temp; - } // If there is a current value, stretch the range to include it. $value_year = is_object($date) ? $date->format('Y') : ''; if (!empty($value_year)) { - $min_year = min($value_year, $min_year); - $max_year = max($value_year, $max_year); + if ($start_year <= $end_year) { + $start_year = min($value_year, $start_year); + $end_year = max($value_year, $end_year); + } + else { + $start_year = max($value_year, $start_year); + $end_year = min($value_year, $end_year); + } } - return array($min_year, $max_year); + return array($start_year, $end_year); } /** @@ -2680,6 +2827,7 @@ function date_is_all_day($string1, $string2, $granularity = 'second', $increment || ($hour2 == 23 && in_array($min2, array($max_minutes, 59)) && in_array($sec2, array($max_seconds, 59))) || ($hour1 == 0 && $hour2 == 0 && $min1 == 0 && $min2 == 0 && $sec1 == 0 && $sec2 == 0); break; + case 'minute': $min_match = $time1 == '00:00:00' || ($hour1 == 0 && $min1 == 0); @@ -2687,6 +2835,7 @@ function date_is_all_day($string1, $string2, $granularity = 'second', $increment || ($hour2 == 23 && in_array($min2, array($max_minutes, 59))) || ($hour1 == 0 && $hour2 == 0 && $min1 == 0 && $min2 == 0); break; + case 'hour': $min_match = $time1 == '00:00:00' || ($hour1 == 0); @@ -2694,6 +2843,7 @@ function date_is_all_day($string1, $string2, $granularity = 'second', $increment || ($hour2 == 23) || ($hour1 == 0 && $hour2 == 0); break; + default: $min_match = TRUE; $max_match = FALSE; @@ -2754,15 +2904,21 @@ function date_is_date($date) { } /** - * This function will replace ISO values that have the pattern 9999-00-00T00:00:00 - * with a pattern like 9999-01-01T00:00:00, to match the behavior of non-ISO - * dates and ensure that date objects created from this value contain a valid month - * and day. Without this fix, the ISO date '2020-00-00T00:00:00' would be created as + * Replace specific ISO values using patterns. + * + * Function will replace ISO values that have the pattern 9999-00-00T00:00:00 + * with a pattern like 9999-01-01T00:00:00, to match the behavior of non-ISO dates + * and ensure that date objects created from this value contain a valid month + * and day. + * Without this fix, the ISO date '2020-00-00T00:00:00' would be created as * November 30, 2019 (the previous day in the previous month). * * @param string $iso_string * An ISO string that needs to be made into a complete, valid date. * + * @return mixed|string + * replaced value, or incoming value. + * * @TODO Expand on this to work with all sorts of partial ISO dates. */ function date_make_iso_valid($iso_string) { diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_elements.inc b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_elements.inc index 57e41615..638fcda5 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_elements.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_elements.inc @@ -111,20 +111,24 @@ function date_default_date($element) { $format = DATE_FORMAT_DATETIME; // The text and popup widgets might return less than a full datetime string. - if (strlen($element['#default_value']) < 19) { + if (is_string($element['#default_value']) && strlen($element['#default_value']) < 19) { switch (strlen($element['#default_value'])) { case 16: $format = 'Y-m-d H:i'; break; + case 13: $format = 'Y-m-d H'; break; + case 10: $format = 'Y-m-d'; break; + case 7: $format = 'Y-m'; break; + case 4: $format = 'Y'; break; @@ -170,7 +174,7 @@ function date_year_range_element_process($element, &$form_state, $form) { $element['#attached']['js'][] = drupal_get_path('module', 'date_api') . '/date_year_range.js'; $context = array( - 'form' => $form, + 'form' => $form, ); drupal_alter('date_year_range_process', $element, $form_state, $context); @@ -256,7 +260,7 @@ function date_timezone_element_process($element, &$form_state, $form) { } $context = array( - 'form' => $form, + 'form' => $form, ); drupal_alter('date_timezone_process', $element, $form_state, $context); @@ -264,7 +268,7 @@ function date_timezone_element_process($element, &$form_state, $form) { } /** - * Validation for timezone input + * Validation for timezone input. * * Move the timezone value from the nested field back to the original field. */ @@ -307,7 +311,6 @@ function date_text_element_value_callback($element, $input = FALSE, &$form_state * * The exact parts displayed in the field are those in #date_granularity. * The display of each part comes from #date_format. - * */ function date_text_element_process($element, &$form_state, $form) { if (date_hidden_element($element)) { @@ -316,16 +319,25 @@ function date_text_element_process($element, &$form_state, $form) { $element['#tree'] = TRUE; $element['#theme_wrappers'] = array('date_text'); - $element['date']['#value'] = $element['#value']['date']; + $element['date']['#value'] = isset($element['#value']['date']) ? $element['#value']['date'] : ''; $element['date']['#type'] = 'textfield'; $element['date']['#weight'] = !empty($element['date']['#weight']) ? $element['date']['#weight'] : $element['#weight']; $element['date']['#attributes'] = array('class' => isset($element['#attributes']['class']) ? $element['#attributes']['class'] += array('date-date') : array('date-date')); $now = date_example_date(); $element['date']['#title'] = t('Date'); $element['date']['#title_display'] = 'invisible'; - $element['date']['#description'] = ' ' . t('Format: @date', array('@date' => date_format_date(date_example_date(), 'custom', $element['#date_format']))); + $element['date']['#description'] = ' ' . t('Format: @date', array( + '@date' => date_format_date(date_example_date(), 'custom', $element['#date_format'] + ))); $element['date']['#ajax'] = !empty($element['#ajax']) ? $element['#ajax'] : FALSE; + // Make changes if instance is set to be rendered as a regular field. + if (!empty($element['#instance']['widget']['settings']['no_fieldset']) && $element['#field']['cardinality'] == 1) { + $element['date']['#title'] = check_plain($element['#instance']['label']); + $element['date']['#title_display'] = $element['#title_display']; + $element['date']['#required'] = $element['#required']; + } + // Keep the system from creating an error message for the sub-element. // We'll set our own message on the parent element. // $element['date']['#required'] = $element['#required']; @@ -341,7 +353,7 @@ function date_text_element_process($element, &$form_state, $form) { } $context = array( - 'form' => $form, + 'form' => $form, ); drupal_alter('date_text_process', $element, $form_state, $context); @@ -349,12 +361,11 @@ function date_text_element_process($element, &$form_state, $form) { } /** - * Validation for text input. + * Validation for text input. * * When used as a Views widget, the validation step always gets triggered, * even with no form submission. Before form submission $element['#value'] * contains a string, after submission it contains an array. - * */ function date_text_validate($element, &$form_state) { if (date_hidden_element($element)) { @@ -367,6 +378,11 @@ function date_text_validate($element, &$form_state) { $input_exists = NULL; $input = drupal_array_get_nested_value($form_state['values'], $element['#parents'], $input_exists); + // Trim extra spacing off user input of text fields. + if (isset($input['date'])) { + $input['date'] = trim($input['date']); + } + drupal_alter('date_text_pre_validate', $element, $form_state, $input); $label = !empty($element['#date_title']) ? $element['#date_title'] : (!empty($element['#title']) ? $element['#title'] : ''); @@ -421,7 +437,14 @@ function date_text_input_date($element, $input) { * Element value callback for date_select element. */ function date_select_element_value_callback($element, $input = FALSE, &$form_state = array()) { - $return = array('year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => '', 'second' => ''); + $return = array( + 'year' => '', + 'month' => '', + 'day' => '', + 'hour' => '', + 'minute' => '', + 'second' => '', + ); $date = NULL; if ($input !== FALSE) { $return = $input; @@ -431,7 +454,14 @@ function date_select_element_value_callback($element, $input = FALSE, &$form_sta $date = date_default_date($element); } $granularity = date_format_order($element['#date_format']); - $formats = array('year' => 'Y', 'month' => 'n', 'day' => 'j', 'hour' => 'H', 'minute' => 'i', 'second' => 's'); + $formats = array( + 'year' => 'Y', + 'month' => 'n', + 'day' => 'j', + 'hour' => 'H', + 'minute' => 'i', + 'second' => 's', + ); foreach ($granularity as $field) { if ($field != 'timezone') { $return[$field] = date_is_date($date) ? $date->format($formats[$field]) : ''; @@ -449,7 +479,6 @@ function date_select_element_value_callback($element, $input = FALSE, &$form_sta * * The exact parts displayed in the field are those in #date_granularity. * The display of each part comes from ['#date_settings']['format']. - * */ function date_select_element_process($element, &$form_state, $form) { if (date_hidden_element($element)) { @@ -473,7 +502,14 @@ function date_select_element_process($element, &$form_state, $form) { // Store a hidden value for all date parts not in the current display. $granularity = date_format_order($element['#date_format']); - $formats = array('year' => 'Y', 'month' => 'n', 'day' => 'j', 'hour' => 'H', 'minute' => 'i', 'second' => 's'); + $formats = array( + 'year' => 'Y', + 'month' => 'n', + 'day' => 'j', + 'hour' => 'H', + 'minute' => 'i', + 'second' => 's', + ); foreach (date_nongranularity($granularity) as $field) { if ($field != 'timezone') { $element[$field] = array( @@ -490,7 +526,7 @@ function date_select_element_process($element, &$form_state, $form) { } $context = array( - 'form' => $form, + 'form' => $form, ); drupal_alter('date_select_process', $element, $form_state, $context); @@ -521,7 +557,7 @@ function date_parts_element($element, $date, $format) { $sub_element = array('#granularity' => $granularity); $order = array_flip($granularity); - $hours_format = strpos(strtolower($element['#date_format']), 'a') ? 'g': 'G'; + $hours_format = strpos(strtolower($element['#date_format']), 'a') ? 'g' : 'G'; $month_function = strpos($element['#date_format'], 'F') !== FALSE ? 'date_month_names' : 'date_month_names_abbr'; $count = 0; $increment = min(intval($element['#date_increment']), 1); @@ -539,26 +575,29 @@ function date_parts_element($element, $date, $format) { switch ($field) { case 'year': $range = date_range_years($element['#date_year_range'], $date); - $min_year = $range[0]; - $max_year = $range[1]; + $start_year = $range[0]; + $end_year = $range[1]; $sub_element[$field]['#default_value'] = is_object($date) ? $date->format('Y') : ''; if ($part_type == 'select') { - $sub_element[$field]['#options'] = drupal_map_assoc(date_years($min_year, $max_year, $part_required)); + $sub_element[$field]['#options'] = drupal_map_assoc(date_years($start_year, $end_year, $part_required)); } break; + case 'month': $sub_element[$field]['#default_value'] = is_object($date) ? $date->format('n') : ''; if ($part_type == 'select') { $sub_element[$field]['#options'] = $month_function($part_required); } break; + case 'day': $sub_element[$field]['#default_value'] = is_object($date) ? $date->format('j') : ''; if ($part_type == 'select') { $sub_element[$field]['#options'] = drupal_map_assoc(date_days($part_required)); } break; + case 'hour': $sub_element[$field]['#default_value'] = is_object($date) ? $date->format($hours_format) : ''; if ($part_type == 'select') { @@ -566,6 +605,7 @@ function date_parts_element($element, $date, $format) { } $sub_element[$field]['#prefix'] = theme('date_part_hour_prefix', $element); break; + case 'minute': $sub_element[$field]['#default_value'] = is_object($date) ? $date->format('i') : ''; if ($part_type == 'select') { @@ -573,6 +613,7 @@ function date_parts_element($element, $date, $format) { } $sub_element[$field]['#prefix'] = theme('date_part_minsec_prefix', $element); break; + case 'second': $sub_element[$field]['#default_value'] = is_object($date) ? $date->format('s') : ''; if ($part_type == 'select') { diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_ical.inc b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_ical.inc index 2ca484e7..4911298c 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_ical.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_ical.inc @@ -181,6 +181,7 @@ function date_ical_parse($icaldatafolded = array()) { $parent[array_pop($parents)][] = array_pop($subgroups); } break; + // Add the timezones in with their index their TZID. case 'VTIMEZONE': $subgroup = end($subgroups); @@ -196,6 +197,7 @@ function date_ical_parse($icaldatafolded = array()) { array_pop($subgroups); array_pop($parents); break; + // Do some fun stuff with durations and all_day events and then append // to parent. case 'VEVENT': @@ -222,9 +224,9 @@ function date_ical_parse($icaldatafolded = array()) { // assumes the end date is inclusive. if (!empty($subgroup['DTEND']) && (!empty($subgroup['DTEND']['all_day']))) { // Make the end date one day earlier. - $date = new DateObject ($subgroup['DTEND']['datetime'] . ' 00:00:00', $subgroup['DTEND']['tz']); + $date = new DateObject($subgroup['DTEND']['datetime'] . ' 00:00:00', $subgroup['DTEND']['tz']); date_modify($date, '-1 day'); - $subgroup['DTEND']['datetime'] = date_format($date, 'Y-m-d'); + $subgroup['DTEND']['datetime'] = date_format($date, 'Y-m-d'); } // If a start datetime is defined AND there is no definition for // the end datetime THEN make the end datetime equal the start @@ -239,7 +241,7 @@ function date_ical_parse($icaldatafolded = array()) { if (!empty($subgroup['DTSTART']['all_day'])) { $subgroup['all_day'] = TRUE; } - // Add this element to the parent as an array under the + // Add this element to the parent as an array under the. prev($subgroups); $parent = &$subgroups[key($subgroups)]; @@ -264,12 +266,13 @@ function date_ical_parse($icaldatafolded = array()) { $field = !empty($matches[2]) ? $matches[2] : ''; $data = !empty($matches[3]) ? $matches[3] : ''; $parse_result = ''; + switch ($name) { // Keep blank lines out of the results. case '': break; - // Lots of properties have date values that must be parsed out. + // Lots of properties have date values that must be parsed out. case 'CREATED': case 'LAST-MODIFIED': case 'DTSTART': @@ -317,9 +320,9 @@ function date_ical_parse($icaldatafolded = array()) { $parse_result = date_ical_parse_location($field, $data); break; - // For all other properties, just store the property and the value. - // This can be expanded on in the future if other properties should - // be given special treatment. + // For all other properties, just store the property and the value. + // This can be expanded on in the future if other properties should + // be given special treatment. default: $parse_result = $data; break; @@ -360,7 +363,7 @@ function date_ical_parse($icaldatafolded = array()) { * has no timezone; the ical specs say no timezone * conversion should be done if no timezone info is * supplied - * @todo + * @todo * Another option for dates is the format PROPERTY;VALUE=PERIOD:XXXX. The * period may include a duration, or a date and a duration, or two dates, so * would have to be split into parts and run through date_ical_parse_date() @@ -401,6 +404,7 @@ function date_ical_parse_date($field, $data) { // Date. $datetime = date_pad($regs[1]) . '-' . date_pad($regs[2]) . '-' . date_pad($regs[3]); break; + case 'DATE-TIME': preg_match(DATE_REGEX_ICAL_DATETIME, $data, $regs); // Date. @@ -519,12 +523,12 @@ function date_ical_parse_duration(&$subgroup, $field = 'DURATION') { $data = $items['DATA']; preg_match('/^P(\d{1,4}[Y])?(\d{1,2}[M])?(\d{1,2}[W])?(\d{1,2}[D])?([T]{0,1})?(\d{1,2}[H])?(\d{1,2}[M])?(\d{1,2}[S])?/', $data, $duration); $items['year'] = isset($duration[1]) ? str_replace('Y', '', $duration[1]) : ''; - $items['month'] = isset($duration[2]) ?str_replace('M', '', $duration[2]) : ''; - $items['week'] = isset($duration[3]) ?str_replace('W', '', $duration[3]) : ''; - $items['day'] = isset($duration[4]) ?str_replace('D', '', $duration[4]) : ''; - $items['hour'] = isset($duration[6]) ?str_replace('H', '', $duration[6]) : ''; - $items['minute'] = isset($duration[7]) ?str_replace('M', '', $duration[7]) : ''; - $items['second'] = isset($duration[8]) ?str_replace('S', '', $duration[8]) : ''; + $items['month'] = isset($duration[2]) ? str_replace('M', '', $duration[2]) : ''; + $items['week'] = isset($duration[3]) ? str_replace('W', '', $duration[3]) : ''; + $items['day'] = isset($duration[4]) ? str_replace('D', '', $duration[4]) : ''; + $items['hour'] = isset($duration[6]) ? str_replace('H', '', $duration[6]) : ''; + $items['minute'] = isset($duration[7]) ? str_replace('M', '', $duration[7]) : ''; + $items['second'] = isset($duration[8]) ? str_replace('S', '', $duration[8]) : ''; $start_date = array_key_exists('DTSTART', $subgroup) ? $subgroup['DTSTART']['datetime'] : date_format(date_now(), DATE_FORMAT_ISO); $timezone = array_key_exists('DTSTART', $subgroup) ? $subgroup['DTSTART']['tz'] : variable_get('date_default_timezone'); if (empty($timezone)) { @@ -542,7 +546,7 @@ function date_ical_parse_duration(&$subgroup, $field = 'DURATION') { 'datetime' => date_format($date2, DATE_FORMAT_DATETIME), 'all_day' => isset($subgroup['DTSTART']['all_day']) ? $subgroup['DTSTART']['all_day'] : 0, 'tz' => $timezone, - ); + ); $duration = date_format($date2, 'U') - date_format($date, 'U'); $subgroup['DURATION'] = array('DATA' => $data, 'DURATION' => $duration); } @@ -631,7 +635,6 @@ function date_ical_date($ical_date, $to_tz = FALSE) { * * @return string * Escaped text - * */ function date_ical_escape_text($text) { $text = drupal_html_to_text($text); @@ -693,14 +696,14 @@ function date_ical_escape_text($text) { * ) */ function date_api_ical_build_rrule($form_values) { - $RRULE = ''; + $rrule = ''; if (empty($form_values) || !is_array($form_values)) { - return $RRULE; + return $rrule; } // Grab the RRULE data and put them into iCal RRULE format. - $RRULE .= 'RRULE:FREQ=' . (!array_key_exists('FREQ', $form_values) ? 'DAILY' : $form_values['FREQ']); - $RRULE .= ';INTERVAL=' . (!array_key_exists('INTERVAL', $form_values) ? 1 : $form_values['INTERVAL']); + $rrule .= 'RRULE:FREQ=' . (!array_key_exists('FREQ', $form_values) ? 'DAILY' : $form_values['FREQ']); + $rrule .= ';INTERVAL=' . (!array_key_exists('INTERVAL', $form_values) ? 1 : $form_values['INTERVAL']); // Unset the empty 'All' values. if (array_key_exists('BYDAY', $form_values) && is_array($form_values['BYDAY'])) { @@ -713,14 +716,14 @@ function date_api_ical_build_rrule($form_values) { unset($form_values['BYMONTHDAY']['']); } - if (array_key_exists('BYDAY', $form_values) && is_array($form_values['BYDAY']) && $BYDAY = implode(",", $form_values['BYDAY'])) { - $RRULE .= ';BYDAY=' . $BYDAY; + if (array_key_exists('BYDAY', $form_values) && is_array($form_values['BYDAY']) && $byday = implode(",", $form_values['BYDAY'])) { + $rrule .= ';BYDAY=' . $byday; } - if (array_key_exists('BYMONTH', $form_values) && is_array($form_values['BYMONTH']) && $BYMONTH = implode(",", $form_values['BYMONTH'])) { - $RRULE .= ';BYMONTH=' . $BYMONTH; + if (array_key_exists('BYMONTH', $form_values) && is_array($form_values['BYMONTH']) && $bymonth = implode(",", $form_values['BYMONTH'])) { + $rrule .= ';BYMONTH=' . $bymonth; } - if (array_key_exists('BYMONTHDAY', $form_values) && is_array($form_values['BYMONTHDAY']) && $BYMONTHDAY = implode(",", $form_values['BYMONTHDAY'])) { - $RRULE .= ';BYMONTHDAY=' . $BYMONTHDAY; + if (array_key_exists('BYMONTHDAY', $form_values) && is_array($form_values['BYMONTHDAY']) && $bymonthday = implode(",", $form_values['BYMONTHDAY'])) { + $rrule .= ';BYMONTHDAY=' . $bymonthday; } // The UNTIL date is supposed to always be expressed in UTC. // The input date values may already have been converted to a date object on a @@ -731,8 +734,17 @@ function date_api_ical_build_rrule($form_values) { if (!is_object($form_values['UNTIL']['datetime'])) { // If this is a date without time, give it time. if (strlen($form_values['UNTIL']['datetime']) < 11) { + $granularity_options = drupal_map_assoc(array( + 'year', + 'month', + 'day', + 'hour', + 'minute', + 'second', + )); + $form_values['UNTIL']['datetime'] .= ' 23:59:59'; - $form_values['UNTIL']['granularity'] = serialize(drupal_map_assoc(array('year', 'month', 'day', 'hour', 'minute', 'second'))); + $form_values['UNTIL']['granularity'] = serialize($granularity_options); $form_values['UNTIL']['all_day'] = FALSE; } $until = date_ical_date($form_values['UNTIL'], 'UTC'); @@ -740,21 +752,21 @@ function date_api_ical_build_rrule($form_values) { else { $until = $form_values['UNTIL']['datetime']; } - $RRULE .= ';UNTIL=' . date_format($until, DATE_FORMAT_ICAL) . 'Z'; + $rrule .= ';UNTIL=' . date_format($until, DATE_FORMAT_ICAL) . 'Z'; } // Our form doesn't allow a value for COUNT, but it may be needed by // modules using the API, so add it to the rule. if (array_key_exists('COUNT', $form_values)) { - $RRULE .= ';COUNT=' . $form_values['COUNT']; + $rrule .= ';COUNT=' . $form_values['COUNT']; } // iCal rules presume the week starts on Monday unless otherwise specified, // so we'll specify it. if (array_key_exists('WKST', $form_values)) { - $RRULE .= ';WKST=' . $form_values['WKST']; + $rrule .= ';WKST=' . $form_values['WKST']; } else { - $RRULE .= ';WKST=' . date_repeat_dow2day(variable_get('date_first_day', 0)); + $rrule .= ';WKST=' . date_repeat_dow2day(variable_get('date_first_day', 0)); } // Exceptions dates go last, on their own line. @@ -765,7 +777,7 @@ function date_api_ical_build_rrule($form_values) { foreach ($form_values['EXDATE'] as $value) { if (!empty($value['datetime'])) { $date = !is_object($value['datetime']) ? date_ical_date($value, 'UTC') : $value['datetime']; - $ex_date = !empty($date) ? date_format($date, DATE_FORMAT_ICAL) . 'Z': ''; + $ex_date = !empty($date) ? date_format($date, DATE_FORMAT_ICAL) . 'Z' : ''; if (!empty($ex_date)) { $ex_dates[] = $ex_date; } @@ -773,11 +785,11 @@ function date_api_ical_build_rrule($form_values) { } if (!empty($ex_dates)) { sort($ex_dates); - $RRULE .= chr(13) . chr(10) . 'EXDATE:' . implode(',', $ex_dates); + $rrule .= chr(13) . chr(10) . 'EXDATE:' . implode(',', $ex_dates); } } elseif (!empty($form_values['EXDATE'])) { - $RRULE .= chr(13) . chr(10) . 'EXDATE:' . $form_values['EXDATE']; + $rrule .= chr(13) . chr(10) . 'EXDATE:' . $form_values['EXDATE']; } // Exceptions dates go last, on their own line. @@ -785,19 +797,19 @@ function date_api_ical_build_rrule($form_values) { $ex_dates = array(); foreach ($form_values['RDATE'] as $value) { $date = !is_object($value['datetime']) ? date_ical_date($value, 'UTC') : $value['datetime']; - $ex_date = !empty($date) ? date_format($date, DATE_FORMAT_ICAL) . 'Z': ''; + $ex_date = !empty($date) ? date_format($date, DATE_FORMAT_ICAL) . 'Z' : ''; if (!empty($ex_date)) { $ex_dates[] = $ex_date; } } if (!empty($ex_dates)) { sort($ex_dates); - $RRULE .= chr(13) . chr(10) . 'RDATE:' . implode(',', $ex_dates); + $rrule .= chr(13) . chr(10) . 'RDATE:' . implode(',', $ex_dates); } } elseif (!empty($form_values['RDATE'])) { - $RRULE .= chr(13) . chr(10) . 'RDATE:' . $form_values['RDATE']; + $rrule .= chr(13) . chr(10) . 'RDATE:' . $form_values['RDATE']; } - return $RRULE; + return $rrule; } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_sql.inc b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_sql.inc index e02f0507..a95ca4ef 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_sql.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/date_api_sql.inc @@ -23,13 +23,14 @@ function date_sql_concat($array) { switch (Database::getConnection()->databaseType()) { case 'mysql': return "CONCAT(" . implode(",", $array) . ")"; + case 'pgsql': return implode(" || ", $array); } } /** - * Helper function to do cross-database NULL replacements + * Helper function to do cross-database NULL replacements. * * @param array $array * An array of values to test for NULL values. @@ -61,6 +62,7 @@ function date_sql_pad($str, $size = 2, $pad = '0', $side = 'l') { switch ($side) { case 'r': return "RPAD($str, $size, '$pad')"; + default: return "LPAD($str, $size, '$pad')"; } @@ -69,6 +71,7 @@ function date_sql_pad($str, $size = 2, $pad = '0', $side = 'l') { /** * A class to manipulate date SQL. */ +// @codingStandardsIgnoreStart class date_sql_handler { var $db_type = NULL; var $date_type = DATE_DATETIME; @@ -86,7 +89,7 @@ class date_sql_handler { /** * The object constuctor. */ - function __construct($date_type = DATE_DATETIME, $local_timezone = NULL, $offset = '+00:00') { + public function __construct($date_type = DATE_DATETIME, $local_timezone = NULL, $offset = '+00:00') { $this->db_type = Database::getConnection()->databaseType(); $this->date_type = $date_type; $this->db_timezone = 'UTC'; @@ -97,7 +100,7 @@ class date_sql_handler { /** * See if the db has timezone name support. */ - function db_tz_support($reset = FALSE) { + public function db_tz_support($reset = FALSE) { $has_support = variable_get('date_db_tz_support', -1); if ($has_support == -1 || $reset) { $has_support = FALSE; @@ -108,6 +111,7 @@ class date_sql_handler { $has_support = TRUE; } break; + case 'pgsql': $test = db_query("SELECT '2008-02-15 12:00:00 UTC' AT TIME ZONE 'US/Central'")->fetchField(); if ($test == '2008-02-15 06:00:00') { @@ -136,7 +140,7 @@ class date_sql_handler { * set a fixed offset, not a timezone, so any value other than * '+00:00' should be used with caution. */ - function set_db_timezone($offset = '+00:00') { + public function set_db_timezone($offset = '+00:00') { static $already_set = FALSE; $type = Database::getConnection()->databaseType(); if (!$already_set) { @@ -144,9 +148,11 @@ class date_sql_handler { case 'mysql': db_query("SET @@session.time_zone = '$offset'"); break; + case 'pgsql': db_query("SET TIME ZONE INTERVAL '$offset' HOUR TO MINUTE"); break; + case 'sqlsrv': // Issue #1201342, This is the wrong way to set the timezone, this // still needs to be fixed. In the meantime, commenting this out makes @@ -161,7 +167,7 @@ class date_sql_handler { /** * Return timezone offset for the date being processed. */ - function get_offset($comp_date = NULL) { + public function get_offset($comp_date = NULL) { if (!empty($this->db_timezone) && !empty($this->local_timezone)) { if ($this->db_timezone != $this->local_timezone) { if (empty($comp_date)) { @@ -199,47 +205,57 @@ class date_sql_handler { case DATE_UNIX: $field = "FROM_UNIXTIME($field)"; break; + case DATE_ISO: $field = "STR_TO_DATE($field, '%Y-%m-%dT%T')"; break; + case DATE_DATETIME: break; } break; + case 'pgsql': switch ($this->date_type) { case DATE_UNIX: $field = "$field::ABSTIME"; break; + case DATE_ISO: $field = "TO_DATE($field, 'FMYYYY-FMMM-FMDDTFMHH24:FMMI:FMSS')"; break; + case DATE_DATETIME: break; } break; + case 'sqlite': switch ($this->date_type) { case DATE_UNIX: $field = "datetime($field, 'unixepoch')"; break; + case DATE_ISO: case DATE_DATETIME: $field = "datetime($field)"; break; } break; + case 'sqlsrv': switch ($this->date_type) { case DATE_UNIX: $field = "DATEADD(s, $field, '19700101 00:00:00:000')"; break; + case DATE_ISO: case DATE_DATETIME: $field = "CAST($field as smalldatetime)"; break; } break; + break; } // Adjust the resulting value to the right timezone/offset. @@ -254,10 +270,13 @@ class date_sql_handler { switch ($this->db_type) { case 'mysql': return "ADDTIME($field, SEC_TO_TIME($offset))"; + case 'pgsql': - return "($field + INTERVAL '$offset SECONDS')";; + return "($field + INTERVAL '$offset SECONDS')"; + case 'sqlite': return "datetime($field, '$offset seconds')"; + case 'sqlsrv': return "DATEADD(second, $offset, $field)"; } @@ -285,6 +304,7 @@ class date_sql_handler { switch ($direction) { case 'ADD': return "DATE_ADD($field, INTERVAL $count $granularity)"; + case 'SUB': return "DATE_SUB($field, INTERVAL $count $granularity)"; } @@ -294,6 +314,7 @@ class date_sql_handler { switch ($direction) { case 'ADD': return "($field + INTERVAL '$count $granularity')"; + case 'SUB': return "($field - INTERVAL '$count $granularity')"; } @@ -302,6 +323,7 @@ class date_sql_handler { switch ($direction) { case 'ADD': return "datetime($field, '+$count $granularity')"; + case 'SUB': return "datetime($field, '-$count $granularity')"; } @@ -352,6 +374,7 @@ class date_sql_handler { switch ($this->db_type) { case 'mysql': return "CONVERT_TZ($field, $db_zone, $localzone)"; + case 'pgsql': // WITH TIME ZONE assumes the date is using the system // timezone, which should have been set to UTC. @@ -395,6 +418,7 @@ class date_sql_handler { ); $format = strtr($format, $replace); return "DATE_FORMAT($field, '$format')"; + case 'pgsql': $replace = array( 'Y' => 'YYYY', @@ -421,6 +445,7 @@ class date_sql_handler { ); $format = strtr($format, $replace); return "TO_CHAR($field, '$format')"; + case 'sqlite': $replace = array( // 4 digit year number. @@ -460,6 +485,7 @@ class date_sql_handler { ); $format = strtr($format, $replace); return "strftime('$format', $field)"; + case 'sqlsrv': $replace = array( // 4 digit year number. @@ -528,18 +554,25 @@ class date_sql_handler { switch (strtoupper($extract_type)) { case 'DATE': return $field; + case 'YEAR': return "EXTRACT(YEAR FROM($field))"; + case 'MONTH': return "EXTRACT(MONTH FROM($field))"; + case 'DAY': return "EXTRACT(DAY FROM($field))"; + case 'HOUR': return "EXTRACT(HOUR FROM($field))"; + case 'MINUTE': return "EXTRACT(MINUTE FROM($field))"; + case 'SECOND': return "EXTRACT(SECOND FROM($field))"; + // ISO week number for date. case 'WEEK': switch ($this->db_type) { @@ -547,6 +580,7 @@ class date_sql_handler { // WEEK using arg 3 in MySQl should return the same value as // Postgres EXTRACT. return "WEEK($field, 3)"; + case 'pgsql': return "EXTRACT(WEEK FROM($field))"; } @@ -556,6 +590,7 @@ class date_sql_handler { // MySQL returns 1 for Sunday through 7 for Saturday, PHP date // functions and Postgres use 0 for Sunday and 6 for Saturday. return "INTEGER(DAYOFWEEK($field) - 1)"; + case 'pgsql': return "EXTRACT(DOW FROM($field))"; } @@ -563,6 +598,7 @@ class date_sql_handler { switch ($this->db_type) { case 'mysql': return "DAYOFYEAR($field)"; + case 'pgsql': return "EXTRACT(DOY FROM($field))"; } @@ -775,8 +811,7 @@ class date_sql_handler { } /** - * Create a complete datetime value out of an - * incomplete array of selected values. + * Create a complete date/time value out of an incomplete array of values. * * For example, array('year' => 2008, 'month' => 05) will fill * in the day, hour, minute and second with the earliest possible @@ -795,9 +830,11 @@ class date_sql_handler { case 'empty_min': case 'min': return date_format($dates[0], 'Y-m-d H:i:s'); + case 'empty_max': case 'max': return date_format($dates[1], 'Y-m-d H:i:s'); + default: return; } @@ -840,7 +877,7 @@ class date_sql_handler { } /** - * A function to test the validity of various date parts + * A function to test the validity of various date parts. */ function part_is_valid($value, $type) { if (!preg_match('/^[0-9]*$/', $value)) { @@ -856,16 +893,19 @@ class date_sql_handler { return FALSE; } break; + case 'month': if ($value < 0 || $value > 12) { return FALSE; } break; + case 'day': if ($value < 0 || $value > 31) { return FALSE; } break; + case 'week': if ($value < 0 || $value > 53) { return FALSE; @@ -890,26 +930,36 @@ class date_sql_handler { $formats['display'] = 'Y'; $formats['sql'] = 'Y'; break; + case 'month': $formats['display'] = date_limit_format($short, array('year', 'month')); $formats['sql'] = 'Y-m'; break; + case 'day': - $formats['display'] = date_limit_format($short, array('year', 'month', 'day')); + $args = array('year', 'month', 'day'); + $formats['display'] = date_limit_format($short, $args); $formats['sql'] = 'Y-m-d'; break; + case 'hour': - $formats['display'] = date_limit_format($short, array('year', 'month', 'day', 'hour')); + $args = array('year', 'month', 'day', 'hour'); + $formats['display'] = date_limit_format($short, $args); $formats['sql'] = 'Y-m-d\TH'; break; + case 'minute': - $formats['display'] = date_limit_format($short, array('year', 'month', 'day', 'hour', 'minute')); + $args = array('year', 'month', 'day', 'hour', 'minute'); + $formats['display'] = date_limit_format($short, $args); $formats['sql'] = 'Y-m-d\TH:i'; break; + case 'second': - $formats['display'] = date_limit_format($short, array('year', 'month', 'day', 'hour', 'minute', 'second')); + $args = array('year', 'month', 'day', 'hour', 'minute', 'second'); + $formats['display'] = date_limit_format($short, $args); $formats['sql'] = 'Y-m-d\TH:i:s'; break; + case 'week': $formats['display'] = 'F j Y (W)'; $formats['sql'] = 'Y-\WW'; @@ -927,7 +977,7 @@ class date_sql_handler { '#type' => 'radios', '#default_value' => $granularity, '#options' => $this->date_parts(), - ); + ); return $form; } @@ -1030,7 +1080,6 @@ class date_sql_handler { $direction = $results[1]; $count = $results[2]; $item = $results[3]; - $replace = array( 'now' => '@', '+' => 'P', @@ -1051,14 +1100,27 @@ class date_sql_handler { 'second' => 'S', ' ' => '', ' ' => '', - ); - $prefix = in_array($item, array('hours', 'hour', 'minutes', 'minute', 'seconds', 'second')) ? 'T' : ''; - return $prefix . strtr($direction, $replace) . $count . strtr($item, $replace); + ); + $args = array('hours', 'hour', 'minutes', 'minute', 'seconds', 'second'); + if (in_array($item, $args)) { + $prefix = 'T'; + } + else { + $prefix = ''; + } + $return = $prefix; + $return .= strtr($direction, $replace); + $return .= $count; + $return .= strtr($item, $replace); + + return $return; } /** - * Use the parsed values from the ISO argument to determine the - * granularity of this period. + * Granularity arguments handler. + * + * Use the parsed values from the ISO argument + * to determine the granularity of this period. */ function arg_granularity($arg) { $granularity = ''; @@ -1137,8 +1199,9 @@ class date_sql_handler { } return array($min_date, $max_date); } - // Intercept invalid info and fall back to the current date. + // Intercept invalid info and fall back to the current date. $now = date_now(); return array($now, $now); } } +// @codingStandardsIgnoreEnd diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_api/theme/theme.inc b/profiles/commerce_kickstart/modules/contrib/date/date_api/theme/theme.inc index 032e3e93..0a57ecd0 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_api/theme/theme.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_api/theme/theme.inc @@ -194,6 +194,7 @@ function theme_date_calendar_day($variables) { function theme_date_time_ago($variables) { $start_date = $variables['start_date']; $end_date = $variables['end_date']; + $use_end_date = isset($variables['use_end_date']) ? $variables['use_end_date'] : false; $interval = !empty($variables['interval']) ? $variables['interval'] : 2; $display = isset($variables['interval_display']) ? $variables['interval_display'] : 'time ago'; @@ -202,28 +203,43 @@ function theme_date_time_ago($variables) { return; } + // We use the end date only when the option is checked. + if ($use_end_date){ + $date = date_format($end_date, DATE_FORMAT_UNIX); + } + else { + $date = date_format($start_date, DATE_FORMAT_UNIX); + } + // Time to compare dates to. + $now = date_format(date_now(), DATE_FORMAT_UNIX); - $start = date_format($start_date, DATE_FORMAT_UNIX); - // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence) - $time_diff = $now - $start; + // Will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence). + $time_diff = $now - $date; // Uses the same options used by Views format_interval. switch ($display) { case 'raw time ago': return format_interval($time_diff, $interval); + case 'time ago': return t('%time ago', array('%time' => format_interval($time_diff, $interval))); + case 'raw time hence': return format_interval(-$time_diff, $interval); + case 'time hence': return t('%time hence', array('%time' => format_interval(-$time_diff, $interval))); + case 'raw time span': return ($time_diff < 0 ? '-' : '') . format_interval(abs($time_diff), $interval); + case 'inverse time span': return ($time_diff > 0 ? '-' : '') . format_interval(abs($time_diff), $interval); + case 'time span': return t(($time_diff < 0 ? '%time hence' : '%time ago'), array('%time' => format_interval(abs($time_diff), $interval))); + } } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.info b/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.info index 1d8a551d..97cb8c9d 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.info +++ b/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.info @@ -8,9 +8,9 @@ dependencies[] = context files[] = date_context.module files[] = plugins/date_context_date_condition.inc -; Information added by Drupal.org packaging script on 2014-07-29 -version = "7.x-2.8" +; Information added by Drupal.org packaging script on 2017-04-07 +version = "7.x-2.10" core = "7.x" project = "date" -datestamp = "1406653438" +datestamp = "1491562090" diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.module b/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.module index 44e975ac..9b568e15 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.module +++ b/profiles/commerce_kickstart/modules/contrib/date/date_context/date_context.module @@ -1,5 +1,8 @@ execute() @@ -8,8 +11,6 @@ * Cache the date processing, perhaps cache the formatted, timezone-adjusted * date strings for each entity (would have to be cached differently for each * timezone, based on the tz_handling method for the date). - * - * Add an option to set/not set the context on forms vs views. */ /** @@ -22,7 +23,7 @@ function date_context_context_node_condition_alter($node, $op) { } /** - * Implements hook_context_plugins() + * Implements hook_context_plugins(). */ function date_context_context_plugins() { $plugins = array(); @@ -38,7 +39,7 @@ function date_context_context_plugins() { } /** - * Implements hook_context_registry() + * Implements hook_context_registry(). */ function date_context_context_registry() { return array( @@ -51,4 +52,3 @@ function date_context_context_registry() { ), ); } - diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_context/plugins/date_context_date_condition.inc b/profiles/commerce_kickstart/modules/contrib/date/date_context/plugins/date_context_date_condition.inc index 573b0354..97c18b47 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_context/plugins/date_context_date_condition.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_context/plugins/date_context_date_condition.inc @@ -1,10 +1,20 @@ $field) { @@ -15,10 +25,13 @@ class date_context_date_condition extends context_condition_node { return $values; } - function options_form($context) { + /** + * {@inheritdoc} + */ + public function options_form($context) { $defaults = $this->fetch_from_context($context, 'options'); $options = array( - '<' => t('Is less than'), + '<' => t('Is less than'), '<=' => t('Is less than or equal to'), '>=' => t('Is greater than or equal to'), '>' => t('Is greater than'), @@ -27,6 +40,8 @@ class date_context_date_condition extends context_condition_node { 'empty' => t('Is empty'), 'not empty' => t('Is not Empty'), ); + $dependency_options = array('<', '<=', '>', '>=', '=', '!='); + $form['operation'] = array( '#title' => t('Operation'), '#type' => 'select', @@ -41,12 +56,15 @@ class date_context_date_condition extends context_condition_node { '#description' => t("The value the field should contain to meet the condition. This can either be an absolute date in ISO format (YYYY-MM-DDTHH:MM:SS) or a relative string like '12AM today'. Examples: 2011-12-31T00:00:00, now, now +1 day, 12AM today, Monday next week. More examples of relative date formats in the PHP documentation.", array('@relative_format' => 'http://www.php.net/manual/en/datetime.formats.relative.php')), '#default_value' => isset($defaults['value']) ? $defaults['value'] : '', '#process' => array('ctools_dependent_process'), - '#dependency' => array('edit-conditions-plugins-date-context-date-condition-options-operation' => array('<', '<=', '>', '>=', '=', '!=')), + '#dependency' => array('edit-conditions-plugins-date-context-date-condition-options-operation' => $dependency_options), ); return $form; } - function execute($entity, $op) { + /** + * {@inheritdoc} + */ + public function execute($entity, $op) { if (in_array($op, array('view', 'form'))) { foreach ($this->get_contexts() as $context) { $options = $this->fetch_from_context($context, 'options'); @@ -91,32 +109,37 @@ class date_context_date_condition extends context_condition_node { str_replace('now', 'today', $options['value']); $date = date_create($options['value'], date_default_timezone_object()); $compdate = $date->format(DATE_FORMAT_DATETIME); - switch($options['operation']) { + switch ($options['operation']) { case '=': if ($date2 >= $compdate && $date1 <= $compdate) { $this->condition_met($context, $field_name); } break; + case '>': if ($date1 > $compdate) { $this->condition_met($context, $field_name); } break; + case '>=': if ($date1 >= $compdate) { $this->condition_met($context, $field_name); } break; + case '<': if ($date2 < $compdate) { $this->condition_met($context, $field_name); } break; + case '<=': if ($date2 <= $compdate) { $this->condition_met($context, $field_name); } break; + case '!=': if ($date1 < $compdate || $date2 > $compdate) { $this->condition_met($context, $field_name); @@ -130,3 +153,4 @@ class date_context_date_condition extends context_condition_node { } } } +// @codingStandardsIgnoreEnd diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_elements.inc b/profiles/commerce_kickstart/modules/contrib/date/date_elements.inc index 6908d967..656d4998 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_elements.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_elements.inc @@ -40,7 +40,6 @@ * * - In the field's submission processing, the new date values, which are in * the local timezone, are converted back to their UTC values and stored. - * */ function date_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $base) { @@ -75,7 +74,7 @@ function date_field_widget_form(&$form, &$form_state, $field, $instance, $langco // The repeating values will be re-generated when the repeat widget form is validated. // At this point we can't tell if this form element is going to be hidden by #access, and we're going to // lose all but the first value by doing this, so store the original values in case we need to replace them later. - if (!empty($field['settings']['repeat'])) { + if (!empty($field['settings']['repeat']) && module_exists('date_repeat_field')) { if ($delta == 0) { $form['#after_build'][] = 'date_repeat_after_build'; $form_state['storage']['repeat_fields'][$field_name] = array_merge($form['#parents'], array($field_name)); @@ -87,7 +86,7 @@ function date_field_widget_form(&$form, &$form_state, $field, $instance, $langco } module_load_include('inc', 'date_api', 'date_api_elements'); - $timezone = date_get_timezone($field['settings']['tz_handling'], isset($items[0]['timezone']) ? $items[0]['timezone'] : date_default_timezone()); + $timezone = date_get_timezone($field['settings']['tz_handling'], isset($items[$delta]['timezone']) ? $items[$delta]['timezone'] : date_default_timezone()); // TODO see if there's a way to keep the timezone element from ever being // nested as array('timezone' => 'timezone' => value)). After struggling @@ -122,7 +121,13 @@ function date_field_widget_form(&$form, &$form_state, $field, $instance, $langco '#weight' => $instance['widget']['weight'] + 1, '#attributes' => array('class' => array('date-no-float')), '#date_label_position' => $instance['widget']['settings']['label_position'], - ); + ); + } + + // Make changes if instance is set to be rendered as a regular field. + if (!empty($instance['widget']['settings']['no_fieldset'])) { + $element['#title'] = check_plain($instance['label']); + $element['#theme_wrappers'] = ($field['cardinality'] == 1) ? array('date_form_element') : array(); } return $element; @@ -148,6 +153,7 @@ function date_local_date($item, $timezone, $field, $instance, $part = 'value') { // @TODO Figure out how to replace date_fuzzy_datetime() function. // Special case for ISO dates to create a valid date object for formatting. // Is this still needed? + // @codingStandardsIgnoreStart /* if ($field['type'] == DATE_ISO) { $value = date_fuzzy_datetime($value); @@ -157,6 +163,7 @@ function date_local_date($item, $timezone, $field, $instance, $part = 'value') { $value = date_convert($value, $field['type'], DATE_DATETIME, $db_timezone); } */ + // @codingStandardsIgnoreEnd $date = new DateObject($value, date_get_timezone_db($field['settings']['tz_handling'])); $date->limitGranularity($field['settings']['granularity']); @@ -193,8 +200,7 @@ function date_default_value($field, $instance, $langcode) { } /** - * Helper function for the date default value callback to set - * either 'value' or 'value2' to its default value. + * Helper function for the date default value callback to set either 'value' or 'value2' to its default value. */ function date_default_value_part($item, $field, $instance, $langcode, $part = 'value') { $timezone = date_get_timezone($field['settings']['tz_handling']); @@ -241,7 +247,6 @@ function date_default_value_part($item, $field, $instance, $langcode, $part = 'v * Process an individual date element. */ function date_combo_element_process($element, &$form_state, $form) { - if (date_hidden_element($element)) { // A hidden value for a new entity that had its end date set to blank // will not get processed later to populate the end date, so set it here. @@ -296,6 +301,7 @@ function date_combo_element_process($element, &$form_state, $form) { // Blank out the end date for optional end dates that match the start date, // except when this is a new node that has default values that should be honored. if (!$date_is_default && $field['settings']['todate'] != 'required' + && is_array($element['#default_value']) && !empty($element['#default_value'][$to_field]) && $element['#default_value'][$to_field] == $element['#default_value'][$from_field]) { unset($element['#default_value'][$to_field]); @@ -329,10 +335,13 @@ function date_combo_element_process($element, &$form_state, $form) { '#date_increment' => $instance['widget']['settings']['increment'], '#date_year_range' => $instance['widget']['settings']['year_range'], '#date_label_position' => $instance['widget']['settings']['label_position'], - ); + ); - $description = !empty($element['#description']) ? t($element['#description']) : ''; - unset($element['#description']); + // Date repeat is a multiple value field. So the description is removed from + // the single element earlier. Let's get it back. + if (isset($element['show_repeat_settings']) && !empty($element['value']['#instance']['description'])) { + $element['#description'] = $element['value']['#instance']['description']; + } // Give this element the right type, using a Date API // or a Date Popup element type. @@ -347,11 +356,13 @@ function date_combo_element_process($element, &$form_state, $form) { $element['#attached']['js'][] = drupal_get_path('module', 'date') . '/date.js'; $element[$from_field]['#ajax'] = !empty($element['#ajax']) ? $element['#ajax'] : FALSE; break; + case 'date_popup': $element[$from_field]['#type'] = 'date_popup'; $element[$from_field]['#theme_wrappers'] = array('date_popup'); $element[$from_field]['#ajax'] = !empty($element['#ajax']) ? $element['#ajax'] : FALSE; break; + default: $element[$from_field]['#type'] = 'date_text'; $element[$from_field]['#theme_wrappers'] = array('date_text'); @@ -375,18 +386,17 @@ function date_combo_element_process($element, &$form_state, $form) { $element[$to_field]['#prefix'] = ''; // Users with JS enabled will never see initially blank values for the end // date (see Drupal.date.EndDateHandler()), so hide the message for them. - $description .= ' ' . t("Empty 'End date' values will use the 'Start date' values.") . ''; - $element['#fieldset_description'] = $description; + $element['#description'] .= ' ' . t("Empty 'End date' values will use the 'Start date' values.") . ''; if ($field['settings']['todate'] == 'optional') { $element[$to_field]['#states'] = array( 'visible' => array( - 'input[name="' . $show_id . '"]' => array('checked' => TRUE), - )); + 'input[name="' . $show_id . '"]' => array( + 'checked' => TRUE, + ), + ), + ); } } - else { - $element[$from_field]['#description'] = $description; - } // Create label for error messages that make sense in multiple values // and when the title field is left blank. @@ -404,16 +414,27 @@ function date_combo_element_process($element, &$form_state, $form) { $element[$from_field]['#date_title'] = t('@field_name', array('@field_name' => $instance['label'])); } + // Make changes if instance is set to be rendered as a regular field. + if (!empty($instance['widget']['settings']['no_fieldset'])) { + unset($element[$from_field]['#description']); + if (!empty($field['settings']['todate']) && isset($element['#description'])) { + $element['#description'] .= ' ' . t("Empty 'End date' values will use the 'Start date' values.") . ''; + } + } + $context = array( - 'field' => $field, - 'instance' => $instance, - 'form' => $form, + 'field' => $field, + 'instance' => $instance, + 'form' => $form, ); drupal_alter('date_combo_process', $element, $form_state, $context); return $element; } +/** + * Empty a date element. + */ function date_element_empty($element, &$form_state) { $item = array(); $item['value'] = NULL; @@ -428,6 +449,7 @@ function date_element_empty($element, &$form_state) { /** * Validate and update a combo element. + * * Don't try this if there were errors before reaching this point. */ function date_combo_validate($element, &$form_state) { @@ -444,9 +466,19 @@ function date_combo_validate($element, &$form_state) { $delta = $element['#delta']; $langcode = $element['#language']; + // Related issue: https://drupal.org/node/2279831. + if (!is_array($element['#field_parents'])) { + $element['#field_parents'] = array(); + } $form_values = drupal_array_get_nested_value($form_state['values'], $element['#field_parents']); $form_input = drupal_array_get_nested_value($form_state['input'], $element['#field_parents']); + // Programmatically calling drupal_submit_form() does not always add the date + // combo to $form_state['input']. + if (empty($form_input[$field_name]) && !empty($form_values[$field_name])) { + form_set_value($element, $element['#date_items'], $form_state); + return; + } // If the whole field is empty and that's OK, stop now. if (empty($form_input[$field_name]) && !$element['#required']) { return; @@ -519,11 +551,7 @@ function date_combo_validate($element, &$form_state) { return; } } - // Don't look for further errors if errors are already flagged - // because otherwise we'll show errors on the nested elements - // more than once. - elseif (!form_get_errors()) { - + else { $timezone = !empty($item[$tz_field]) ? $item[$tz_field] : $element['#date_timezone']; $timezone_db = date_get_timezone_db($field['settings']['tz_handling']); $element[$from_field]['#date_timezone'] = $timezone; @@ -598,7 +626,10 @@ function date_combo_validate($element, &$form_state) { } } } - if (!empty($errors)) { + // Don't show further errors if errors are already flagged + // because otherwise we'll show errors on the nested elements + // more than once. + if (!form_get_errors() && !empty($errors)) { if ($field['cardinality']) { form_error($element, t('There are errors in @field_name value #@delta:', array('@field_name' => $instance['label'], '@delta' => $delta + 1)) . theme('item_list', array('items' => $errors))); } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate.info b/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate.info index 69012711..41e416a3 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate.info +++ b/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate.info @@ -4,9 +4,9 @@ core = 7.x package = Date/Time hidden = TRUE -; Information added by Drupal.org packaging script on 2014-07-29 -version = "7.x-2.8" +; Information added by Drupal.org packaging script on 2017-04-07 +version = "7.x-2.10" core = "7.x" project = "date" -datestamp = "1406653438" +datestamp = "1491562090" diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.info b/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.info index 7223b763..ba07220d 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.info +++ b/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.info @@ -20,9 +20,9 @@ package = "Features" project = "date_migrate_example" version = "7.x-2.0" -; Information added by Drupal.org packaging script on 2014-07-29 -version = "7.x-2.8" +; Information added by Drupal.org packaging script on 2017-04-07 +version = "7.x-2.10" core = "7.x" project = "date" -datestamp = "1406653438" +datestamp = "1491562090" diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.migrate.inc b/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.migrate.inc index e11dea66..216e1c54 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.migrate.inc +++ b/profiles/commerce_kickstart/modules/contrib/date/date_migrate/date_migrate_example/date_migrate_example.migrate.inc @@ -47,8 +47,8 @@ class DateExampleMigration extends XMLMigration { $xml_folder = drupal_get_path('module', 'date_migrate_example'); $items_url = $xml_folder . '/date_migrate_example.xml'; $item_xpath = '/source_data/item'; - $item_ID_xpath = 'id'; - $items_class = new MigrateItemsXML($items_url, $item_xpath, $item_ID_xpath); + $item_id_xpath = 'id'; + $items_class = new MigrateItemsXML($items_url, $item_xpath, $item_id_xpath); $this->source = new MigrateSourceMultiItems($items_class, $fields); $this->destination = new MigrateDestinationNode('date_migrate_example'); @@ -78,7 +78,7 @@ class DateExampleMigration extends XMLMigration { $this->addFieldMapping('field_datestamp_range:to', 'datestamp_range_to'); // You can specify a timezone to be applied to all values going into the - // field (Tokyo is UTC+9, no DST) + // field (Tokyo is UTC+9, no DST). $this->addFieldMapping('field_datetime', 'datetime') ->xpath('datetime'); $this->addFieldMapping('field_datetime:timezone') @@ -107,25 +107,25 @@ class DateExampleMigration extends XMLMigration { // The date range field can have multiple values. $current_row->date_range_from = array(); foreach ($current_row->xml->date_range as $range) { - $current_row->date_range_from[] = (string)$range->from[0]; - $current_row->date_range_to[] = (string)$range->to[0]; + $current_row->date_range_from[] = (string) $range->from[0]; + $current_row->date_range_to[] = (string) $range->to[0]; } - $current_row->datestamp_range_from = - (string) $current_row->xml->datestamp_range->from[0]; - $current_row->datestamp_range_to = - (string) $current_row->xml->datestamp_range->to[0]; - - $current_row->datetime_range_from = - (string) $current_row->xml->datetime_range->from[0]; - $current_row->datetime_range_to = - (string) $current_row->xml->datetime_range->to[0]; - $current_row->datetime_range_timezone = - (string) $current_row->xml->datetime_range->timezone[0]; - - $current_row->date_repeat = - (string) $current_row->xml->date_repeat->date[0]; - $current_row->date_repeat_rrule = - (string) $current_row->xml->date_repeat->rule[0]; + $current_row->datestamp_range_from + = (string) $current_row->xml->datestamp_range->from[0]; + $current_row->datestamp_range_to + = (string) $current_row->xml->datestamp_range->to[0]; + + $current_row->datetime_range_from + = (string) $current_row->xml->datetime_range->from[0]; + $current_row->datetime_range_to + = (string) $current_row->xml->datetime_range->to[0]; + $current_row->datetime_range_timezone + = (string) $current_row->xml->datetime_range->timezone[0]; + + $current_row->date_repeat + = (string) $current_row->xml->date_repeat->date[0]; + $current_row->date_repeat_rrule + = (string) $current_row->xml->date_repeat->rule[0]; } } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.info b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.info index 271e1c68..41945a63 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.info +++ b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.info @@ -7,9 +7,9 @@ configure = admin/config/date/date_popup stylesheets[all][] = themes/datepicker.1.7.css -; Information added by Drupal.org packaging script on 2014-07-29 -version = "7.x-2.8" +; Information added by Drupal.org packaging script on 2017-04-07 +version = "7.x-2.10" core = "7.x" project = "date" -datestamp = "1406653438" +datestamp = "1491562090" diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.install b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.install index 790a514a..e13a4f5a 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.install +++ b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.install @@ -5,6 +5,7 @@ * Install, update and uninstall functions for the Date Popup module. */ +// @codingStandardsIgnoreStart /** * Implements hook_install(). */ @@ -17,6 +18,7 @@ function date_popup_install() { function date_popup_uninstall() { } +// @codingStandardsIgnoreEnd /** * Implements hook_enable(). diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.js b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.js index 1847f84f..f38dcb59 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.js +++ b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.js @@ -1,62 +1,73 @@ /** * Attaches the calendar behavior to all required fields */ -(function ($) { -Drupal.behaviors.date_popup = { - attach: function (context) { - for (var id in Drupal.settings.datePopup) { - $('#'+ id).bind('focus', Drupal.settings.datePopup[id], function(e) { - if (!$(this).hasClass('date-popup-init')) { - var datePopup = e.data; - // Explicitely filter the methods we accept. - switch (datePopup.func) { - case 'datepicker': - $(this) - .datepicker(datePopup.settings) - .addClass('date-popup-init') - $(this).click(function(){ - $(this).focus(); +(function($) { + function makeFocusHandler(e) { + if (!$(this).hasClass('date-popup-init')) { + var datePopup = e.data; + // Explicitely filter the methods we accept. + switch (datePopup.func) { + case 'datepicker': + $(this) + .datepicker(datePopup.settings) + .addClass('date-popup-init'); + $(this).click(function(){ + $(this).focus(); + }); + if (datePopup.settings.syncEndDate) { + $('.start-date-wrapper').each(function(){ + var start_date_wrapper = this; + $(this).find('input:eq(0)').change(function(){ + $(start_date_wrapper).next('.end-date-wrapper').find('input:eq(0)').val($(this).val()); + }); }); - break; + } + break; - case 'timeEntry': - $(this) - .timeEntry(datePopup.settings) - .addClass('date-popup-init') - $(this).click(function(){ - $(this).focus(); - }); - break; - case 'timepicker': - // Translate the PHP date format into the style the timepicker uses. - datePopup.settings.timeFormat = datePopup.settings.timeFormat - // 12-hour, leading zero, - .replace('h', 'hh') - // 12-hour, no leading zero. - .replace('g', 'h') - // 24-hour, leading zero. - .replace('H', 'HH') - // 24-hour, no leading zero. - .replace('G', 'H') - // AM/PM. - .replace('A', 'p') - // Minutes with leading zero. - .replace('i', 'mm') - // Seconds with leading zero. - .replace('s', 'ss'); + case 'timeEntry': + $(this) + .timeEntry(datePopup.settings) + .addClass('date-popup-init'); + $(this).click(function(){ + $(this).focus(); + }); + break; - datePopup.settings.startTime = new Date(datePopup.settings.startTime); - $(this) - .timepicker(datePopup.settings) - .addClass('date-popup-init'); - $(this).click(function(){ - $(this).focus(); - }); - break; - } + case 'timepicker': + // Translate the PHP date format into the style the timepicker uses. + datePopup.settings.timeFormat = datePopup.settings.timeFormat + // 12-hour, leading zero, + .replace('h', 'hh') + // 12-hour, no leading zero. + .replace('g', 'h') + // 24-hour, leading zero. + .replace('H', 'HH') + // 24-hour, no leading zero. + .replace('G', 'H') + // AM/PM. + .replace('A', 'p') + // Minutes with leading zero. + .replace('i', 'mm') + // Seconds with leading zero. + .replace('s', 'ss'); + + datePopup.settings.startTime = new Date(datePopup.settings.startTime); + $(this) + .timepicker(datePopup.settings) + .addClass('date-popup-init'); + $(this).click(function(){ + $(this).focus(); + }); + break; } - }); + } } - } -}; + + Drupal.behaviors.date_popup = { + attach: function (context) { + for (var id in Drupal.settings.datePopup) { + $('#'+ id).bind('focus', Drupal.settings.datePopup[id], makeFocusHandler); + } + } + }; })(jQuery); diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.module b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.module index a2d0ebb1..a03132e9 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.module +++ b/profiles/commerce_kickstart/modules/contrib/date/date_popup/date_popup.module @@ -16,7 +16,6 @@ * If no time elements are included in the format string, only the date * textfield will be created. If no date elements are included in the format * string, only the time textfield, will be created. - * */ /** @@ -44,7 +43,7 @@ function date_popup_add() { /** * Get the location of the Willington Vega timepicker library. * - * @return + * @return string * The location of the library, or FALSE if the library isn't installed. */ function date_popup_get_wvega_path() { @@ -94,9 +93,11 @@ function date_popup_library() { } /** - * Create a unique CSS id name and output a single inline JS block for - * each startup function to call and settings array to pass it. This - * used to create a unique CSS class for each unique combination of + * Create a unique CSS id name and output a single inline JS block. + * + * For each startup function to call and settings array to pass it. + * + * This used to create a unique CSS class for each unique combination of * function and settings, but using classes requires a DOM traversal * and is much slower than an id lookup. The new approach returns to * requiring a duplicate copy of the settings/code for every element @@ -104,17 +105,20 @@ function date_popup_library() { * putting the ids for each unique function/settings combo into * Drupal.settings and searching for each listed id. * - * @param $pfx + * @param string $id * The CSS class prefix to search the DOM for. * TODO : unused ? - * @param $func - * The jQuery function to invoke on each DOM element containing the - * returned CSS class. - * @param $settings + * + * @param string $func + * The jQuery function to invoke on each DOM element + * containing the returned CSS class. + * + * @param array $settings * The settings array to pass to the jQuery function. + * * @returns - * The CSS id to assign to the element that should have - * $func($settings) invoked on it. + * The CSS id to assign to the element that should have $func($settings) + * invoked on it. */ function date_popup_js_settings_id($id, $func, $settings) { static $js_added = FALSE; @@ -123,14 +127,15 @@ function date_popup_js_settings_id($id, $func, $settings) { // Make sure popup date selector grid is in correct year. if (!empty($settings['yearRange'])) { $parts = explode(':', $settings['yearRange']); - // Set the default date to 0 or the lowest bound if the date ranges do not include the current year - // Necessary for the datepicker to render and select dates correctly - $defaultDate = ($parts[0] > 0 || 0 > $parts[1]) ? $parts[0] : 0; - $settings += array('defaultDate' => (string) $defaultDate . 'y'); + // Set the default date to 0 or the lowest bound if + // the date ranges do not include the current year. + // Necessary for the datepicker to render and select dates correctly. + $default_date = ($parts[0] > 0 || 0 > $parts[1]) ? $parts[0] : 0; + $settings += array('defaultDate' => (string) $default_date . 'y'); } if (!$js_added) { - drupal_add_js(drupal_get_path('module', 'date_popup') .'/date_popup.js'); + drupal_add_js(drupal_get_path('module', 'date_popup') . '/date_popup.js'); $js_added = TRUE; } @@ -140,29 +145,35 @@ function date_popup_js_settings_id($id, $func, $settings) { $id_count[$id] = 0; } -// It looks like we need the additional id_count for this to -// work correctly when there are multiple values. -// $return_id = "$id-$func-popup"; - $return_id = "$id-$func-popup-". $id_count[$id]++; + // It looks like we need the additional id_count for this to + // work correctly when there are multiple values. + // $return_id = "$id-$func-popup"; + $return_id = "$id-$func-popup-" . $id_count[$id]++; $js_settings['datePopup'][$return_id] = array( 'func' => $func, - 'settings' => $settings + 'settings' => $settings, ); drupal_add_js($js_settings, 'setting'); return $return_id; } +/** + * Date popup theme handler. + */ function date_popup_theme() { return array( - 'date_popup' => array('render element' => 'element'), - ); + 'date_popup' => array( + 'render element' => 'element', + ), + ); } /** * Implements hook_element_info(). * * Set the #type to date_popup and fill the element #default_value with - * a date adjusted to the proper local timezone in datetime format (YYYY-MM-DD HH:MM:SS). + * a date adjusted to the proper local timezone in datetime format + * (YYYY-MM-DD HH:MM:SS). * * The element will create two textfields, one for the date and one for the * time. The date textfield will include a jQuery popup calendar date picker, @@ -218,20 +229,32 @@ function date_popup_element_info() { return $type; } +/** + * Date popup date granularity. + */ function date_popup_date_granularity($element) { $granularity = date_format_order($element['#date_format']); return array_intersect($granularity, array('month', 'day', 'year')); } +/** + * Date popup time granularity. + */ function date_popup_time_granularity($element) { $granularity = date_format_order($element['#date_format']); return array_intersect($granularity, array('hour', 'minute', 'second')); } +/** + * Date popup date format. + */ function date_popup_date_format($element) { return (date_limit_format($element['#date_format'], date_popup_date_granularity($element))); } +/** + * Date popup time format. + */ function date_popup_time_format($element) { return date_popup_format_to_popup_time(date_limit_format($element['#date_format'], date_popup_time_granularity($element)), $element['#timepicker']); } @@ -239,6 +262,7 @@ function date_popup_time_format($element) { /** * Element value callback for date_popup element. */ +// @codingStandardsIgnoreStart function date_popup_element_value_callback($element, $input = FALSE, &$form_state) { $granularity = date_format_order($element['#date_format']); $has_time = date_has_time($granularity); @@ -266,9 +290,11 @@ function date_popup_element_value_callback($element, $input = FALSE, &$form_stat return $return; } +// @codingStandardsIgnoreEnd /** * Javascript popup element processing. + * * Add popup attributes to $element. */ function date_popup_element_process($element, &$form_state, $form) { @@ -284,7 +310,9 @@ function date_popup_element_process($element, &$form_state, $form) { if (!empty($element['#ajax'])) { $element['#ajax'] += array( - 'trigger_as' => array('name' =>$element['#name']), + 'trigger_as' => array( + 'name' => $element['#name'], + ), 'event' => 'change', ); } @@ -292,6 +320,18 @@ function date_popup_element_process($element, &$form_state, $form) { $element['date'] = date_popup_process_date_part($element); $element['time'] = date_popup_process_time_part($element); + // Make changes if instance is set to be rendered as a regular field. + if (!empty($element['#instance']['widget']['settings']['no_fieldset']) && $element['#field']['cardinality'] == 1) { + if (!empty($element['date']) && empty($element['time'])) { + $element['date']['#title'] = check_plain($element['#instance']['label']); + $element['date']['#required'] = $element['#required']; + } + elseif (empty($element['date']) && !empty($element['time'])) { + $element['time']['#title'] = check_plain($element['#instance']['label']); + $element['time']['#required'] = $element['#required']; + } + } + if (isset($element['#element_validate'])) { array_push($element['#element_validate'], 'date_popup_validate'); } @@ -300,7 +340,7 @@ function date_popup_element_process($element, &$form_state, $form) { } $context = array( - 'form' => $form, + 'form' => $form, ); drupal_alter('date_popup_process', $element, $form_state, $context); @@ -313,13 +353,22 @@ function date_popup_element_process($element, &$form_state, $form) { function date_popup_process_date_part(&$element) { $granularity = date_format_order($element['#date_format']); $date_granularity = date_popup_date_granularity($element); - if (empty($date_granularity)) return array(); + if (empty($date_granularity)) { + return array(); + } // The datepicker can't handle zero or negative values like 0:+1 // even though the Date API can handle them, so rework the value // we pass to the datepicker to use defaults it can accept (such as +0:+1) // date_range_string() adds the necessary +/- signs to the range string. $this_year = date_format(date_now(), 'Y'); + // When used as a Views exposed filter widget, $element['#value'] contains an array instead an string. + // Fill the 'date' string in this case. + $mock = NULL; + $callback_values = date_popup_element_value_callback($element, FALSE, $mock); + if (!isset($element['#value']['date']) && isset($callback_values['date'])) { + $element['#value']['date'] = $callback_values['date']; + } $date = ''; if (!empty($element['#value']['date'])) { $date = new DateObject($element['#value']['date'], $element['#date_timezone'], date_popup_date_format($element)); @@ -336,37 +385,49 @@ function date_popup_process_date_part(&$element) { 'closeAtTop' => FALSE, 'speed' => 'immediate', 'firstDay' => intval(variable_get('date_first_day', 0)), - //'buttonImage' => base_path() . drupal_get_path('module', 'date_api') ."/images/calendar.png", - //'buttonImageOnly' => TRUE, + // 'buttonImage' => base_path() + // . drupal_get_path('module', 'date_api') ."/images/calendar.png", + // 'buttonImageOnly' => TRUE, 'dateFormat' => date_popup_format_to_popup(date_popup_date_format($element), 'datepicker'), 'yearRange' => $year_range, // Custom setting, will be expanded in Drupal.behaviors.date_popup() 'fromTo' => isset($fromto), ); + if (!empty($element['#instance'])) { + $settings['syncEndDate'] = $element['#instance']['settings']['default_value2'] == 'sync'; + } + // Create a unique id for each set of custom settings. $id = date_popup_js_settings_id($element['#id'], 'datepicker', $settings); - // Manually build this element and set the value - this will prevent corrupting - // the parent value + // Manually build this element and set the value - + // this will prevent corrupting the parent value. $parents = array_merge($element['#parents'], array('date')); $sub_element = array( '#type' => 'textfield', '#title' => theme('date_part_label_date', array('part_type' => 'date', 'element' => $element)), '#title_display' => $element['#date_label_position'] == 'above' ? 'before' : 'invisible', - '#default_value' => $element['#value']['date'], + '#default_value' => date_format_date($date, 'custom', date_popup_date_format($element)), '#id' => $id, '#input' => FALSE, '#size' => !empty($element['#size']) ? $element['#size'] : 20, '#maxlength' => !empty($element['#maxlength']) ? $element['#maxlength'] : 30, '#attributes' => $element['#attributes'], '#parents' => $parents, - '#name' => array_shift($parents) . '['. implode('][', $parents) .']', + '#name' => array_shift($parents) . '[' . implode('][', $parents) . ']', '#ajax' => !empty($element['#ajax']) ? $element['#ajax'] : FALSE, ); $sub_element['#value'] = $sub_element['#default_value']; - // TODO, figure out exactly when we want this description. In many places it is not desired. - $sub_element['#description'] = ' '. t('E.g., @date', array('@date' => date_format_date(date_example_date(), 'custom', date_popup_date_format($element)))); + // TODO, figure out exactly when we want this description. + // In many places it is not desired. + $sub_element['#description'] = ' ' . t('E.g., @date', array( + '@date' => date_format_date( + date_example_date(), + 'custom', + date_popup_date_format($element) + ), + )); return $sub_element; } @@ -377,7 +438,17 @@ function date_popup_process_date_part(&$element) { function date_popup_process_time_part(&$element) { $granularity = date_format_order($element['#date_format']); $has_time = date_has_time($granularity); - if (empty($has_time)) return array(); + if (empty($has_time)) { + return array(); + } + + // When used as a Views exposed filter widget, $element['#value'] contains an array instead an string. + // Fill the 'time' string in this case. + $mock = NULL; + $callback_values = date_popup_element_value_callback($element, FALSE, $mock); + if (!isset($element['#value']['time']) && isset($callback_values['time'])) { + $element['#value']['time'] = $callback_values['time']; + } switch ($element['#timepicker']) { case 'default': @@ -385,10 +456,14 @@ function date_popup_process_time_part(&$element) { $settings = array( 'show24Hours' => strpos($element['#date_format'], 'H') !== FALSE ? TRUE : FALSE, 'showSeconds' => (in_array('second', $granularity) ? TRUE : FALSE), - 'timeSteps' => array(1, intval($element['#date_increment']), (in_array('second', $granularity) ? $element['#date_increment'] : 0)), + 'timeSteps' => array( + 1, + intval($element['#date_increment']), + (in_array('second', $granularity) ? $element['#date_increment'] : 0), + ), 'spinnerImage' => '', 'fromTo' => isset($fromto), - ); + ); if (strpos($element['#date_format'], 'a') !== FALSE) { // Then we are using lowercase am/pm. $settings['ampmNames'] = array('am', 'pm'); @@ -397,14 +472,17 @@ function date_popup_process_time_part(&$element) { $settings['ampmPrefix'] = ' '; } break; + case 'wvega': $func = 'timepicker'; - $time_granularity = array_intersect($granularity, array('hour', 'minute', 'second')); + $grans = array('hour', 'minute', 'second'); + $time_granularity = array_intersect($granularity, $grans); $format = date_popup_format_to_popup_time(date_limit_format($element['#date_format'], $time_granularity), 'wvega'); + $default_value = isset($element['#default_value']) ? $element['#default_value'] : ''; // The first value in the dropdown list should be the same as the element // default_value, but it needs to be in JS format (i.e. milliseconds since // the epoch). - $start_time = new DateObject($element['#default_value'], $element['#date_timezone'], DATE_FORMAT_DATETIME); + $start_time = new DateObject($default_value, $element['#date_timezone'], DATE_FORMAT_DATETIME); date_increment_round($start_time, $element['#date_increment']); $start_time = $start_time->format(DATE_FORMAT_UNIX) * 1000; $settings = array( @@ -414,6 +492,7 @@ function date_popup_process_time_part(&$element) { 'scrollbar' => TRUE, ); break; + default: $func = ''; $settings = array(); @@ -423,8 +502,8 @@ function date_popup_process_time_part(&$element) { // Create a unique id for each set of custom settings. $id = date_popup_js_settings_id($element['#id'], $func, $settings); - // Manually build this element and set the value - this will prevent corrupting - // the parent value + // Manually build this element and set the value - + // this will prevent corrupting the parent value. $parents = array_merge($element['#parents'], array('time')); $sub_element = array( '#type' => 'textfield', @@ -436,16 +515,22 @@ function date_popup_process_time_part(&$element) { '#maxlength' => 10, '#attributes' => $element['#attributes'], '#parents' => $parents, - '#name' => array_shift($parents) . '['. implode('][', $parents) .']', + '#name' => array_shift($parents) . '[' . implode('][', $parents) . ']', '#ajax' => !empty($element['#ajax']) ? $element['#ajax'] : FALSE, ); $sub_element['#value'] = $sub_element['#default_value']; - // TODO, figure out exactly when we want this description. In many places it is not desired. + // TODO, figure out exactly when we want this description. + // In many places it is not desired. $example_date = date_now(); date_increment_round($example_date, $element['#date_increment']); - $sub_element['#description'] = t('E.g., @date', array('@date' => date_format_date($example_date, 'custom', date_popup_time_format($element)))); + $sub_element['#description'] = t('E.g., @date', array( + '@date' => date_format_date( + $example_date, + 'custom', + date_popup_time_format($element) + ))); return ($sub_element); } @@ -456,7 +541,6 @@ function date_popup_process_time_part(&$element) { * When used as a Views widget, the validation step always gets triggered, * even with no form submission. Before form submission $element['#value'] * contains a string, after submission it contains an array. - * */ function date_popup_validate($element, &$form_state) { @@ -473,6 +557,11 @@ function date_popup_validate($element, &$form_state) { $input_exists = NULL; $input = drupal_array_get_nested_value($form_state['values'], $element['#parents'], $input_exists); + // If the date is a string, it is not considered valid and can cause problems + // later on, so just exit out now. + if (is_string($input)) { + return; + } drupal_alter('date_popup_pre_validate', $element, $form_state, $input); @@ -481,16 +570,22 @@ function date_popup_validate($element, &$form_state) { $time_granularity = date_popup_time_granularity($element); $has_time = date_has_time($granularity); - $label = !empty($element['#date_title']) ? $element['#date_title'] : (!empty($element['#title']) ? $element['#title'] : ''); - $label = t($label); - + // @codingStandardsIgnoreStart + $label = ''; + if (!empty($element['#date_title'])) { + $label = t($element['#date_title']); + } + elseif (!empty($element['#title'])) { + $label = t($element['#title']); + } + // @codingStandardsIgnoreEnd $date = date_popup_input_date($element, $input); // If the date has errors, display them. // If something was input but there is no date, the date is invalid. // If the field is empty and required, set error message and return. $error_field = implode('][', $element['#parents']); - if (empty($date) || !empty($date->errors)) { + if ((empty($element['#value']['date']) && empty($element['#value']['time'])) || !empty($date->errors)) { if (is_object($date) && !empty($date->errors)) { $message = t('The value input for field %field is invalid:', array('%field' => $label)); $message .= '' . implode('
', $date->errors); @@ -517,13 +612,15 @@ function date_popup_validate($element, &$form_state) { /** * Helper function for extracting a date value out of user input. * - * @param autocomplete + * @param bool $auto_complete * Should we add a time value to complete the date if there is no time? * Useful anytime the time value is optional. */ function date_popup_input_date($element, $input, $auto_complete = FALSE) { if (empty($input) || !is_array($input) || !array_key_exists('date', $input) || empty($input['date'])) { - return NULL; + //check if there is no time associated in the input variable. This is the exception scenario where the user has entered only time and not date. + if(empty($input['time'])) + return NULL; } date_popup_add(); $granularity = date_format_order($element['#date_format']); @@ -532,9 +629,14 @@ function date_popup_input_date($element, $input, $auto_complete = FALSE) { $format = date_popup_date_format($element); $format .= $has_time ? ' ' . date_popup_time_format($element) : ''; - $datetime = $input['date']; - $datetime .= $has_time ? ' ' . $input['time'] : ''; + //check if date is empty, if yes, then leave it blank. + $datetime = !empty($input['date']) ? trim($input['date']) : ''; + $datetime .= $has_time ? ' ' . trim($input['time']) : ''; $date = new DateObject($datetime, $element['#date_timezone'], $format); + //if the variable is time only then set TimeOnly to TRUE + if(empty($input['date']) && !empty($input['time']) ){ + $date->timeOnly = 'TRUE'; + } if (is_object($date)) { $date->limitGranularity($granularity); if ($date->validGranularity($granularity, $flexible)) { @@ -552,7 +654,7 @@ function date_popup_time_formats($with_seconds = FALSE) { return array( 'H:i:s', 'h:i:sA', - ); + ); } /** @@ -561,8 +663,17 @@ function date_popup_time_formats($with_seconds = FALSE) { * TODO Remove any formats not supported by the widget, if any. */ function date_popup_formats() { - $formats = str_replace('i', 'i:s', array_keys(system_get_date_formats('short'))); + // Load short date formats. + $formats = system_get_date_formats('short'); + + // Load custom date formats. + if ($formats_custom = system_get_date_formats('custom')) { + $formats = array_merge($formats, $formats_custom); + } + + $formats = str_replace('i', 'i:s', array_keys($formats)); $formats = drupal_map_assoc($formats); + return $formats; } @@ -570,7 +681,8 @@ function date_popup_formats() { * Recreate a date format string so it has the values popup expects. * * @param string $format - * a normal date format string, like Y-m-d + * A normal date format string, like Y-m-d + * * @return string * A format string in popup format, like YMD-, for the * earlier 'calendar' version, or m/d/Y for the later 'datepicker' @@ -588,15 +700,34 @@ function date_popup_format_to_popup($format) { * Recreate a time format string so it has the values popup expects. * * @param string $format - * a normal time format string, like h:i (a) + * A normal time format string, like h:i (a) + * * @return string - * a format string that the popup can accept like h:i a + * A format string that the popup can accept like h:i a */ function date_popup_format_to_popup_time($format, $timepicker = NULL) { if (empty($format)) { $format = 'H:i'; } - $format = str_replace(array('/', '-', ' .', ',', 'F', 'M', 'l', 'z', 'w', 'W', 'd', 'j', 'm', 'n', 'y', 'Y'), '', $format); + $symbols = array( + '/', + '-', + ' .', + ',', + 'F', + 'M', + 'l', + 'z', + 'w', + 'W', + 'd', + 'j', + 'm', + 'n', + 'y', + 'Y', + ); + $format = str_replace($symbols, '', $format); $format = strtr($format, date_popup_timepicker_format_replacements($timepicker)); return $format; } @@ -605,9 +736,10 @@ function date_popup_format_to_popup_time($format, $timepicker = NULL) { * Reconstruct popup format string into normal format string. * * @param string $format - * a string in popup format, like YMD- + * A string in popup format, like YMD- + * * @return string - * a normal date format string, like Y-m-d + * A normal date format string, like Y-m-d */ function date_popup_popup_to_format($format) { $replace = array_flip(date_popup_datepicker_format_replacements()); @@ -621,22 +753,21 @@ function date_popup_popup_to_format($format) { * This function returns a map of format replacements required to change any * input format into one that the given timepicker can support. * - * @param $timepicker + * @param string $timepicker * The time entry plugin being used: either 'wvega' or 'default'. - * @return + * + * @return array * A map of replacements. */ function date_popup_timepicker_format_replacements($timepicker = 'default') { switch ($timepicker) { case 'wvega': - return array( - 'a' => 'A', // The wvega timepicker only supports uppercase AM/PM. - ); + // The wvega timepicker only supports uppercase AM/PM. + return array('a' => 'A'); + default: - return array( - 'G' => 'H', // The default timeEntry plugin requires leading zeros. - 'g' => 'h', - ); + // The default timeEntry plugin requires leading zeros. + return array('G' => 'H', 'g' => 'h'); } } @@ -645,16 +776,16 @@ function date_popup_timepicker_format_replacements($timepicker = 'default') { */ function date_popup_datepicker_format_replacements() { return array( - 'd' => 'dd', - 'j' => 'd', - 'l' => 'DD', - 'D' => 'D', - 'm' => 'mm', - 'n' => 'm', - 'F' => 'MM', - 'M' => 'M', - 'Y' => 'yy', - 'y' => 'y', + 'd' => 'dd', + 'j' => 'd', + 'l' => 'DD', + 'D' => 'D', + 'm' => 'mm', + 'n' => 'm', + 'F' => 'MM', + 'M' => 'M', + 'Y' => 'yy', + 'y' => 'y', ); } @@ -667,16 +798,26 @@ function theme_date_popup($vars) { $element = $vars['element']; $attributes = !empty($element['#wrapper_attributes']) ? $element['#wrapper_attributes'] : array('class' => array()); $attributes['class'][] = 'container-inline-date'; - // If there is no description, the floating date elements need some extra padding below them. + // If there is no description, the floating date + // elements need some extra padding below them. $wrapper_attributes = array('class' => array('date-padding')); if (empty($element['date']['#description'])) { $wrapper_attributes['class'][] = 'clearfix'; } - // Add an wrapper to mimic the way a single value field works, for ease in using #states. + // Add an wrapper to mimic the way a single value field works, + // for ease in using #states. if (isset($element['#children'])) { - $element['#children'] = '
' . $element['#children'] . '
';
+ $element['#children'] = '' . $element['#children'] . '
';
}
- return '' . theme('form_element', $element) . '
';
+ return '' . theme('form_element', $element) . '
';
+}
+
+/**
+ * Implements hook_date_field_instance_settings_form_alter().
+ */
+function date_popup_date_field_instance_settings_form_alter(&$form, $context) {
+ // Add an extra option to sync the end date with the start date.
+ $form['default_value2']['#options']['sync'] = t('Sync with start date');
}
/**
@@ -707,8 +848,8 @@ function date_popup_settings() {
'#type' => 'select',
'#options' => array(
'default' => t('Use default jQuery timepicker'),
- 'wvega' => t('Use dropdown timepicker'),
- 'none' => t('Manual time entry, no jQuery timepicker')
+ 'wvega' => t('Use dropdown timepicker'),
+ 'none' => t('Manual time entry, no jQuery timepicker'),
),
'#title' => t('Timepicker'),
'#default_value' => variable_get('date_popup_timepicker', $preferred_timepicker),
@@ -734,7 +875,7 @@ function date_popup_settings() {
}
EOM;
- $form['#suffix'] = t('The Date Popup calendar includes some css for IE6 that breaks css validation. Since IE 6 is now superceded by IE 7, 8, and 9, the special css for IE 6 has been removed from the regular css used by the Date Popup. If you find you need that css after all, you can add it back in your theme. Look at the way the Garland theme adds special IE-only css in in its page.tpl.php file. The css you need is:
') .''; + $form['#suffix'] = t('' . $css .'
The Date Popup calendar includes some css for IE6 that breaks css validation. Since IE 6 is now superceded by IE 7, 8, and 9, the special css for IE 6 has been removed from the regular css used by the Date Popup. If you find you need that css after all, you can add it back in your theme. Look at the way the Garland theme adds special IE-only css in in its page.tpl.php file. The css you need is:
') . ''; return system_settings_form($form); } diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_popup/jquery.timeentry.pack.js b/profiles/commerce_kickstart/modules/contrib/date/date_popup/jquery.timeentry.pack.js index e26c64bf..658e7e49 100644 --- a/profiles/commerce_kickstart/modules/contrib/date/date_popup/jquery.timeentry.pack.js +++ b/profiles/commerce_kickstart/modules/contrib/date/date_popup/jquery.timeentry.pack.js @@ -1,7 +1,8 @@ /* http://keith-wood.name/timeEntry.html - Time entry for jQuery v1.4.8. + Time entry for jQuery v1.5.2. Written by Keith Wood (kbwood{at}iinet.com.au) June 2007. - Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and - MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. + Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. Please attribute the author if you use it. */ -eval(function(p,a,c,k,e,r){e=function(c){return(c' . $css . '
' . t('Every weekday', array(), array('context' => 'Date repeat')) . '
',
);
- $DAILY_mo_we_fr = array(
+ $daily_mo_we_fr = array(
'#type' => 'item',
'#markup' => '' . t('Every Mon, Wed, Fri', array(), array('context' => 'Date repeat')) . '
',
);
- $DAILY_tu_th = array(
+ $daily_tu_th = array(
'#type' => 'item',
'#markup' => '' . t('Every Tue, Thu', array(), array('context' => 'Date repeat')) . '
',
);
@@ -251,17 +256,17 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
":input[name=\"{$element['#name']}[FREQ]\"]" => array('value' => 'DAILY'),
),
),
- '#default_value' => $DAILY_radios_default,
+ '#default_value' => $daily_radios_default,
'#options' => array(
'INTERVAL' => t('interval'),
'every_weekday' => t('every weekday'),
'every_mo_we_fr' => t('monday wednesday friday'),
'every_tu_th' => t('tuesday thursday'),
),
- 'INTERVAL_child' => $DAILY_INTERVAL,
- 'every_weekday_child' => $DAILY_every_weekday,
- 'mo_we_fr_child' => $DAILY_mo_we_fr,
- 'tu_th_child' => $DAILY_tu_th,
+ 'INTERVAL_child' => $daily_interval,
+ 'every_weekday_child' => $daily_every_weekday,
+ 'mo_we_fr_child' => $daily_mo_we_fr,
+ 'tu_th_child' => $daily_tu_th,
'#div_classes' => array(
'container-inline interval',
'container-inline weekday',
@@ -270,18 +275,18 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
),
);
- $MONTHLY_day_month_default = 'BYMONTHDAY_BYMONTH';
+ $monthly_day_month_default = 'BYMONTHDAY_BYMONTH';
if (isset($rrule['FREQ']) && $rrule['FREQ'] === 'MONTHLY' && !empty($rrule['BYDAY'])) {
- $MONTHLY_day_month_default = 'BYDAY_BYMONTH';
+ $monthly_day_month_default = 'BYDAY_BYMONTH';
}
- $MONTHLY_on_day_BYMONTHDAY_of_BYMONTH = array(
+ $monthly_on_day_bymonthday_of_bymonth = array(
'#type' => 'container',
'#tree' => TRUE,
);
list($bymonthday_title, $bymonthday_suffix) = explode('@bymonthday', t('On day @bymonthday of', array(), array('context' => 'Date repeat')));
- $MONTHLY_on_day_BYMONTHDAY_of_BYMONTH['BYMONTHDAY'] = array(
+ $monthly_on_day_bymonthday_of_bymonth['BYMONTHDAY'] = array(
'#type' => 'select',
'#title' => $bymonthday_title,
'#default_value' => !empty($rrule['BYMONTHDAY']) && $rrule['FREQ'] === 'MONTHLY' ? $rrule['BYMONTHDAY'] : '',
@@ -292,11 +297,11 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
'#field_suffix' => $bymonthday_suffix,
);
- $MONTHLY_on_day_BYMONTHDAY_of_BYMONTH['BYMONTH'] = array(
+ $monthly_on_day_bymonthday_of_bymonth['BYMONTH'] = array(
'#type' => 'checkboxes',
'#title' => t('Bymonth', array(), array('context' => 'Date repeat')),
'#title_display' => 'invisible',
- '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'MONTHLY' && $MONTHLY_day_month_default === 'BYMONTHDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
+ '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'MONTHLY' && $monthly_day_month_default === 'BYMONTHDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
'#options' => date_month_names_abbr(TRUE),
'#attributes' => array('class' => array('container-inline')),
'#multiple' => TRUE,
@@ -304,45 +309,45 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
'#suffix' => '',
'#suffix' => '
',
);
- $MONTHLY_on_the_BYDAY_of_BYMONTH['BYDAY_DAY'] = array(
+ $monthly_on_the_byday_of_bymonth['BYDAY_DAY'] = array(
'#type' => 'select',
'#title' => $byday_day_title,
'#title_display' => 'after',
- '#default_value' => !empty($MONTHLY_BYDAY_DAY) ? $MONTHLY_BYDAY_DAY : '',
+ '#default_value' => !empty($monthly_byday_day) ? $monthly_byday_day : '',
'#options' => date_repeat_dow_day_options(TRUE),
'#multiple' => FALSE,
'#prefix' => '',
'#suffix' => '
',
);
- $MONTHLY_on_the_BYDAY_of_BYMONTH['BYMONTH'] = array(
+ $monthly_on_the_byday_of_bymonth['BYMONTH'] = array(
'#type' => 'checkboxes',
'#title' => t('Bymonth', array(), array('context' => 'Date repeat')),
'#title_display' => 'invisible',
- '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'MONTHLY' && $MONTHLY_day_month_default === 'BYDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
+ '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'MONTHLY' && $monthly_day_month_default === 'BYDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
'#options' => date_month_names_abbr(TRUE),
'#attributes' => array('class' => array('container-inline')),
'#multiple' => TRUE,
@@ -361,31 +366,31 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
),
),
'#attributes' => array('class' => array('date-repeat-radios clearfix')),
- '#default_value' => $MONTHLY_day_month_default,
+ '#default_value' => $monthly_day_month_default,
'#options' => array(
'BYMONTHDAY_BYMONTH' => t('On day ... of ...'),
'BYDAY_BYMONTH' => t('On the ... of ...'),
),
- 'BYMONTHDAY_BYMONTH_child' => $MONTHLY_on_day_BYMONTHDAY_of_BYMONTH,
- 'BYDAY_BYMONTH_child' => $MONTHLY_on_the_BYDAY_of_BYMONTH,
+ 'BYMONTHDAY_BYMONTH_child' => $monthly_on_day_bymonthday_of_bymonth,
+ 'BYDAY_BYMONTH_child' => $monthly_on_the_byday_of_bymonth,
'#div_classes' => array(
'date-repeat-radios-item date-clear clearfix bymonthday-bymonth',
'date-repeat-radios-item date-clear clearfix byday-bymonth',
),
);
- $YEARLY_day_month_default = 'BYMONTHDAY_BYMONTH';
+ $yearly_day_month_default = 'BYMONTHDAY_BYMONTH';
if (isset($rrule['FREQ']) && $rrule['FREQ'] === 'YEARLY' && !empty($rrule['BYDAY'])) {
- $YEARLY_day_month_default = 'BYDAY_BYMONTH';
+ $yearly_day_month_default = 'BYDAY_BYMONTH';
}
- $YEARLY_on_day_BYMONTHDAY_of_BYMONTH = array(
+ $yearly_on_day_bymonthday_of_bymonth = array(
'#type' => 'container',
'#tree' => TRUE,
);
list($bymonthday_title, $bymonthday_suffix) = explode('@bymonthday', t('On day @bymonthday of', array(), array('context' => 'Date repeat')));
- $YEARLY_on_day_BYMONTHDAY_of_BYMONTH['BYMONTHDAY'] = array(
+ $yearly_on_day_bymonthday_of_bymonth['BYMONTHDAY'] = array(
'#type' => 'select',
'#title' => $bymonthday_title,
'#default_value' => !empty($rrule['BYMONTHDAY']) && $rrule['FREQ'] === 'YEARLY' ? $rrule['BYMONTHDAY'] : '',
@@ -396,11 +401,11 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
'#field_suffix' => $bymonthday_suffix,
);
- $YEARLY_on_day_BYMONTHDAY_of_BYMONTH['BYMONTH'] = array(
+ $yearly_on_day_bymonthday_of_bymonth['BYMONTH'] = array(
'#type' => 'checkboxes',
'#title' => t('Bymonth', array(), array('context' => 'Date repeat')),
'#title_display' => 'invisible',
- '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'YEARLY' && $YEARLY_day_month_default === 'BYMONTHDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
+ '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'YEARLY' && $yearly_day_month_default === 'BYMONTHDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
'#options' => date_month_names_abbr(TRUE),
'#attributes' => array('class' => array('container-inline')),
'#multiple' => TRUE,
@@ -408,45 +413,45 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
'#suffix' => '',
'#suffix' => '
',
);
- $YEARLY_on_the_BYDAY_of_BYMONTH['BYDAY_DAY'] = array(
+ $yearly_on_the_byday_of_bymonth['BYDAY_DAY'] = array(
'#type' => 'select',
'#title' => $byday_day_title,
'#title_display' => 'after',
- '#default_value' => !empty($YEARLY_BYDAY_DAY) ? $YEARLY_BYDAY_DAY : '',
+ '#default_value' => !empty($yearly_byday_day) ? $yearly_byday_day : '',
'#options' => date_repeat_dow_day_options(TRUE),
'#multiple' => FALSE,
'#prefix' => '',
'#suffix' => '
',
);
- $YEARLY_on_the_BYDAY_of_BYMONTH['BYMONTH'] = array(
+ $yearly_on_the_byday_of_bymonth['BYMONTH'] = array(
'#type' => 'checkboxes',
'#title' => t('Bymonth', array(), array('context' => 'Date repeat')),
'#title_display' => 'invisible',
- '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'YEARLY' && $YEARLY_day_month_default === 'BYDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
+ '#default_value' => !empty($rrule['BYMONTH']) && $rrule['FREQ'] === 'YEARLY' && $yearly_day_month_default === 'BYDAY_BYMONTH' ? $rrule['BYMONTH'] : array(),
'#options' => date_month_names_abbr(TRUE),
'#attributes' => array('class' => array('container-inline')),
'#multiple' => TRUE,
@@ -465,13 +470,13 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
),
),
'#attributes' => array('class' => array('date-repeat-radios clearfix')),
- '#default_value' => $YEARLY_day_month_default,
+ '#default_value' => $yearly_day_month_default,
'#options' => array(
'BYMONTHDAY_BYMONTH' => t('On day ... of ...'),
'BYDAY_BYMONTH' => t('On the ... of ...'),
),
- 'BYMONTHDAY_BYMONTH_child' => $YEARLY_on_day_BYMONTHDAY_of_BYMONTH,
- 'BYDAY_BYMONTH_child' => $YEARLY_on_the_BYDAY_of_BYMONTH,
+ 'BYMONTHDAY_BYMONTH_child' => $yearly_on_day_bymonthday_of_bymonth,
+ 'BYDAY_BYMONTH_child' => $yearly_on_the_byday_of_bymonth,
'#div_classes' => array(
'date-repeat-radios-item date-clear clearfix bymonthday-bymonth',
'date-repeat-radios-item date-clear clearfix byday-bymonth',
@@ -482,7 +487,7 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
$count_form_element = array(
'#type' => 'textfield',
'#title' => t('Count', array(), array('context' => 'Date repeat')),
- '#default_value' => $COUNT,
+ '#default_value' => $count,
'#element_validate' => array('element_validate_integer_positive'),
'#attributes' => array('placeholder' => array('#')),
'#prefix' => $prefix,
@@ -499,21 +504,26 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
'#type' => $element['#date_repeat_widget'],
'#title' => t('Until', array(), array('context' => 'Date repeat')),
'#title_display' => 'invisible',
- '#default_value' => $UNTIL,
- '#date_format' => !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d',
+ '#default_value' => $until,
+ '#date_format' => !empty($element['#date_format']) ?
+ date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d',
'#date_timezone' => $timezone,
'#date_text_parts' => !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : array(),
'#date_year_range' => !empty($element['#date_year_range']) ? $element['#date_year_range'] : '-3:+3',
- '#date_label_position' => !empty($element['#date_label_position']) ? $element['#date_label_position'] : 'within',
+ '#date_label_position' => !empty($element['#date_label_position']) ?
+ $element['#date_label_position'] : 'within',
'#date_flexible' => 0,
),
'tz' => array('#type' => 'hidden', '#value' => $element['#date_timezone']),
'all_day' => array('#type' => 'hidden', '#value' => 1),
- 'granularity' => array('#type' => 'hidden', '#value' => serialize(array('year', 'month', 'day'))),
+ 'granularity' => array(
+ '#type' => 'hidden',
+ '#value' => serialize(array('year', 'month', 'day')),
+ ),
);
$range_of_repeat_default = 'COUNT';
- if (!empty($UNTIL)) {
+ if (!empty($until)) {
$range_of_repeat_default = 'UNTIL';
}
$element['range_of_repeat'] = array(
@@ -528,7 +538,7 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
":input[name=\"{$element['#name']}[FREQ]\"]" => array('value' => 'NONE'),
),
),
- '#default_value' => $range_of_repeat_default,
+ '#default_value' => $range_of_repeat_default,
'#options' => array(
'COUNT' => t('Count'),
'UNTIL' => t('Until'),
@@ -544,7 +554,8 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
$parents = $element['#array_parents'];
$instance = implode('-', $parents);
- // Make sure this will work right either in the normal form or in an ajax callback from the 'Add more' button.
+ // Make sure this will work right either in the normal
+ // form or in an ajax callback from the 'Add more' button.
if (empty($form_state['num_exceptions'][$instance])) {
$form_state['num_exceptions'][$instance] = count($exceptions);
}
@@ -576,33 +587,48 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
),
),
);
- for ($i = 0; $i < max($form_state['num_exceptions'][$instance], 1) ; $i++) {
- $EXCEPT = '';
+ for ($i = 0; $i < max($form_state['num_exceptions'][$instance], 1); $i++) {
+ $except = '';
if (!empty($exceptions[$i]['datetime'])) {
$ex_date = new DateObject($exceptions[$i]['datetime'], $exceptions[$i]['tz']);
date_timezone_set($ex_date, timezone_open($timezone));
- $EXCEPT = date_format($ex_date, DATE_FORMAT_DATETIME);
+ $except = date_format($ex_date, DATE_FORMAT_DATETIME);
+ }
+ $date_format = 'Y-m-d';
+ if (!empty($element['#date_format'])) {
+ $grans = array('year', 'month', 'day');
+ $date_format = date_limit_format($element['#date_format'], $grans);
}
$element['exceptions']['EXDATE'][$i] = array(
'#tree' => TRUE,
'datetime' => array(
'#name' => 'exceptions|' . $instance,
'#type' => $element['#date_repeat_widget'],
- '#default_value' => $EXCEPT,
- '#date_timezone' => !empty($element['#date_timezone']) ? $element['#date_timezone'] : date_default_timezone(),
- '#date_format' => !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d',
+ '#default_value' => $except,
+ '#date_timezone' => !empty($element['#date_timezone']) ?
+ $element['#date_timezone'] : date_default_timezone(),
+ '#date_format' => $date_format,
'#date_text_parts' => !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : array(),
'#date_year_range' => !empty($element['#date_year_range']) ? $element['#date_year_range'] : '-3:+3',
'#date_label_position' => !empty($element['#date_label_position']) ? $element['#date_label_position'] : 'within',
'#date_flexible' => 0,
- ),
- 'tz' => array('#type' => 'hidden', '#value' => $element['#date_timezone']),
- 'all_day' => array('#type' => 'hidden', '#value' => 1),
- 'granularity' => array('#type' => 'hidden', '#value' => serialize(array('year', 'month', 'day'))),
- );
+ ),
+ 'tz' => array(
+ '#type' => 'hidden',
+ '#value' => $element['#date_timezone'],
+ ),
+ 'all_day' => array(
+ '#type' => 'hidden',
+ '#value' => 1,
+ ),
+ 'granularity' => array(
+ '#type' => 'hidden',
+ '#value' => serialize(array('year', 'month', 'day')),
+ ),
+ );
}
- // collect additions in the same way as exceptions - implements RDATE.
+ // Collect additions in the same way as exceptions - implements RDATE.
if (empty($form_state['num_additions'][$instance])) {
$form_state['num_additions'][$instance] = count($additions);
}
@@ -634,30 +660,45 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
),
),
);
- for ($i = 0; $i < max($form_state['num_additions'][$instance], 1) ; $i++) {
- $RDATE = '';
+ for ($i = 0; $i < max($form_state['num_additions'][$instance], 1); $i++) {
+ $r_date = '';
if (!empty($additions[$i]['datetime'])) {
$rdate = new DateObject($additions[$i]['datetime'], $additions[$i]['tz']);
date_timezone_set($rdate, timezone_open($timezone));
- $RDATE = date_format($rdate, DATE_FORMAT_DATETIME);
+ $r_date = date_format($rdate, DATE_FORMAT_DATETIME);
+ }
+ $date_format = 'Y-m-d';
+ if (!empty($element['#date_format'])) {
+ $grans = array('year', 'month', 'day');
+ $date_format = date_limit_format($element['#date_format'], $grans);
}
$element['additions']['RDATE'][$i] = array(
'#tree' => TRUE,
'datetime' => array(
'#type' => $element['#date_repeat_widget'],
'#name' => 'additions|' . $instance,
- '#default_value' => $RDATE,
- '#date_timezone' => !empty($element['#date_timezone']) ? $element['#date_timezone'] : date_default_timezone(),
- '#date_format' => !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d',
+ '#default_value' => $r_date,
+ '#date_timezone' => !empty($element['#date_timezone']) ?
+ $element['#date_timezone'] : date_default_timezone(),
+ '#date_format' => $date_format,
'#date_text_parts' => !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : array(),
'#date_year_range' => !empty($element['#date_year_range']) ? $element['#date_year_range'] : '-3:+3',
'#date_label_position' => !empty($element['#date_label_position']) ? $element['#date_label_position'] : 'within',
'#date_flexible' => 0,
- ),
- 'tz' => array('#type' => 'hidden', '#value' => $element['#date_timezone']),
- 'all_day' => array('#type' => 'hidden', '#value' => 1),
- 'granularity' => array('#type' => 'hidden', '#value' => serialize(array('year', 'month', 'day'))),
- );
+ ),
+ 'tz' => array(
+ '#type' => 'hidden',
+ '#value' => $element['#date_timezone'],
+ ),
+ 'all_day' => array(
+ '#type' => 'hidden',
+ '#value' => 1,
+ ),
+ 'granularity' => array(
+ '#type' => 'hidden',
+ '#value' => serialize(array('year', 'month', 'day')),
+ ),
+ );
}
$element['exceptions']['exceptions_add'] = array(
@@ -687,6 +728,9 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
return $element;
}
+/**
+ * Add callback to date repeat.
+ */
function date_repeat_add_exception_callback($form, &$form_state) {
$parents = $form_state['triggering_element']['#array_parents'];
$button_key = array_pop($parents);
@@ -694,6 +738,9 @@ function date_repeat_add_exception_callback($form, &$form_state) {
return $element;
}
+/**
+ * Add addition callback to date repeat.
+ */
function date_repeat_add_addition_callback($form, &$form_state) {
$parents = $form_state['triggering_element']['#array_parents'];
$button_key = array_pop($parents);
@@ -701,6 +748,9 @@ function date_repeat_add_addition_callback($form, &$form_state) {
return $element;
}
+/**
+ * Add exception to date repeat.
+ */
function date_repeat_add_exception($form, &$form_state) {
$parents = $form_state['triggering_element']['#array_parents'];
$instance = implode('-', array_slice($parents, 0, count($parents) - 2));
@@ -708,6 +758,9 @@ function date_repeat_add_exception($form, &$form_state) {
$form_state['rebuild'] = TRUE;
}
+/**
+ * Add addition to date repeat.
+ */
function date_repeat_add_addition($form, &$form_state) {
$parents = $form_state['triggering_element']['#array_parents'];
$instance = implode('-', array_slice($parents, 0, count($parents) - 2));
@@ -723,8 +776,14 @@ function date_repeat_merge($form_values, $element) {
return $form_values;
}
if (array_key_exists('exceptions', $form_values) || array_key_exists('additions', $form_values)) {
- if (!array_key_exists('exceptions', $form_values)) $form_values['exceptions'] = array();
- if (!array_key_exists('additions', $form_values)) $form_values['additions'] = array();
+ if (!array_key_exists('exceptions', $form_values)) {
+ $form_values['exceptions'] = array();
+ }
+
+ if (!array_key_exists('additions', $form_values)) {
+ $form_values['additions'] = array();
+ }
+
$form_values = array_merge($form_values, (array) $form_values['exceptions'], (array) $form_values['additions']);
unset($form_values['exceptions']);
unset($form_values['additions']);
@@ -738,18 +797,22 @@ function date_repeat_merge($form_values, $element) {
case 'INTERVAL':
$form_values['INTERVAL'] = $form_values['daily']['INTERVAL_child'];
break;
+
case 'every_weekday':
$form_values['BYDAY'] = array('MO', 'TU', 'WE', 'TH', 'FR');
break;
+
case 'every_mo_we_fr':
$form_values['BYDAY'] = array('MO', 'WE', 'FR');
break;
+
case 'every_tu_th':
$form_values['BYDAY'] = array('TU', 'TH');
break;
}
}
break;
+
case 'WEEKLY':
if (array_key_exists('weekly', $form_values)) {
$form_values = array_merge($form_values, (array) $form_values['weekly']);
@@ -758,12 +821,14 @@ function date_repeat_merge($form_values, $element) {
}
}
break;
+
case 'MONTHLY':
if (array_key_exists('monthly', $form_values)) {
switch ($form_values['monthly']['day_month']) {
case 'BYMONTHDAY_BYMONTH':
$form_values['monthly'] = array_merge($form_values['monthly'], (array) $form_values['monthly']['BYMONTHDAY_BYMONTH_child']);
break;
+
case 'BYDAY_BYMONTH':
$form_values['monthly']['BYDAY_BYMONTH_child']['BYDAY'] = $form_values['monthly']['BYDAY_BYMONTH_child']['BYDAY_COUNT'] . $form_values['monthly']['BYDAY_BYMONTH_child']['BYDAY_DAY'];
$form_values['monthly'] = array_merge($form_values['monthly'], (array) $form_values['monthly']['BYDAY_BYMONTH_child']);
@@ -783,12 +848,14 @@ function date_repeat_merge($form_values, $element) {
}
}
break;
+
case 'YEARLY':
if (array_key_exists('yearly', $form_values)) {
switch ($form_values['yearly']['day_month']) {
case 'BYMONTHDAY_BYMONTH':
$form_values['yearly'] = array_merge($form_values['yearly'], (array) $form_values['yearly']['BYMONTHDAY_BYMONTH_child']);
break;
+
case 'BYDAY_BYMONTH':
$form_values['yearly']['BYDAY_BYMONTH_child']['BYDAY'] = $form_values['yearly']['BYDAY_BYMONTH_child']['BYDAY_COUNT'] . $form_values['yearly']['BYDAY_BYMONTH_child']['BYDAY_DAY'];
$form_values['yearly'] = array_merge($form_values['yearly'], (array) $form_values['yearly']['BYDAY_BYMONTH_child']);
@@ -808,6 +875,7 @@ function date_repeat_merge($form_values, $element) {
}
}
break;
+
default:
break;
}
@@ -823,6 +891,7 @@ function date_repeat_merge($form_values, $element) {
case 'COUNT':
$form_values['COUNT'] = $form_values['count_child'];
break;
+
case 'UNTIL':
$form_values['UNTIL'] = $form_values['until_child'];
break;
@@ -832,14 +901,23 @@ function date_repeat_merge($form_values, $element) {
unset($form_values['count_child']);
unset($form_values['until_child']);
- if (array_key_exists('BYDAY', $form_values) && is_array($form_values['BYDAY'])) unset($form_values['BYDAY']['']);
- if (array_key_exists('BYMONTH', $form_values) && is_array($form_values['BYMONTH'])) unset($form_values['BYMONTH']['']);
- if (array_key_exists('BYMONTHDAY', $form_values) && is_array($form_values['BYMONTHDAY'])) unset($form_values['BYMONTHDAY']['']);
+ if (array_key_exists('BYDAY', $form_values) && is_array($form_values['BYDAY'])) {
+ unset($form_values['BYDAY']['']);
+ }
+
+ if (array_key_exists('BYMONTH', $form_values) && is_array($form_values['BYMONTH'])) {
+ unset($form_values['BYMONTH']['']);
+ }
+
+ if (array_key_exists('BYMONTHDAY', $form_values) && is_array($form_values['BYMONTHDAY'])) {
+ unset($form_values['BYMONTHDAY']['']);
+ }
if (array_key_exists('UNTIL', $form_values) && is_array($form_values['UNTIL']['datetime'])) {
$function = $element['#date_repeat_widget'] . '_input_date';
$until_element = $element;
- $until_element['#date_format'] = !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d';
+ $until_element['#date_format'] = !empty($element['#date_format']) ?
+ date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d';
$date = $function($until_element, $form_values['UNTIL']['datetime']);
$form_values['UNTIL']['datetime'] = is_object($date) ? $date->format(DATE_FORMAT_DATETIME) : '';
}
@@ -849,9 +927,14 @@ function date_repeat_merge($form_values, $element) {
if (array_key_exists('EXDATE', $form_values) && is_array($form_values['EXDATE'])) {
$function = $element['#date_repeat_widget'] . '_input_date';
$exdate_element = $element;
+ $date_format = 'Y-m-d';
+ if (!empty($element['#date_format'])) {
+ $grans = array('year', 'month', 'day');
+ $date_format = date_limit_format($element['#date_format'], $grans);
+ }
foreach ($form_values['EXDATE'] as $delta => $value) {
if (is_array($value['datetime'])) {
- $exdate_element['#date_format'] = !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d';
+ $exdate_element['#date_format'] = $date_format;
$date = $function($exdate_element, $form_values['EXDATE'][$delta]['datetime']);
$form_values['EXDATE'][$delta]['datetime'] = is_object($date) ? $date->format(DATE_FORMAT_DATETIME) : '';
}
@@ -864,9 +947,14 @@ function date_repeat_merge($form_values, $element) {
if (array_key_exists('RDATE', $form_values) && is_array($form_values['RDATE'])) {
$function = $element['#date_repeat_widget'] . '_input_date';
$rdate_element = $element;
+ $date_format = 'Y-m-d';
+ if (!empty($element['#date_format'])) {
+ $grans = array('year', 'month', 'day');
+ $date_format = date_limit_format($element['#date_format'], $grans);
+ }
foreach ($form_values['RDATE'] as $delta => $value) {
if (is_array($value['datetime'])) {
- $rdate_element['#date_format'] = !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day')) : 'Y-m-d';
+ $rdate_element['#date_format'] = $date_format;
$date = $function($rdate_element, $form_values['RDATE'][$delta]['datetime']);
$form_values['RDATE'][$delta]['datetime'] = is_object($date) ? $date->format(DATE_FORMAT_DATETIME) : '';
}
@@ -910,7 +998,7 @@ function date_repeat_rrule_validate($element, &$form_state) {
}
/**
- * Theme the exception list as a table so the buttons line up
+ * Theme the exception list as a table so the buttons line up.
*/
function theme_date_repeat_current_exceptions($vars) {
$rows = $vars['rows'];
@@ -920,11 +1008,14 @@ function theme_date_repeat_current_exceptions($vars) {
$rows_info[] = array(drupal_render($value['action']), drupal_render($value['display']));
}
}
- return theme('table', array('header' => array(t('Delete'), t('Current exceptions')), 'rows' => $rows_info));
+ return theme('table', array(
+ 'header' => array(t('Delete'), t('Current exceptions')),
+ 'rows' => $rows_info)
+ );
}
- /**
- * Theme the exception list as a table so the buttons line up
+/**
+ * Theme the exception list as a table so the buttons line up.
*/
function theme_date_repeat_current_additions($rows = array()) {
$rows_info = array();
@@ -933,7 +1024,10 @@ function theme_date_repeat_current_additions($rows = array()) {
$rows_info[] = array(drupal_render($value['action']), drupal_render($value['display']));
}
}
- return theme('table', array('header' => array(t('Delete'), t('Current additions')), 'rows' => $rows_info));
+ return theme('table', array(
+ 'header' => array(t('Delete'), t('Current additions')),
+ 'rows' => $rows_info)
+ );
}
/**
@@ -943,7 +1037,13 @@ function theme_date_repeat_rrule($vars) {
$element = $vars['element'];
$id = drupal_html_id('repeat-settings-fieldset');
$parents = $element['#parents'];
- $selector = "{$parents[0]}[{$parents[1]}][{$parents[2]}][show_repeat_settings]";
+
+ $selector = $parents[0];
+ for ($i = 1; $i < count($parents) - 1; $i++) {
+ $selector .= '[' . $parents[$i] . ']';
+ }
+ $selector .= '[show_repeat_settings]';
+
$fieldset = array(
'#type' => 'item',
'#title' => t('Repeat settings'),
@@ -960,6 +1060,9 @@ function theme_date_repeat_rrule($vars) {
return drupal_render($fieldset);
}
+/**
+ * Filter non zero values.
+ */
function date_repeat_filter_non_zero_value($value) {
return $value !== 0;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/tests/date_repeat_form.test b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/tests/date_repeat_form.test
index 0c5460ba..22d65296 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat/tests/date_repeat_form.test
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat/tests/date_repeat_form.test
@@ -25,7 +25,7 @@ class DateRepeatFormTestCase extends DrupalWebTestCase {
// Create and log in our privileged user.
$this->privileged_user = $this->drupalCreateUser(array(
- 'administer content types', 'administer nodes', 'bypass node access', 'view date repeats'
+ 'administer content types', 'administer nodes', 'bypass node access', 'view date repeats', 'administer fields'
));
$this->drupalLogin($this->privileged_user);
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_repeat_field/date_repeat_field.devel_generate.inc b/profiles/commerce_kickstart/modules/contrib/date/date_repeat_field/date_repeat_field.devel_generate.inc
index 3880e8b4..51c3708b 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_repeat_field/date_repeat_field.devel_generate.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_repeat_field/date_repeat_field.devel_generate.inc
@@ -1,5 +1,5 @@
'Repeats',
- 'page callback' => 'date_repeat_field_page',
- 'page arguments' => array($entity_type, $count),
- 'access callback' => 'date_repeat_field_show',
- 'access arguments' => array($entity_type, $count),
- 'type' => MENU_LOCAL_TASK,
- 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
+ 'title' => 'Repeats',
+ 'page callback' => 'date_repeat_field_page',
+ 'page arguments' => array($entity_type, $count),
+ 'access callback' => 'date_repeat_field_show',
+ 'access arguments' => array($entity_type, $count),
+ 'type' => MENU_LOCAL_TASK,
+ 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
);
}
}
@@ -91,13 +91,13 @@ function date_repeat_field_menu() {
else {
$path = $entity_type . '/%' . $entity_type;
$items[$path . '/repeats'] = array(
- 'title' => 'Repeats',
- 'page callback' => 'date_repeat_field_page',
- 'page arguments' => array($entity_type, 1),
- 'access callback' => 'date_repeat_field_show',
- 'access arguments' => array($entity_type, 1),
- 'type' => MENU_LOCAL_TASK,
- 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
+ 'title' => 'Repeats',
+ 'page callback' => 'date_repeat_field_page',
+ 'page arguments' => array($entity_type, 1),
+ 'access callback' => 'date_repeat_field_show',
+ 'access arguments' => array($entity_type, 1),
+ 'type' => MENU_LOCAL_TASK,
+ 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
);
}
}
@@ -108,10 +108,12 @@ function date_repeat_field_menu() {
* Implements hook_permission().
*/
function date_repeat_field_permission() {
- return array('view date repeats' => array(
- 'title' => t('View Repeating Dates'),
- 'description' => t('Allow user to see a page with all the times a date repeats.'),
- ));
+ return array(
+ 'view date repeats' => array(
+ 'title' => t('View Repeating Dates'),
+ 'description' => t('Allow user to see a page with all the times a date repeats.'),
+ ),
+ );
}
/**
@@ -195,6 +197,9 @@ function date_repeat_field_bundles() {
return $values;
}
+/**
+ * Check field is repeat.
+ */
function date_is_repeat_field($field, $instance = NULL) {
if (is_string($field)) {
$field = field_info_field($field);
@@ -215,7 +220,7 @@ function date_is_repeat_field($field, $instance = NULL) {
}
}
-/*
+/**
* Implements hook_date_field_insert_alter().
*/
function date_repeat_field_date_field_insert_alter(&$items, $context) {
@@ -239,7 +244,7 @@ function date_repeat_field_date_field_insert_alter(&$items, $context) {
}
}
-/*
+/**
* Implements hook_date_field_update_alter().
*/
function date_repeat_field_date_field_update_alter(&$items, $context) {
@@ -279,6 +284,13 @@ function date_repeat_field_field_widget_form_alter(&$element, &$form_state, $con
'#suffix' => '',
'#default_value' => isset($items[$delta]['rrule']) && !empty($items[$delta]['rrule']) ? 1 : 0,
);
+
+ // Make changes if instance is set to be rendered as a regular field.
+ if (!empty($instance['widget']['settings']['no_fieldset'])) {
+ $element['#title'] = check_plain($instance['label']);
+ $element['#description'] = field_filter_xss($instance['description']);
+ $element['#theme_wrappers'] = array('date_form_element');
+ }
}
}
}
@@ -340,13 +352,14 @@ function date_repeat_field_widget_validate($element, &$form_state) {
// The RRULE has already been created by this point, so go back
// to the posted values to see if this was filled out.
$error_field_base = implode('][', $element['#parents']);
- $error_field_until = $error_field_base . '][rrule][until_child][datetime][';
+ $error_field_until = $error_field_base . '][rrule][until_child][datetime][';
if (!empty($item['rrule']) && $rrule_values['range_of_repeat'] === 'UNTIL' && empty($rrule_values['UNTIL']['datetime'])) {
switch ($instance['widget']['type']) {
case 'date_text':
case 'date_popup':
form_set_error($error_field_until . 'date', t("Missing value in 'Range of repeat'. (UNTIL).", array(), array('context' => 'Date repeat')));
break;
+
case 'date_select':
form_set_error($error_field_until . 'year', t("Missing value in 'Range of repeat': Year (UNTIL)", array(), array('context' => 'Date repeat')));
form_set_error($error_field_until . 'month', t("Missing value in 'Range of repeat': Month (UNTIL)", array(), array('context' => 'Date repeat')));
@@ -382,8 +395,9 @@ function date_repeat_field_widget_validate($element, &$form_state) {
// We only collect a date for UNTIL, but we need it to be inclusive,
// so force it to a full datetime element at the last possible second of the day.
if (!empty($rrule_values['UNTIL'])) {
+ $gran = array('year', 'month', 'day', 'hour', 'minute', 'second');
$rrule_values['UNTIL']['datetime'] .= ' 23:59:59';
- $rrule_values['UNTIL']['granularity'] = serialize(drupal_map_assoc(array('year', 'month', 'day', 'hour', 'minute', 'second')));
+ $rrule_values['UNTIL']['granularity'] = serialize(drupal_map_assoc($gran));
$rrule_values['UNTIL']['all_day'] = 0;
}
$value = date_repeat_build_dates($rrule, $rrule_values, $field, $item);
@@ -418,9 +432,10 @@ function date_repeat_after_build(&$element, &$form_state) {
* Pass in either the RRULE or the $form_values array for the RRULE,
* whichever is missing will be created when needed.
*/
+// @codingStandardsIgnoreStart
function date_repeat_build_dates($rrule = NULL, $rrule_values = NULL, $field, $item) {
-
- include_once(DRUPAL_ROOT . '/' . drupal_get_path('module', 'date_api') . '/date_api_ical.inc');
+// @codingStandardsIgnoreEnd
+ include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'date_api') . '/date_api_ical.inc';
$field_name = $field['field_name'];
if (empty($rrule)) {
@@ -497,8 +512,9 @@ function date_repeat_build_dates($rrule = NULL, $rrule_values = NULL, $field, $i
'offset2' => date_offset_get($date_end),
'timezone' => $timezone,
'rrule' => $rrule,
- );
+ );
}
+
return $value;
}
@@ -681,9 +697,8 @@ function date_repeat_field_date_field_widget_settings_form_alter(&$form, $contex
'#title' => t('Repeat display', array(), array('context' => 'Date repeat')),
'#description' => t("Should the repeat options form start out expanded or collapsed? Set to 'Collapsed' to make those options less obtrusive.", array(), array('context' => 'Date repeat')),
'#fieldset' => 'date_format',
- );
+ );
}
-
}
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.change_type.inc b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.change_type.inc
index cad2cafd..041c5dea 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.change_type.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.change_type.inc
@@ -28,10 +28,14 @@ function date_tools_change_type_form() {
// Get the available date fields.
foreach ($fields as $field_name => $field) {
if ($field['type'] == 'date' || $field['type'] == 'datestamp' || $field['type'] == 'datetime') {
- $date_options[$labels[$field['type']]][$field_name] = t('Field @label (@field_name)', array('@label' => $field['widget']['label'], '@field_name' => $field_name, '@type' => $labels[$field['type']]));
+ $date_options[$labels[$field['type']]][$field_name] = t('Field @label (@field_name)', array(
+ '@label' => $field['widget']['label'],
+ '@field_name' => $field_name,
+ '@type' => $labels[$field['type']]
+ ));
}
}
- if (sizeof($date_options) < 1) {
+ if (count($date_options) < 1) {
drupal_set_message(t('There are no date fields in this database.'));
return $form;
}
@@ -142,26 +146,31 @@ function date_tools_change_type_form_submit($form, &$form_state) {
case 'datestamp':
$new_columns[] = $date_handler->sql_format('U', $db_field) . ' AS ' . $info['column'];
break;
+
case 'datetime':
$new_columns[] = $date_handler->sql_format('Y-m-d H:i:s', $db_field) . ' AS ' . $info['column'];
break;
}
break;
+
case 'datestamp':
switch ($new_type) {
case 'date':
$new_columns[] = $date_handler->sql_format('Y-m-d/TH:i:s', $db_field) . ' AS ' . $info['column'];
break;
+
case 'datetime':
$new_columns[] = $date_handler->sql_format('Y-m-d H:i:s', $db_field) . ' AS ' . $info['column'];
break;
}
break;
+
case 'datetime':
switch ($new_type) {
case 'date':
$new_columns[] = $date_handler->sql_format('Y-m-d/TH:i:s', $db_field) . ' AS ' . $info['column'];
break;
+
case 'datestamp':
$new_columns[] = $date_handler->sql_format('U', $db_field) . ' AS ' . $info['column'];
break;
@@ -178,5 +187,9 @@ function date_tools_change_type_form_submit($form, &$form_state) {
db_query($sql);
db_query("DROP TABLE {" . $temp_table . "}");
- drupal_set_message(t('The field @field_name has been changed from @old_type to @new_type.', array('@field_name' => $field['widget']['label'], '@old_type' => $labels[$old_type], '@new_type' => $labels[$new_type])));
+ drupal_set_message(t('The field @field_name has been changed from @old_type to @new_type.', array(
+ '@field_name' => $field['widget']['label'],
+ '@old_type' => $labels[$old_type],
+ '@new_type' => $labels[$new_type]
+ )));
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.info b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.info
index dbcff7d9..04bfb03f 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.info
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.info
@@ -6,9 +6,9 @@ core = 7.x
configure = admin/config/date/tools
files[] = tests/date_tools.test
-; Information added by Drupal.org packaging script on 2014-07-29
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
core = "7.x"
project = "date"
-datestamp = "1406653438"
+datestamp = "1491562090"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.module b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.module
index a7ac5f1e..997808df 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.module
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.module
@@ -31,7 +31,7 @@ function date_tools_help($section, $arg) {
*/
function date_tools_permission() {
return array(
- 'administer date tools' => array(
+ 'administer date tools' => array(
'title' => t('Administer date tools'),
),
);
@@ -68,6 +68,7 @@ function date_tools_menu() {
'file' => 'date_tools.wizard.inc',
);
+ // @codingStandardsIgnoreStart
/**
$items['admin/config/date/tools/change'] = array(
'title' => 'Change type',
@@ -79,18 +80,18 @@ function date_tools_menu() {
'file' => 'date_tools.change_type.inc',
);
*/
+ // @codingStandardsIgnoreEnd
return $items;
}
/**
- * Main Date Tools page
+ * Main Date Tools page.
*/
function date_tools_page() {
$content = '';
- $content .= t('Dates and calendars can be complicated to set up. The !date_wizard makes it easy to create a simple date content type and related calendar. ', array('!date_wizard' => l(t('Date wizard'), 'admin/config/date/tools/date_wizard')));
-
+ $content .= t('Dates and calendars can be complicated to set up. The !date_wizard makes it easy to create a simple date content type and related calendar.', array('!date_wizard' => l(t('Date wizard'), 'admin/config/date/tools/date_wizard')));
return $content;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.wizard.inc b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.wizard.inc
index 14bc2759..94a130a4 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.wizard.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_tools/date_tools.wizard.inc
@@ -6,6 +6,8 @@
*/
/**
+ * Implements hook_form().
+ *
* @todo.
*/
function date_tools_wizard_form() {
@@ -59,7 +61,10 @@ function date_tools_wizard_form() {
$form['field']['repeat'] = array(
'#type' => 'select',
'#default_value' => 0,
- '#options' => array(0 => t('No'), 1 => t('Yes')),
+ '#options' => array(
+ 0 => t('No'),
+ 1 => t('Yes'),
+ ),
'#title' => t('Show repeating date options'),
'#access' => module_exists('date_repeat_field'),
);
@@ -72,7 +77,11 @@ function date_tools_wizard_form() {
$form['field']['advanced']['todate'] = array(
'#type' => 'select',
'#default_value' => 'optional',
- '#options' => array('' => t('Never'), 'optional' => t('Optional'), 'required' => t('Required')),
+ '#options' => array(
+ '' => t('Never'),
+ 'optional' => t('Optional'),
+ 'required' => t('Required'),
+ ),
'#title' => t('End Date'),
'#description' => t("Display a matching second date field as a 'End date'."),
);
@@ -106,7 +115,10 @@ function date_tools_wizard_form() {
$form['calendar'] = array(
'#type' => 'select',
'#default_value' => module_exists('calendar'),
- '#options' => array(0 => t('No'), 1 => t('Yes')),
+ '#options' => array(
+ 0 => t('No'),
+ 1 => t('Yes'),
+ ),
'#title' => t('Create a calendar for this date field'),
'#access' => module_exists('calendar'),
);
@@ -119,13 +131,26 @@ function date_tools_wizard_form() {
}
/**
+ * Form validate.
+ *
* @todo.
*/
function date_tools_wizard_form_validate(&$form, &$form_state) {
$bundle = $form_state['values']['bundle'];
$field_name = 'field_' . $form_state['values']['field_name'];
- $existing_type = db_query("SELECT type FROM {node_type} WHERE type=:bundle", array(':bundle' => $bundle))->fetchField();
- $existing_instance = db_query("SELECT field_name FROM {field_config_instance} WHERE field_name=:field_name AND bundle=:bundle AND entity_type=:entity_type", array(':field_name' => $field_name, ':bundle' => $bundle, ':entity_type' => 'node'))->fetchField();
+
+ $args = array(
+ ':field_name' => $field_name,
+ ':bundle' => $bundle,
+ ':entity_type' => 'node',
+ );
+
+ $query = "SELECT type FROM {node_type} WHERE type=:bundle";
+ $existing_type = db_query($query, array(':bundle' => $args[':bundle']))->fetchField();
+
+ $query = "SELECT field_name FROM {field_config_instance} WHERE field_name=:field_name AND bundle=:bundle AND entity_type=:entity_type";
+ $existing_instance = db_query($query, $args)->fetchField();
+
if ($existing_type) {
drupal_set_message(t('This content type name already exists, adding new field to existing content type.'));
}
@@ -147,6 +172,8 @@ function date_tools_wizard_form_validate(&$form, &$form_state) {
}
/**
+ * Form submit.
+ *
* @todo.
*/
function date_tools_wizard_form_submit(&$form, &$form_state) {
@@ -161,6 +188,8 @@ function date_tools_wizard_form_submit(&$form, &$form_state) {
}
/**
+ * Wizard build.
+ *
* @todo.
*/
function date_tools_wizard_build($form_values) {
@@ -201,7 +230,7 @@ function date_tools_wizard_build($form_values) {
'timezone_db' => date_get_timezone_db($tz_handling),
'repeat' => $repeat,
'todate' => !empty($todate) ? $todate : 'optional',
- ),
+ ),
);
$instance = array(
'entity_type' => 'node',
@@ -275,6 +304,8 @@ function date_tools_wizard_build($form_values) {
}
/**
+ * Includes handler.
+ *
* @todo.
*/
function date_tools_wizard_include() {
@@ -285,6 +316,8 @@ function date_tools_wizard_include() {
}
/**
+ * Implements hook_field_types().
+ *
* @todo.
*/
function date_tools_wizard_field_types() {
@@ -296,6 +329,7 @@ function date_tools_wizard_field_types() {
}
/**
+ * Implements hook_widget_types().
* @todo.
*/
function date_tools_wizard_widget_types() {
@@ -309,6 +343,8 @@ function date_tools_wizard_widget_types() {
}
/**
+ * Tz handler.
+ *
* @todo.
*/
function date_tools_wizard_tz_handling() {
@@ -317,6 +353,8 @@ function date_tools_wizard_tz_handling() {
}
/**
+ * Create date tools wizard content type.
+ *
* @todo.
*/
function date_tools_wizard_create_content_type($name, $bundle, $description, $type_settings = array()) {
@@ -332,8 +370,7 @@ function date_tools_wizard_create_content_type($name, $bundle, $description, $ty
'body_label' => 'Body',
'min_word_count' => '0',
'help' => '',
- 'node_options' =>
- array(
+ 'node_options' => array(
'status' => 1,
'promote' => 1,
'sticky' => 0,
@@ -374,8 +411,10 @@ function date_tools_wizard_create_content_type($name, $bundle, $description, $ty
'weight' => -4,
'module' => 'text',
),
- 'settings' => array('display_summary' => TRUE),
- 'display' => array(
+ 'settings' => array(
+ 'display_summary' => TRUE,
+ ),
+ 'display' => array(
'default' => array(
'label' => 'hidden',
'type' => 'text_default',
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_tools/tests/date_tools.test b/profiles/commerce_kickstart/modules/contrib/date/date_tools/tests/date_tools.test
index 47c05642..07af4a3d 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_tools/tests/date_tools.test
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_tools/tests/date_tools.test
@@ -28,7 +28,7 @@ class DateToolsTestCase extends DrupalWebTestCase {
// Create and log in our privileged user.
$this->privileged_user = $this->drupalCreateUser(
- array('administer content types', 'administer nodes', 'bypass node access', 'administer date tools')
+ array('administer content types', 'administer nodes', 'bypass node access', 'administer date tools', 'administer fields')
);
$this->drupalLogin($this->privileged_user);
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.info b/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.info
index 0f2d7ec3..68b32cc2 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.info
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.info
@@ -12,9 +12,9 @@ files[] = includes/date_views_filter_handler_simple.inc
files[] = includes/date_views.views.inc
files[] = includes/date_views_plugin_pager.inc
-; Information added by Drupal.org packaging script on 2014-07-29
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
core = "7.x"
project = "date"
-datestamp = "1406653438"
+datestamp = "1491562090"
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.install b/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.install
index c9697b2d..e1d2e3ef 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.install
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.install
@@ -28,3 +28,27 @@ function date_views_uninstall() {
variable_del('date_views_week_format_with_year');
variable_del('date_views_week_format_without_year');
}
+
+/**
+ * Set default date views variables.
+ */
+function date_views_update_7200() {
+ if (!variable_get('date_views_month_format_with_year', FALSE)) {
+ variable_set('date_views_month_format_with_year', 'F Y');
+ }
+ if (!variable_get('date_views_month_format_without_year', FALSE)) {
+ variable_set('date_views_month_format_without_year', 'F');
+ }
+ if (!variable_get('date_views_day_format_with_year', FALSE)) {
+ variable_set('date_views_day_format_with_year', 'l, F j, Y');
+ }
+ if (!variable_get('date_views_day_format_without_year', FALSE)) {
+ variable_set('date_views_day_format_without_year', 'l, F j');
+ }
+ if (!variable_get('date_views_week_format_with_year', FALSE)) {
+ variable_set('date_views_week_format_with_year', 'F j, Y');
+ }
+ if (!variable_get('date_views_week_format_without_year', FALSE)) {
+ variable_set('date_views_week_format_without_year', 'F j');
+ }
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.module b/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.module
index 04bad091..c050e56e 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.module
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/date_views.module
@@ -1,5 +1,9 @@
'Configure settings for date views.',
'page callback' => 'drupal_get_form',
'page arguments' => array('date_views_settings'),
- 'access arguments' => array('administer site configuration '),
+ 'access arguments' => array('administer site configuration'),
'type' => MENU_LOCAL_TASK,
);
@@ -86,13 +90,30 @@ function date_views_theme() {
'file' => 'theme.inc',
'path' => "$path/theme",
);
- return array(
- 'date_nav_title' => $base + array('variables' => array('granularity' => NULL, 'view' => NULL, 'link' => NULL, 'format' => NULL)),
- 'date_views_filter_form' => $base + array('template' => 'date-views-filter-form', 'render element' => 'form'),
- 'date_calendar_day' => $base + array('variables' => array('date' => NULL)),
+ return array(
+ 'date_nav_title' => $base + array(
+ 'variables' => array(
+ 'granularity' => NULL,
+ 'view' => NULL,
+ 'link' => NULL,
+ 'format' => NULL,
+ ),
+ ),
+ 'date_views_filter_form' => $base + array(
+ 'template' => 'date-views-filter-form',
+ 'render element' => 'form',
+ ),
+ 'date_calendar_day' => $base + array(
+ 'variables' => array(
+ 'date' => NULL,
+ ),
+ ),
'date_views_pager' => $base + array(
- 'variables' => array('plugin' => NULL, 'input' => NULL),
+ 'variables' => array(
+ 'plugin' => NULL,
+ 'input' => NULL,
+ ),
// Register a pattern so that it can work like all views templates.
'pattern' => 'date_views_pager__',
'template' => 'date-views-pager',
@@ -100,6 +121,9 @@ function date_views_theme() {
);
}
+/**
+ * Implements hook_views_api().
+ */
function date_views_views_api() {
return array(
'api' => 3,
@@ -119,7 +143,7 @@ function date_views_views_fetch_fields($base, $type) {
}
/**
- * Identify all potential date/timestamp fields and cache the data.
+ * Identify all potential date/timestamp fields and cache the data.
*/
function date_views_fields($base = 'node', $reset = FALSE) {
static $fields = array();
@@ -141,8 +165,8 @@ function date_views_fields($base = 'node', $reset = FALSE) {
/**
* Implements hook_date_views_entities().
- * Map extra Views tables to the entity that holds its date fields,
- * needed for Views tables other than the primary tables identified in entity_info().
+ *
+ * Map extra Views tables to the entity that holds its date fields, needed for Views tables other than the primary tables identified in entity_info().
*/
function date_views_date_views_extra_tables() {
return array(
@@ -151,14 +175,13 @@ function date_views_date_views_extra_tables() {
}
/**
- * Helper function to map entity types to the Views base table they use,
- * to make it easier to infer the entity type from a base table.
+ * Helper function to map entity types to the Views base table they use, to make it easier to infer the entity type from a base table.
+ *
+ * Views has a new handler called views_handler_field_entity() that loads entities.
*
- * Views has a new handler called views_handler_field_entity() that loads
- * entities, and you can use something like the following to get the
- * entity type from a view, but not all our base tables contain the
- * entity information we need, (i.e. revisions) so it won't work here
- * and we resort to creating information from entity_get_info().
+ * And you can use something like the following to get the entity type from a view, but not all our base tables contain the entity information we need, (i.e. revisions).
+ *
+ * So it won't work here and we resort to creating information from entity_get_info().
*
* // A method to get the entity type for a base table.
* $table_data = views_fetch_data($base_table);
@@ -193,11 +216,7 @@ function date_views_base_tables() {
/**
* Implements hook_date_views_fields().
*
- * All modules that create custom fields that use the
- * 'views_handler_field_date' handler can provide
- * additional information here about the type of
- * date they create so the date can be used by
- * the Date API views date argument and date filter.
+ * All modules that create custom fields that use the 'views_handler_field_date' handler can provide additional information here about the type of date they create so the date can be used by the Date API views date argument and date filter.
*/
function date_views_date_views_fields($field) {
$values = array(
@@ -263,12 +282,15 @@ function date_pager_url($view, $date_type = NULL, $date_arg = NULL, $force_view_
case 'year':
$args[$pos] = date_pad($view->date_info->year, 4);
break;
+
case 'week':
$args[$pos] = date_pad($view->date_info->year, 4) . '-W' . date_pad($view->date_info->week);
break;
+
case 'day':
$args[$pos] = date_pad($view->date_info->year, 4) . '-' . date_pad($view->date_info->month) . '-' . date_pad($view->date_info->day);
break;
+
default:
$args[$pos] = date_pad($view->date_info->year, 4) . '-' . date_pad($view->date_info->month);
break;
@@ -298,9 +320,14 @@ function date_pager_url($view, $date_type = NULL, $date_arg = NULL, $force_view_
// if they use exposed filters.
return url($view->get_url($args), array(
'query' => date_views_querystring($view),
- 'absolute' => $absolute));
+ 'absolute' => $absolute,
+ )
+ );
}
+/**
+ * Identifier of a date block.
+ */
function date_block_identifier($view) {
if (!empty($view->block_identifier)) {
return $view->block_identifier;
@@ -311,12 +338,9 @@ function date_block_identifier($view) {
/**
* Implements hook_field_views_data_alter().
*
- * Create a Views field for each date column we care about
- * to supplement the generic 'entity_id' and 'revision_id'
- * fields that are automatically created.
+ * Create a Views field for each date column we care about to supplement the generic 'entity_id' and 'revision_id' fields that are automatically created.
*
- * Also use friendlier labels to distinguish the start date
- * and end date in listings (for fields that use both).
+ * Also use friendlier labels to distinguish the start date and end date in listings (for fields that use both).
*/
function date_views_field_views_data_alter(&$result, $field, $module) {
if ($module == 'date') {
@@ -336,8 +360,8 @@ function date_views_field_views_data_alter(&$result, $field, $module) {
$result[$table][$column]['field']['is date'] = TRUE;
// Not sure yet if we still need a custom field handler in D7 now that custom formatters are available.
// Might still need it to handle grouping of multiple value dates.
- //$result[$table][$column]['field']['handler'] = 'date_handler_field_date';
- //$result[$table][$column]['field']['add fields to query'] = TRUE;
+ // $result[$table][$column]['field']['handler'] = 'date_handler_field_date';
+ // $result[$table][$column]['field']['add fields to query'] = TRUE;
}
// For filters, arguments, and sorts, determine if this column is for
@@ -395,12 +419,25 @@ function date_views_field_views_data_alter(&$result, $field, $module) {
// translatable string. This is a hack to get it to appear right
// before 'end date' in the listing (i.e., in a non-alphabetical,
// but more user friendly, order).
- $result[$table][$column]['title'] = t('@label - start date (!name)', array('@label' => $label, '!name' => $field['field_name']));
- $result[$table][$column]['title short'] = t('@label - start date', array('@label' => $label));
+ $result[$table][$column]['title'] = t('@label - start date (!name)', array(
+ '@label' => $label,
+ '!name' => $field['field_name'],
+ ));
+ $result[$table][$column]['title short'] = t('@label - start date', array(
+ '@label' => $label,
+ ));
break;
+
case 'value2':
- $result[$table][$column]['title'] = t('@label - end date (!name:!column)', array('@label' => $label, '!name' => $field['field_name'], '!column' => $this_column));
- $result[$table][$column]['title short'] = t('@label - end date:!column', array('@label' => $label, '!column' => $this_column));
+ $result[$table][$column]['title'] = t('@label - end date (!name:!column)', array(
+ '@label' => $label,
+ '!name' => $field['field_name'],
+ '!column' => $this_column,
+ ));
+ $result[$table][$column]['title short'] = t('@label - end date:!column', array(
+ '@label' => $label,
+ '!column' => $this_column,
+ ));
break;
}
}
@@ -421,18 +458,15 @@ function date_views_form_views_ui_edit_form_alter(&$form, &$form_state, $form_id
}
/**
- * The instanceof function makes this work for any handler that was derived
- * from 'views_handler_filter_date' or 'views_handler_argument_date',
- * which includes core date fields like the node updated field.
+ * The instanceof function makes this work for any handler that was derived from 'views_handler_filter_date' or 'views_handler_argument_date', which includes core date fields like the node updated field.
*
- * The test for $handler->min_date tells us that this is an argument that
- * not only is derived from the views date handler but also has been processed
- * by the Date Views filter or argument code.
-*/
+ * The test for $handler->min_date tells us that this is an argument that not only is derived from the views date handler but also has been processed by the Date Views filter or argument code.
+ */
function date_views_handler_is_date($handler, $type = 'argument') {
switch ($type) {
case 'filter':
return $handler instanceof views_handler_filter_date && !empty($handler->min_date);
+
case 'argument':
return $handler instanceof views_handler_argument_date && !empty($handler->min_date);
}
@@ -441,8 +475,8 @@ function date_views_handler_is_date($handler, $type = 'argument') {
/**
* Validation hook for exposed filters that use the select widget.
- * This is to ensure the the user completes all parts of the date
- * not just some parts. Only needed for the select widget.
+ *
+ * This is to ensure the the user completes all parts of the date not just some parts. Only needed for the select widget.
*/
function date_views_select_validate(&$form, &$form_state) {
// If there are no values just return.
@@ -453,7 +487,7 @@ function date_views_select_validate(&$form, &$form_state) {
$filled = array();
$value = drupal_array_get_nested_value($form_state['input'], $form['#parents']);
foreach ($granularity as $part) {
- if (!empty($value['value'][$part])) {
+ if (isset($value['value']) && is_numeric($value['value'][$part])) {
$filled[] = $part;
}
}
@@ -464,18 +498,23 @@ function date_views_select_validate(&$form, &$form_state) {
case 'year':
form_error($form['value'][$part], t('Please choose a year.'), $form_state);
break;
+
case 'month':
form_error($form['value'][$part], t('Please choose a month.'), $form_state);
break;
+
case 'day':
form_error($form['value'][$part], t('Please choose a day.'), $form_state);
break;
+
case 'hour':
form_error($form['value'][$part], t('Please choose an hour.'), $form_state);
break;
+
case 'minute':
form_error($form['value'][$part], t('Please choose a minute.'), $form_state);
break;
+
case 'second':
form_error($form['value'][$part], t('Please choose a second.'), $form_state);
break;
@@ -487,8 +526,7 @@ function date_views_select_validate(&$form, &$form_state) {
/**
* Implements hook_date_formatter_view_alter().
*
- * If we are displaying a date from a view, see if we have information about
- * which multiple value to display. If so, set the date_id in the entity.
+ * If we are displaying a date from a view, see if we have information about which multiple value to display. If so, set the date_id in the entity.
*/
function date_views_date_formatter_pre_view_alter(&$entity, &$variables) {
// Some views have no row index.
@@ -501,4 +539,4 @@ function date_views_date_formatter_pre_view_alter(&$entity, &$variables) {
$entity->date_id = 'date.' . $date_item->$date_id . '.' . $field['field_name'] . '.' . $date_item->$date_delta . '.0';
}
}
-}
\ No newline at end of file
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_plugin_display_attachment.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_plugin_display_attachment.inc
index 94371f76..779f4d1f 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_plugin_display_attachment.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_plugin_display_attachment.inc
@@ -1,6 +1,7 @@
'date_views', // This just tells our themes are elsewhere.
+ // This just tells our themes are elsewhere.
+ 'module' => 'date_views',
'display' => array(
// Display plugin for date navigation.
'date_nav' => array(
@@ -83,7 +85,7 @@ function date_views_views_plugins() {
}
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function date_views_views_data() {
$data = array();
@@ -95,12 +97,12 @@ function date_views_views_data() {
$data[$base_table]['date_argument'] = array(
'group' => t('Date'),
'title' => t('Date (!base_table)', array('!base_table' => $base_table)),
- 'help' => t('Filter any Views !base_table date field by a date argument, using any common ISO date/period format (i.e. YYYY, YYYY-MM, YYYY-MM-DD, YYYY-W99, YYYY-MM-DD--P3M, P90D, etc). ', array('!base_table' => $base_table)),
+ 'help' => t('Filter any Views !base_table date field by a date argument, using any common ISO date/period format (i.e. YYYY, YYYY-MM, YYYY-MM-DD, YYYY-W99, YYYY-MM-DD--P3M, P90D, etc).', array('!base_table' => $base_table)),
'argument' => array(
'handler' => 'date_views_argument_handler',
'empty field name' => t('Undated'),
'is date' => TRUE,
- //'skip base' => $base_table,
+ // 'skip base' => $base_table,
),
);
// The flexible date filter.
@@ -112,7 +114,7 @@ function date_views_views_data() {
'handler' => 'date_views_filter_handler',
'empty field name' => t('Undated'),
'is date' => TRUE,
- //'skip base' => $base_table,
+ // 'skip base' => $base_table,
),
);
}
@@ -140,8 +142,9 @@ function date_views_views_data_alter(&$data) {
}
/**
- * Central function for setting up the right timezone values
- * in the SQL date handler.
+ * Central function for setting up the right timezone values.
+ *
+ * In the SQL date handler.
*
* The date handler will use this information to decide if the
* database value needs a timezone conversion.
@@ -152,30 +155,45 @@ function date_views_views_data_alter(&$data) {
*/
function date_views_set_timezone(&$date_handler, &$view, $field) {
switch ($field['tz_handling']) {
- case 'date' :
+ case 'date':
$date_handler->db_timezone = 'UTC';
$date_handler->local_timezone_field = $field['timezone_field'];
$date_handler->offset_field = $field['offset_field'];
break;
+
case 'none':
$date_handler->db_timezone = date_default_timezone();
$date_handler->local_timezone = date_default_timezone();
break;
+
case 'utc':
$date_handler->db_timezone = 'UTC';
$date_handler->local_timezone = 'UTC';
break;
- default :
+
+ default:
$date_handler->db_timezone = 'UTC';
$date_handler->local_timezone = date_default_timezone();
break;
}
}
+/**
+ * Helper function to generate a query string.
+ *
+ * @param object $view
+ * A View object.
+ *
+ * @param array $extra_params
+ * An extra parameters.
+ *
+ * @return null/string
+ * Return a query or NULL.
+ */
function date_views_querystring($view, $extra_params = array()) {
$query_params = array_merge($_GET, $extra_params);
// Allow NULL params to be removed from the query string.
- foreach ($extra_params AS $key => $value) {
+ foreach ($extra_params as $key => $value) {
if (!isset($value)) {
unset($query_params[$key]);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler.inc
index 61aeafc1..20eedff0 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler.inc
@@ -3,12 +3,14 @@
* @file
* Date API views argument handler.
* This argument combines multiple date arguments into a single argument
- * where all fields are controlled by the same date and can be combined with either AND or OR.
+ * where all fields are controlled by the same date and can be combined
+ * with either AND or OR.
*/
/**
* Date API argument handler.
*/
+// @codingStandardsIgnoreStart
class date_views_argument_handler extends date_views_argument_handler_simple {
/**
@@ -198,3 +200,4 @@ class date_views_argument_handler extends date_views_argument_handler_simple {
}
}
+// @codingStandardsIgnoreEnd
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler_simple.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler_simple.inc
index 35f88e00..2839b959 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler_simple.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_argument_handler_simple.inc
@@ -7,11 +7,13 @@
/**
* Date API argument handler.
*/
+// @codingStandardsIgnoreStart
class date_views_argument_handler_simple extends views_handler_argument_date {
/**
- * Get granularity and use it to create the formula and a format
- * for the results.
+ * Get granularity.
+ *
+ * Use it to create the formula and a format for the results.
*/
function init(&$view, &$options) {
parent::init($view, $options);
@@ -29,12 +31,14 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
$this->date_handler->local_timezone = date_get_timezone($field['settings']['tz_handling']);
}
$this->date_handler->granularity = $this->options['granularity'];
- // This value needs to be initialized so it exists even if the query doesn't run.
+ // This value needs to be initialized so
+ // it exists even if the query doesn't run.
$this->date_handler->placeholders = array();
$this->format = $this->date_handler->views_formats($this->date_handler->granularity, 'display');
$this->sql_format = $this->date_handler->views_formats($this->date_handler->granularity, 'sql');
- // $this->arg_format is the format the parent date handler will use to create a default argument.
+ // $this->arg_format is the format the parent date
+ // handler will use to create a default argument.
$this->arg_format = $this->format();
// Identify the base table for this field.
@@ -43,6 +47,9 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
}
+ /**
+ * {@inheritdoc}
+ */
function format() {
if (!empty($this->options['granularity'])) {
return $this->date_handler->views_formats($this->options['granularity']);
@@ -53,8 +60,9 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
}
/**
- * Set the empty argument value to the current date,
- * formatted appropriately for this argument.
+ * Set the empty argument value to the current date.
+ *
+ * Formatted appropriately for this argument.
*/
function get_default_argument($raw = FALSE) {
$is_default = FALSE;
@@ -85,6 +93,7 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
$options = parent::option_definition();
$options['year_range'] = array('default' => '-3:+3');
$options['granularity'] = array('default' => 'month');
+ $options['granularity_reset'] = array('default' => FALSE);
$options['default_argument_type']['default'] = 'date';
$options['add_delta'] = array('default' => '');
$options['use_fromto'] = array('default' => '');
@@ -116,7 +125,9 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
'#attributes' => array('class' => array('dependent-options')),
'#states' => array(
'visible' => array(
- ':input[name="options[default_action]"]' => array('value' => 'summary')
+ ':input[name="options[default_action]"]' => array(
+ 'value' => 'summary',
+ ),
),
),
);
@@ -129,23 +140,37 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
'#attributes' => array('class' => array('dependent-options')),
'#states' => array(
'visible' => array(
- ':input[name="options[title_format]"]' => array('value' => 'custom')
+ ':input[name="options[title_format]"]' => array(
+ 'value' => 'custom',
+ ),
),
),
);
+ // Get default granularity options
$options = $this->date_handler->date_parts();
- unset($options['second'], $options['minute']);
- $options += array('week' => t('Week', array(), array('context' => 'datetime')));
+ // Add the 'week' option.
+ $options += array(
+ 'week' => t('Week', array(), array(
+ 'context' => 'datetime',
+ )),
+ );
+
$form['granularity'] = array(
'#title' => t('Granularity'),
'#type' => 'radios',
'#options' => $options,
'#default_value' => $this->options['granularity'],
- '#multiple' => TRUE,
'#description' => t("Select the type of date value to be used in defaults, summaries, and navigation. For example, a granularity of 'month' will set the default date to the current month, summarize by month in summary views, and link to the next and previous month when using date navigation."),
);
+ $form['granularity_reset'] = array(
+ '#title' => t('Use granularity from argument value'),
+ '#type' => 'checkbox',
+ '#default_value' => $this->options['granularity_reset'],
+ '#description' => t("If the granularity of argument value is different from selected, use it from argument value."),
+ );
+
$form['year_range'] = array(
'#title' => t('Date year range'),
'#type' => 'textfield',
@@ -172,16 +197,18 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
'#default_value' => $this->options['add_delta'],
'#options' => array('' => t('No'), 'yes' => t('Yes')),
'#description' => t('Add an identifier to the view to show which multiple value date fields meet the filter criteria. Note: This option may introduce duplicate values into the view. Required when using multiple value fields in a Calendar or any time you want the node view of multiple value dates to display only the values that match the view filters.'),
- // Only let mere mortals tweak this setting for multi-value fields
+ // Only let mere mortals tweak this setting for multi-value fields.
'#access' => $access,
);
-
}
+ /**
+ * {@inheritdoc}
+ */
function options_validate(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_validate($form, $form_state);
- if (!preg_match('/^(?:\-[0-9]{1,4}|[0-9]{4}):(?:[\+|\-][0-9]{1,4}|[0-9]{4})$/', $form_state['values']['options']['year_range'])) {
+ if (!preg_match('/^(?:\-[0-9]{1,4}|[0-9]{4}):(?:[\+\-][0-9]{1,4}|[0-9]{4})$/', $form_state['values']['options']['year_range'])) {
form_error($form['year_range'], t('Date year range must be in the format -9:+9, 2005:2010, -9:2010, or 2005:+9'));
}
}
@@ -209,14 +236,15 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
$format = !empty($this->options['title_format_custom']) && !empty($this->options['title_format_custom']) ? $this->options['title_format_custom'] : $this->date_handler->views_formats($this->options['granularity'], 'display');
$range = $this->date_handler->arg_range($this->argument);
return date_format_date($range[0], 'custom', $format);
- }
+ }
/**
- * Provide the argument to use to link from the summary to the next level;
- * this will be called once per row of a summary, and used as part of
+ * Provide the argument to use to link from the summary to the next level.
+ *
+ * This will be called once per row of a summary, and used as part of
* $view->get_url().
*
- * @param $data
+ * @param object $data
* The query results for the row.
*/
function summary_argument($data) {
@@ -234,10 +262,11 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
*/
function summary_query() {
- // @TODO The summary values are computed by the database. Unless the database has
- // built-in timezone handling it will use a fixed offset, which will not be
- // right for all dates. The only way I can see to make this work right is to
- // store the offset for each date in the database so it can be added to the base
+ // @TODO The summary values are computed by the database.
+ // Unless the database has built-in timezone handling it will use
+ // a fixed offset, which will not be right for all dates.
+ // The only way I can see to make this work right is to store the offset
+ // for each date in the database so it can be added to the base
// date value before the database formats the result. Because this is a huge
// architectural change, it won't go in until we start a new branch.
$this->formula = $this->date_handler->sql_format($this->sql_format, $this->date_handler->sql_field("***table***.$this->real_field"));
@@ -245,7 +274,8 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
// Now that our table is secure, get our formula.
$formula = $this->get_formula();
- // Add the field, give it an alias that does NOT match the actual field name or grouping won't work right.
+ // Add the field, give it an alias that does NOT match the actual
+ // field name or grouping won't work right.
$this->base_alias = $this->name_alias = $this->query->add_field(NULL, $formula, $this->field . '_summary');
$this->query->set_count_field(NULL, $formula, $this->field);
@@ -254,20 +284,22 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
/**
* Inject a test for valid date range before the regular query.
+ *
* Override the parent query to be able to control the $group.
*/
function query($group_by = FALSE) {
- // @TODO Not doing anything with $group_by yet, need to figure out what has to be done.
+ // @TODO Not doing anything with $group_by yet,
+ // need to figure out what has to be done.
if ($this->date_forbid()) {
return;
}
// See if we need to reset granularity based on an argument value.
- // Make sure we don't try to reset to some bogus value if someone has typed in an unexpected argument.
- $granularity = $this->date_handler->arg_granularity($this->argument);
- if (!empty($granularity)) {
+ // Make sure we don't try to reset to some bogus value if someone has
+ // typed in an unexpected argument.
+ if ($this->options['granularity_reset'] && $granularity = $this->date_handler->arg_granularity($this->argument)) {
$this->date_handler->granularity = $granularity;
$this->format = $this->date_handler->views_formats($this->date_handler->granularity, 'display');
$this->sql_format = $this->date_handler->views_formats($this->date_handler->granularity, 'sql');
@@ -276,7 +308,8 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
$this->ensure_my_table();
$group = !empty($this->options['date_group']) ? $this->options['date_group'] : 0;
- // If requested, add the delta field to the view so we can later find the value that matched our query.
+ // If requested, add the delta field to the view so
+ // we can later find the value that matched our query.
if (!empty($this->options['add_delta']) && (substr($this->real_field, -6) == '_value' || substr($this->real_field, -7) == '_value2')) {
$this->query->add_field($this->table_alias, 'delta');
$real_field_name = str_replace(array('_value', '_value2'), '', $this->real_field);
@@ -291,7 +324,8 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
$view_max_placeholder = $this->placeholder();
$this->date_handler->placeholders = array($view_min_placeholder => $view_min, $view_max_placeholder => $view_max);
- // Are we comparing this field only or the Start/End date range to the view criteria?
+ // Are we comparing this field only or the Start/End date range
+ // to the view criteria?
if (!empty($this->options['use_fromto'])) {
// The simple case, match the field to the view range.
@@ -302,10 +336,14 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
}
else {
- // Look for the intersection of the range of the date field with the range of the view.
- // Get the Start/End values for this field. Retrieve using the original table name.
- // Swap the current table name (adjusted for relationships) into the query.
- // @TODO We may be able to use Views substitutions here, investigate that later.
+ // Look for the intersection of the range
+ // of the date field with the range of the view.
+ // Get the Start/End values for this field.
+ // Retrieve using the original table name.
+ // Swap the current table name (adjusted for relationships)
+ // into the query.
+ // @TODO We may be able to use Views substitutions here,
+ // investigate that later.
$fields = date_views_fields($this->base_table);
$fields = $fields['name'];
$fromto = $fields[$this->original_table . '.' . $this->real_field]['fromto'];
@@ -321,7 +359,10 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
}
/**
- * Add a callback to determine if we have moved outside the valid date range for this argument.
+ * Add a callback.
+ *
+ * To determine if we have moved outside
+ * the valid date range for this argument.
*/
function date_forbid() {
if (empty($this->argument)) {
@@ -343,3 +384,4 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
}
}
+// @codingStandardsIgnoreEnd
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_fields.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_fields.inc
index a002b088..d497ef60 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_fields.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_fields.inc
@@ -5,13 +5,11 @@
*/
/**
- * Identify all potential date/timestamp fields.
+ * Identify all potential date/timestamp fields.
*
- * @return
- * array with fieldname, type, and table.
- * @see
- * date_views_date_views_fields() which implements
- * the hook_date_views_fields() for the core date fields.
+ * @return array
+ * An array with fieldname, type, and table.
+ * @see date_views_date_views_fields()
*/
function _date_views_fields($base = 'node') {
@@ -60,7 +58,7 @@ function _date_views_fields($base = 'node') {
$handler = views_get_handler($table_name, $field_name, 'filter');
$handler_name = $handler->definition['handler'];
- // We don't care about anything but date handlers
+ // We don't care about anything but date handlers.
if (empty($handler->definition['is date'])) {
continue;
}
@@ -72,14 +70,17 @@ function _date_views_fields($base = 'node') {
$field = field_info_field($handler->definition['field_name']);
$is_field = TRUE;
switch ($field['type']) {
- case 'date':
+ case 'date':
$sql_type = DATE_ISO;
break;
+
case 'datestamp':
break;
+
case 'datetime':
$sql_type = DATE_DATETIME;
break;
+
default:
// If this is not a date field, nothing more to do.
continue;
@@ -88,7 +89,8 @@ function _date_views_fields($base = 'node') {
$revision = in_array($base, array('node_revision')) ? FIELD_LOAD_REVISION : FIELD_LOAD_CURRENT;
$db_info = date_api_database_info($field, $revision);
$name = $table_name . "." . $field_name;
- $granularity = !empty($field['granularity']) ? $field['granularity'] : array('year', 'month', 'day', 'hour', 'minute', 'second');
+ $grans = array('year', 'month', 'day', 'hour', 'minute', 'second');
+ $granularity = !empty($field['granularity']) ? $field['granularity'] : $grans;
$fromto = array(
$table_name . '.' . $db_info['columns'][$table_name]['value'],
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler.inc
index 0cfc7fcc..ae6944ee 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler.inc
@@ -3,9 +3,11 @@
* @file
* A flexible, configurable date filter.
* This filter combines multiple date filters into a single filter
- * where all fields are controlled by the same date and can be combined with either AND or OR.
+ * where all fields are controlled by the same date and can be combined
+ * with either AND or OR.
*/
+// @codingStandardsIgnoreStart
class date_views_filter_handler extends date_views_filter_handler_simple {
function init(&$view, &$options) {
parent::init($view, $options);
@@ -40,6 +42,32 @@ class date_views_filter_handler extends date_views_filter_handler_simple {
$this->date_combine_conditions('op_contains');
}
+ function op_empty($field) {
+ $this->get_query_fields();
+ if (empty($this->query_fields)) {
+ return;
+ }
+
+ // Add each condition to the custom filter group.
+ foreach ((array) $this->query_fields as $query_field) {
+ $field = $query_field['field'];
+ $this->date_handler = $query_field['date_handler'];
+
+ // Respect relationships when determining the table alias.
+ if ($field['table_name'] != $this->table || !empty($this->relationship)) {
+ $this->related_table_alias = $this->query->ensure_table($field['table_name'], $this->relationship);
+ }
+ else {
+ $this->related_table_alias = NULL;
+ }
+
+ $table_alias = !empty($this->related_table_alias) ? $this->related_table_alias : $field['table_name'];
+ $field_name = $table_alias . '.' . $field['field_name'];
+
+ parent::op_empty($field_name);
+ }
+ }
+
/**
* Combines multiple date WHERE expressions into a single WHERE expression.
*
@@ -64,6 +92,9 @@ class date_views_filter_handler extends date_views_filter_handler_simple {
if ($field['table_name'] != $this->table || !empty($this->relationship)) {
$this->related_table_alias = $this->query->ensure_table($field['table_name'], $this->relationship);
}
+ else {
+ $this->related_table_alias = NULL;
+ }
$table_alias = !empty($this->related_table_alias) ? $this->related_table_alias : $field['table_name'];
$field_name = $table_alias . '.' . $field['field_name'];
@@ -179,3 +210,4 @@ class date_views_filter_handler extends date_views_filter_handler_simple {
}
}
}
+// @codingStandardsIgnoreEnd
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler_simple.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler_simple.inc
index d41f30b6..4fa4c409 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler_simple.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_filter_handler_simple.inc
@@ -1,9 +1,11 @@
$operator_values);
}
if (!isset($form_state['input'][$identifier][$prefix])) {
- $form_state['input'][$identifier][$prefix] = $this->value[$prefix];
+ // Ensure these exist.
+ foreach ($granularity as $key) {
+ $form_state['input'][$identifier][$prefix][$key] = NULL;
+ }
}
}
else {
@@ -530,3 +535,4 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
}
}
+// @codingStandardsIgnoreEnd
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_plugin_pager.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_plugin_pager.inc
index f9594a72..1addd200 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_plugin_pager.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/includes/date_views_plugin_pager.inc
@@ -2,50 +2,74 @@
/**
* @file
* Date pager.
- * Works with a Date argument, the argument filters the view and the pager provides back/next navigation.
+ * Works with a Date argument, the argument filters
+ * the view and the pager provides back/next navigation.
*
* USER NOTES:
*
* To use this, add a pager to a view, and choose the option to 'Page by date'.
* There are several settings:
- * - The pager id: Set an id to be used as the identifier in the url for pager values, defaults to 'date'.
- * - Pager position: Choose whether to display the date pager above, below, or both above and below the content.
- * - Link format: Choose whether the pager links will be in the simple 'calendar/2011-12' format or the
- * more complex 'calendar/?date=2011-12' pager format. The second one is more likely to work correctly
- * if the pager is used in blocks and panels.
+ * - The pager id: Set an id to be used as the identifier
+ * in the url for pager values, defaults to 'date'.
+ * - Pager position: Choose whether to display the date
+ * pager above, below, or both above and below the content.
+ * - Link format: Choose whether the pager links will be in t
+ * he simple 'calendar/2011-12' format or the
+ * more complex 'calendar/?date=2011-12' pager format.
+ * The second one is more likely to work correctly
+ * if the pager is used in blocks and panels.
*
- * The pager works in combination with a Date argument and it will use the date fields and granularity
- * set in that argument to create its back/next links. If the view has no Date argument, the pager can
- * do nothing. The argument can either be a 'Date' argument that lets you select one or more date fields
- * in the argument, or the simple 'Content' argument for an individual date field. It must be an
+ * The pager works in combination with a Date argument
+ * and it will use the date fields and granularity
+ * set in that argument to create its back/next links.
+ * If the view has no Date argument, the pager can
+ * do nothing. The argument can either be a 'Date' argument
+ * that lets you select one or more date fields
+ * in the argument, or the simple 'Content' argument for an
+ * individual date field. It must be an
* argument that uses the date argument handler.
*
* DEVELOPER NOTES
*
- * The pager could technically create a query of its own rather than depending on the date argument to
- * set the query, but it has only a limited set of tools to work with because it is a plugin, not a handler:
- * it has no knowledge about relationships, it cannot use the ensure_my_table() function,
- * plugins are not even invoked in pre_query(), so can't do anything there.
+ * The pager could technically create a query of its own rather
+ * than depending on the date argument to
+ * set the query, but it has only a limited set of tools to work
+ * with because it is a plugin, not a handler:
+ * it has no knowledge about relationships, it cannot use the
+ * ensure_my_table() function, plugins are not even invoked in pre_query(),
+ * so can't do anything there.
*
- * My conclusion was that the date pager simply is not powerful enough to create its own queries for
- * date fields, which require very complex queries. Instead, we can combine this with a date argument and
- * let the argument create the query and let the pager just provide the back/next links. If there is no
+ * My conclusion was that the date pager simply
+ * is not powerful enough to create its own queries for
+ * date fields, which require very complex queries.
+ * Instead, we can combine this with a date argument and
+ * let the argument create the query and let the pager
+ * just provide the back/next links. If there is no
* date argument, the pager will do nothing.
*
- * There are still other problems. The pager is not even initialized until after all the handlers
- * have created their queries, so it has no chance to alter values ahead of that. And the argument
- * has no knowledge of the pager, so it can't check for pager values before the query is created.
+ * There are still other problems. The pager is not even
+ * initialized until after all the handlers
+ * have created their queries, so it has no chance
+ * to alter values ahead of that. And the argument
+ * has no knowledge of the pager, so it can't check
+ * for pager values before the query is created.
*
- * The solution used here is to let the argument create the original query. The pager query
- * runs after that, so the pager checks to see if there is a pager value that needs to be used in the query.
- * The date argument has identified the placeholders it used in the query. So if a change is needed,
- * we can swap the pager value into the query created by the date argument and adjust the
- * $view->date_info values set by the argument accordingly so the theme will pick up the new information.
+ * The solution used here is to let the argument create
+ * the original query. The pager query
+ * runs after that, so the pager checks to see
+ * if there is a pager value that needs to be used in the query.
+ * The date argument has identified the placeholders
+ * it used in the query. So if a change is needed,
+ * we can swap the pager value into the query created
+ * by the date argument and adjust the
+ * $view->date_info values set by the argument accordingly
+ * so the theme will pick up the new information.
*/
/**
* Example plugin to handle paging by month.
*/
+// @codingStandardsIgnoreStart
class date_views_plugin_pager extends views_plugin_pager {
/**
@@ -79,6 +103,7 @@ class date_views_plugin_pager extends views_plugin_pager {
$options['link_format'] = array('default' => 'pager');
$options['date_argument'] = array('default' => 'Unknown');
$options['granularity'] = array('default' => 'Unknown');
+ $options['skip_empty_pages'] = array('default' => FALSE);
return $options;
}
@@ -110,6 +135,12 @@ class date_views_plugin_pager extends views_plugin_pager {
'#default_value' => $this->options['link_format'],
'#required' => TRUE,
);
+ $form['skip_empty_pages'] = array(
+ '#title' => t('Skip empty pages'),
+ '#type' => 'checkbox',
+ '#description' => t('When selected, the pager will not display pages with no result for the given date. This causes a slight performance degradation because two additional queries need to be executed.'),
+ '#default_value' => $this->options['skip_empty_pages'],
+ );
$form['date_argument']['#type'] = 'hidden';
$form['date_argument']['#value'] = $this->options['date_argument'];
$form['granularity']['#type'] = 'hidden';
@@ -150,13 +181,7 @@ class date_views_plugin_pager extends views_plugin_pager {
// Reset values set by argument if pager requires it.
if (!empty($value)) {
- $argument->argument = $value;
- $argument->date_range = $argument->date_handler->arg_range($value);
- $argument->min_date = $argument->date_range[0];
- $argument->max_date = $argument->date_range[1];
- // $argument->is_default works correctly for normal arguments, but does not
- // work correctly if we are swapping in a new value from the pager.
- $argument->is_default = FALSE;
+ $this->set_argument_value($argument, $value);
}
// The pager value might move us into a forbidden range, so test it.
@@ -164,13 +189,102 @@ class date_views_plugin_pager extends views_plugin_pager {
$this->view->build_info['fail'] = TRUE;
return;
}
-
- if (empty($this->view->date_info)) $this->view->date_info = new stdClass();
+ // Write date_info to store information to be used
+ // in the theming functions.
+ if (empty($this->view->date_info)) {
+ $this->view->date_info = new stdClass();
+ }
$this->view->date_info->granularity = $argument->date_handler->granularity;
$format = $this->view->date_info->granularity == 'week' ? DATE_FORMAT_DATETIME : $argument->sql_format;
$this->view->date_info->placeholders = isset($argument->placeholders) ? $argument->placeholders : $argument->date_handler->placeholders;
$this->view->date_info->date_arg = $argument->argument;
$this->view->date_info->date_arg_pos = $i;
+ $this->view->date_info->limit = $argument->limit;
+ $this->view->date_info->url = $this->view->get_url();
+ $this->view->date_info->pager_id = $this->options['date_id'];
+ $this->view->date_info->date_pager_position = $this->options['pager_position'];
+ $this->view->date_info->date_pager_format = $this->options['link_format'];
+ $this->view->date_info->skip_empty_pages = $this->options['skip_empty_pages'] == 1;
+ // Execute two additional queries to find
+ // the previous and next page with values.
+ if ($this->view->date_info->skip_empty_pages) {
+ $q = clone $argument->query;
+ $field = $argument->table_alias . '.' . $argument->real_field;
+ $fieldsql = $date_handler->sql_field($field);
+ $fieldsql = $date_handler->sql_format($format, $fieldsql);
+ $q->clear_fields();
+ $q->orderby = array();
+ $q->set_distinct(TRUE, TRUE);
+ // Date limits of this argument.
+ $datelimits = $argument->date_handler->arg_range($argument->limit[0] . '--' . $argument->limit[1]);
+ // Find the first two dates between the minimum date
+ // and the upper bound of the current value.
+ $q->add_orderby(NULL, $fieldsql, 'DESC', 'date');
+ $this->set_argument_placeholders($this->view->date_info->placeholders, $datelimits[0], $argument->max_date, $q, $format);
+
+ $compiledquery = $q->query();
+ $compiledquery->range(0, 2);
+ $results = $compiledquery->execute()->fetchCol(0);
+
+ $prevdate = array_shift($results);
+ $prevdatealt = array_shift($results);
+ // Find the first two dates between the lower bound
+ // of the current value and the maximum date.
+ $q->add_orderby(NULL, $fieldsql, 'ASC', 'date');
+ $this->set_argument_placeholders($this->view->date_info->placeholders, $argument->min_date, $datelimits[1], $q, $format);
+
+ $compiledquery = $q->query();
+ $compiledquery->range(0, 2);
+ $results = $compiledquery->execute()->fetchCol(0);
+
+ $nextdate = array_shift($results);
+ $nextdatealt = array_shift($results);
+
+ // Set the default value of the query to $prevfirst or $nextfirst
+ // when there is no value and $prevsecond or $nextsecond is set.
+ if (empty($value)) {
+ // @Todo find out which of $prevdate or $nextdate is closest to the
+ // default argument date value and choose that one.
+ if ($prevdate && $prevdatealt) {
+ $this->set_argument_value($argument, $prevdate);
+ $value = $prevdate;
+ $prevdate = $prevdatealt;
+ // If the first next date is the same as the first previous date,
+ // move to the following next date.
+ if ($value == $nextdate) {
+ $nextdate = $nextdatealt;
+ $nextdatealt = NULL;
+ }
+ }
+ elseif ($nextdate && $nextdatealt) {
+ $this->set_argument_value($argument, $nextdate);
+ $value = $nextdate;
+ $nextdate = $nextdatealt;
+ // If the first previous date is the same as the first next date,
+ // move to the following previous date.
+ if ($value == $prevdate) {
+ $prevdate = $prevdatealt;
+ $prevdatealt = NULL;
+ }
+ }
+ }
+ else {
+ // $prevdate and $nextdate are the same as $value, so move to
+ // the next values.
+ $prevdate = $prevdatealt;
+ $nextdate = $nextdatealt;
+ }
+
+ $this->view->date_info->prev_date = $prevdate ? new DateObject($prevdate, NULL, $format) : NULL;
+ $this->view->date_info->next_date = $nextdate ? new DateObject($nextdate, NULL, $format) : NULL;
+ }
+ else {
+ $this->view->date_info->prev_date = clone($argument->min_date);
+ date_modify($this->view->date_info->prev_date, '-1 ' . $argument->date_handler->granularity);
+ $this->view->date_info->next_date = clone($argument->min_date);
+ date_modify($this->view->date_info->next_date, '+1 ' . $argument->date_handler->granularity);
+ }
+ // Write the date_info properties that depend on the current value.
$this->view->date_info->year = date_format($argument->min_date, 'Y');
$this->view->date_info->month = date_format($argument->min_date, 'n');;
$this->view->date_info->day = date_format($argument->min_date, 'j');
@@ -178,11 +292,6 @@ class date_views_plugin_pager extends views_plugin_pager {
$this->view->date_info->date_range = $argument->date_range;
$this->view->date_info->min_date = $argument->min_date;
$this->view->date_info->max_date = $argument->max_date;
- $this->view->date_info->limit = $argument->limit;
- $this->view->date_info->url = $this->view->get_url();
- $this->view->date_info->pager_id = $this->options['date_id'];
- $this->view->date_info->date_pager_position = $this->options['pager_position'];
- $this->view->date_info->date_pager_format = $this->options['link_format'];
}
$i++;
}
@@ -191,20 +300,33 @@ class date_views_plugin_pager extends views_plugin_pager {
// If there is pager input and the argument has set the placeholders,
// swap the pager value in for the placeholder set by the argument.
if (!empty($value) && !empty($this->view->date_info->placeholders)) {
- $placeholders = $this->view->date_info->placeholders;
- $count = count($placeholders);
- foreach ($this->view->query->where as $group => $data) {
- foreach ($data['conditions'] as $delta => $condition) {
- if (array_key_exists('value', $condition) && is_array($condition['value'])) {
- foreach ($condition['value'] as $placeholder => $placeholder_value) {
- if (array_key_exists($placeholder, $placeholders)) {
- // If we didn't get a match, this is a > $min < $max query that uses the view
- // min and max dates as placeholders.
- $date = ($count == 2) ? $this->view->date_info->min_date : $this->view->date_info->max_date;
- $next_placeholder = array_shift($placeholders);
- $this->view->query->where[$group]['conditions'][$delta]['value'][$placeholder] = $date->format($format);
- $count--;
- }
+ $this->set_argument_placeholders($this->view->date_info->placeholders, $this->view->date_info->min_date, $this->view->date_info->max_date, $this->view->query, $format);
+ }
+ }
+
+ function set_argument_value($argument, $value) {
+ $argument->argument = $value;
+ $argument->date_range = $argument->date_handler->arg_range($value);
+ $argument->min_date = $argument->date_range[0];
+ $argument->max_date = $argument->date_range[1];
+ // $argument->is_default works correctly for normal arguments, but does not
+ // work correctly if we are swapping in a new value from the pager.
+ $argument->is_default = FALSE;
+ }
+
+ function set_argument_placeholders($placeholders, $mindate, $maxdate, $query, $format) {
+ $count = count($placeholders);
+ foreach ($query->where as $group => $data) {
+ foreach ($data['conditions'] as $delta => $condition) {
+ if (array_key_exists('value', $condition) && is_array($condition['value'])) {
+ foreach ($condition['value'] as $placeholder => $placeholder_value) {
+ if (array_key_exists($placeholder, $placeholders)) {
+ // If we didn't get a match, this is a > $min < $max query that uses the view
+ // min and max dates as placeholders.
+ $date = ($count == 2) ? $mindate : $maxdate;
+ $next_placeholder = array_shift($placeholders);
+ $query->where[$group]['conditions'][$delta]['value'][$placeholder] = $date->format($format);
+ $count--;
}
}
}
@@ -230,4 +352,5 @@ class date_views_plugin_pager extends views_plugin_pager {
$pager_theme = views_theme_functions('date_views_pager', $this->view, $this->display);
return theme($pager_theme, array('plugin' => $this, 'input' => $input));
}
-}
\ No newline at end of file
+}
+// @codingStandardsIgnoreEnd
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/date-views-pager.tpl.php b/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/date-views-pager.tpl.php
index b12c2e1c..ac8cfb4e 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/date-views-pager.tpl.php
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/date-views-pager.tpl.php
@@ -27,8 +27,10 @@
* be used in the l() function, including rel=nofollow.
*/
?>
-
-
+
+
+
+
\ No newline at end of file
+
diff --git a/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/theme.inc b/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/theme.inc
index 8c42a527..7ca03f3a 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/date/date_views/theme/theme.inc
@@ -4,6 +4,7 @@
* @file
* Theme files for Date Pager.
*/
+
/**
* Jump in and move the pager.
*/
@@ -15,9 +16,11 @@ function date_views_preprocess_views_view(&$vars) {
$vars['header'] .= $vars['pager'];
$vars['pager'] = '';
break;
+
case 'both':
$vars['header'] .= $vars['pager'];
break;
+
default:
// Already on the bottom.
}
@@ -66,28 +69,37 @@ function template_preprocess_date_views_pager(&$vars) {
}
if (empty($date_info->hide_nav)) {
- $prev_date = clone($min_date);
- date_modify($prev_date, '-1 ' . $granularity);
- $next_date = clone($min_date);
- date_modify($next_date, '+1 ' . $granularity);
- $format = array('year' => 'Y', 'month' => 'Y-m', 'day' => 'Y-m-d');
- switch ($granularity) {
- case 'week':
- $next_week = date_week(date_format($next_date, 'Y-m-d'));
- $prev_week = date_week(date_format($prev_date, 'Y-m-d'));
- $next_arg = date_format($next_date, 'o-\W') . date_pad($next_week);
- $prev_arg = date_format($prev_date, 'o-\W') . date_pad($prev_week);
- break;
- default:
- $next_arg = date_format($next_date, $format[$granularity]);
- $prev_arg = date_format($prev_date, $format[$granularity]);
+ $prev_date = $date_info->prev_date;
+ $next_date = $date_info->next_date;
+
+ $format = array('year' => 'Y', 'month' => 'Y-m', 'day' => 'Y-m-d', 'hour' => 'Y-m-d\TH');
+ if (!empty($prev_date)) {
+ switch ($granularity) {
+ case 'week':
+ $prev_week = date_week(date_format($prev_date, 'Y-m-d'));
+ $prev_arg = date_format($prev_date, 'o-\W') . date_pad($prev_week);
+ break;
+ default:
+ $prev_arg = date_format($prev_date, $format[$granularity]);
+ }
+ $prev_path = str_replace($date_info->date_arg, $prev_arg, $date_info->url);
+ $prev_args[$pos] = $prev_arg;
+ $vars['prev_url'] = date_pager_url($view, NULL, $prev_arg);
}
- $next_path = str_replace($date_info->date_arg, $next_arg, $date_info->url);
- $prev_path = str_replace($date_info->date_arg, $prev_arg, $date_info->url);
- $next_args[$pos] = $next_arg;
- $prev_args[$pos] = $prev_arg;
- $vars['next_url'] = date_pager_url($view, NULL, $next_arg);
- $vars['prev_url'] = date_pager_url($view, NULL, $prev_arg);
+ if (!empty($next_date)) {
+ switch ($granularity) {
+ case 'week':
+ $next_week = date_week(date_format($next_date, 'Y-m-d'));
+ $next_arg = date_format($next_date, 'o-\W') . date_pad($next_week);
+ break;
+ default:
+ $next_arg = date_format($next_date, $format[$granularity]);
+ }
+ $next_path = str_replace($date_info->date_arg, $next_arg, $date_info->url);
+ $next_args[$pos] = $next_arg;
+ $vars['next_url'] = date_pager_url($view, NULL, $next_arg);
+ }
+
$vars['next_options'] = $vars['prev_options'] = array();
}
else {
@@ -117,14 +129,17 @@ function template_preprocess_date_views_pager(&$vars) {
$prev_title = t('Navigate to previous year');
$next_title = t('Navigate to next year');
break;
+
case 'month':
$prev_title = t('Navigate to previous month');
$next_title = t('Navigate to next month');
break;
+
case 'week':
$prev_title = t('Navigate to previous week');
$next_title = t('Navigate to next week');
break;
+
case 'day':
$prev_title = t('Navigate to previous day');
$next_title = t('Navigate to next day');
@@ -157,34 +172,44 @@ function template_preprocess_date_views_pager(&$vars) {
}
/**
- * Theme the calendar title
+ * Theme the calendar title.
*/
function theme_date_nav_title($params) {
+ $title = '';
$granularity = $params['granularity'];
$view = $params['view'];
$date_info = $view->date_info;
$link = !empty($params['link']) ? $params['link'] : FALSE;
$format = !empty($params['format']) ? $params['format'] : NULL;
- $format_with_year = variable_get('date_views_' . $granularity . 'format_with_year', 'l, F j, Y');
- $format_without_year = variable_get('date_views_' . $granularity . 'format_without_year', 'l, F j');
+ $format_with_year = variable_get('date_views_' . $granularity . '_format_with_year', 'l, F j, Y');
+ $format_without_year = variable_get('date_views_' . $granularity . '_format_without_year', 'l, F j');
switch ($granularity) {
case 'year':
$title = $date_info->year;
$date_arg = $date_info->year;
break;
+
case 'month':
$format = !empty($format) ? $format : (empty($date_info->mini) ? $format_with_year : $format_without_year);
$title = date_format_date($date_info->min_date, 'custom', $format);
$date_arg = $date_info->year . '-' . date_pad($date_info->month);
break;
+
case 'day':
$format = !empty($format) ? $format : (empty($date_info->mini) ? $format_with_year : $format_without_year);
$title = date_format_date($date_info->min_date, 'custom', $format);
- $date_arg = $date_info->year . '-' . date_pad($date_info->month) . '-' . date_pad($date_info->day);
+ $date_arg = $date_info->year;
+ $date_arg .= '-';
+ $date_arg .= date_pad($date_info->month);
+ $date_arg .= '-';
+ $date_arg .= date_pad($date_info->day);
break;
+
case 'week':
$format = !empty($format) ? $format : (empty($date_info->mini) ? $format_with_year : $format_without_year);
- $title = t('Week of @date', array('@date' => date_format_date($date_info->min_date, 'custom', $format)));
+ $title = t('Week of @date', array(
+ '@date' => date_format_date($date_info->min_date, 'custom', $format),
+ ));
$date_arg = $date_info->year . '-W' . date_pad($date_info->week);
break;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_api.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_api.test
index f50020c1..03c9081b 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/tests/date_api.test
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_api.test
@@ -132,11 +132,11 @@ class DateAPITestCase extends DrupalWebTestCase {
// Test week range with calendar weeks.
variable_set('date_first_day', 0);
variable_set('date_api_use_iso8601', FALSE);
- $expected = '2008-01-27 to 2008-02-03';
+ $expected = '2008-01-27 to 2008-02-02';
$result = date_week_range(5, 2008);
$value = $result[0]->format(DATE_FORMAT_DATE) . ' to ' . $result[1]->format(DATE_FORMAT_DATE);
$this->assertEqual($expected, $value, "Test calendar date_week_range(5, 2008): should be $expected, found $value.");
- $expected = '2009-01-25 to 2009-02-01';
+ $expected = '2009-01-25 to 2009-01-31';
$result = date_week_range(5, 2009);
$value = $result[0]->format(DATE_FORMAT_DATE) . ' to ' . $result[1]->format(DATE_FORMAT_DATE);
$this->assertEqual($expected, $value, "Test calendar date_week_range(5, 2009): should be $expected, found $value.");
@@ -144,11 +144,11 @@ class DateAPITestCase extends DrupalWebTestCase {
// And now with ISO weeks.
variable_set('date_first_day', 1);
variable_set('date_api_use_iso8601', TRUE);
- $expected = '2008-01-28 to 2008-02-04';
+ $expected = '2008-01-28 to 2008-02-03';
$result = date_week_range(5, 2008);
$value = $result[0]->format(DATE_FORMAT_DATE) . ' to ' . $result[1]->format(DATE_FORMAT_DATE);
$this->assertEqual($expected, $value, "Test ISO date_week_range(5, 2008): should be $expected, found $value.");
- $expected = '2009-01-26 to 2009-02-02';
+ $expected = '2009-01-26 to 2009-02-01';
$result = date_week_range(5, 2009);
$value = $result[0]->format(DATE_FORMAT_DATE) . ' to ' . $result[1]->format(DATE_FORMAT_DATE);
$this->assertEqual($expected, $value, "Test ISO date_week_range(5, 2009): should be $expected, found $value.");
@@ -393,9 +393,31 @@ class DateAPITestCase extends DrupalWebTestCase {
$input = '23 abc 2012';
$timezone = NULL;
$format = 'd M Y';
- $date = new dateObject($input, $timezone, $format);
+ $date = @new dateObject($input, $timezone, $format);
$this->assertNotEqual(count($date->errors), 0, '23 abc 2012 should be an invalid date');
+ // Test Granularity.
+ $input = '2005-06-01 10:30:45';
+ $timezone = NULL;
+ $format = 'Y-m-d H:i:s';
+
+ $date = new dateObject($input, $timezone, $format);
+ $date->removeGranularity('hour');
+ $date->removeGranularity('second');
+ $date->removeGranularity('minute');
+
+ $value = $date->format($format);
+ $expected = '2005-06-01';
+ $this->assertEqual($expected, $value, "The date with removed granularity should be $expected, found $value.");
+
+ $date->addGranularity('hour');
+ $date->addGranularity('second');
+ $date->addGranularity('minute');
+
+ $value = $date->format($format);
+ $expected = '2005-06-01 10:30:45';
+
+ $this->assertEqual($expected, $value, "The date with added granularity should be $expected, found $value.");
}
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_field.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_field.test
index b2a45a0d..b8aad594 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/tests/date_field.test
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_field.test
@@ -16,7 +16,7 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
// Create and log in our privileged user.
$this->privileged_user = $this->drupalCreateUser(
- array('administer content types', 'administer nodes', 'bypass node access', 'administer date tools')
+ array('administer content types', 'administer nodes', 'bypass node access', 'administer date tools', 'administer fields')
);
$this->drupalLogin($this->privileged_user);
@@ -52,7 +52,7 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
$repeat = !empty($repeat) ? $repeat : 0;
$todate = !empty($todate) ? $todate : 'optional';
$widget_type = !empty($widget_type) ? $widget_type : 'date_select';
- $tz_handling = !empty($tz_handing) ? $tz_handling : 'site';
+ $tz_handling = !empty($tz_handling) ? $tz_handling : 'site';
$granularity = !empty($granularity) ? $granularity : array('year', 'month', 'day', 'hour', 'minute');
$year_range = !empty($year_range) ? $year_range : '2010:+1';
$input_format = !empty($input_format) ? $input_format : date_default_format($widget_type);
@@ -151,6 +151,123 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
}
+ /**
+ * Creates a date field from an array of settings values.
+ *
+ * All values have defaults, only need to specify values that need to be
+ * different.
+ */
+ protected function createMultiDateField($values = array()) {
+ extract($values);
+
+ $field_name = !empty($field_name) ? $field_name : 'field_test';
+ $entity_type = !empty($entity_type) ? $entity_type : 'node';
+ $bundle = !empty($bundle) ? $bundle : 'story';
+ $label = !empty($label) ? $label : 'Test';
+ $field_type = !empty($field_type) ? $field_type : 'datetime';
+ $repeat = !empty($repeat) ? $repeat : 0;
+ $todate = !empty($todate) ? $todate : 'optional';
+ $widget_type = !empty($widget_type) ? $widget_type : 'date_select';
+ $this->verbose(!empty($tz_handling));
+ $tz_handling = !empty($tz_handling) ? $tz_handling : 'site';
+ $granularity = !empty($granularity) ? $granularity : array('year', 'month', 'day', 'hour', 'minute');
+ $year_range = !empty($year_range) ? $year_range : '2010:+1';
+ $input_format = !empty($input_format) ? $input_format : date_default_format($widget_type);
+ $input_format_custom = !empty($input_format_custom) ? $input_format_custom : '';
+ $text_parts = !empty($text_parts) ? $text_parts : array();
+ $increment = !empty($increment) ? $increment : 15;
+ $default_value = !empty($default_value) ? $default_value : 'now';
+ $default_value2 = !empty($default_value2) ? $default_value2 : 'blank';
+ $default_format = !empty($default_format) ? $default_format : 'long';
+ $cache_enabled = !empty($cache_enabled);
+ $cache_count = !empty($cache_count) ? $cache_count : 4;
+ $cardinality = !empty($cardinality) ? $cardinality : 1;
+
+ $field = array(
+ 'field_name' => $field_name,
+ 'type' => $field_type,
+ 'cardinality' => $cardinality,
+ 'settings' => array(
+ 'granularity' => $granularity,
+ 'tz_handling' => $tz_handling,
+ 'timezone_db' => date_get_timezone_db($tz_handling),
+ 'repeat' => $repeat,
+ 'todate' => $todate,
+ 'cache_enabled' => $cache_enabled,
+ 'cache_count' => $cache_count,
+ ),
+ );
+ $instance = array(
+ 'entity_type' => $entity_type,
+ 'field_name' => $field_name,
+ 'label' => $label,
+ 'bundle' => $bundle,
+ // Move the date right below the title.
+ 'weight' => -4,
+ 'widget' => array(
+ 'type' => $widget_type,
+ // Increment for minutes and seconds, can be 1, 5, 10, 15, or 30.
+ 'settings' => array(
+ 'increment' => $increment,
+ // The number of years to go back and forward in drop-down year
+ // selectors.
+ 'year_range' => $year_range,
+ 'input_format' => $input_format,
+ 'input_format_custom' => $input_format_custom,
+ 'text_parts' => $text_parts,
+ 'label_position' => 'above',
+ 'repeat_collapsed' => 0,
+ ),
+ 'weight' => -4,
+ ),
+ 'settings' => array(
+ 'default_value' => $default_value,
+ 'default_value2' => $default_value2,
+ ),
+ );
+
+ $instance['display'] = array(
+ 'default' => array(
+ 'label' => 'above',
+ 'type' => 'date_default',
+ 'settings' => array(
+ 'format_type' => $default_format,
+ 'show_repeat_rule' => 'show',
+ 'multiple_number' => '',
+ 'multiple_from' => '',
+ 'multiple_to' => '',
+ 'fromto' => 'both',
+ ),
+ 'module' => 'date',
+ 'weight' => 0 ,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'type' => 'date_default',
+ 'weight' => 0,
+ 'settings' => array(
+ 'format_type' => $default_format,
+ 'show_repeat_rule' => 'show',
+ 'multiple_number' => '',
+ 'multiple_from' => '',
+ 'multiple_to' => '',
+ 'fromto' => 'both',
+ ),
+ 'module' => 'date',
+ ),
+ );
+
+ $field = field_create_field($field);
+ $instance = field_create_instance($instance);
+
+ field_info_cache_clear(TRUE);
+ field_cache_clear(TRUE);
+
+ // Look at how the field got configured.
+ $this->drupalGet("admin/structure/types/manage/$bundle/fields/$field_name");
+ $this->drupalGet("admin/structure/types/manage/$bundle/display");
+ }
+
/**
* @todo.
*/
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_form.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_form.test
new file mode 100644
index 00000000..56b89e43
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_form.test
@@ -0,0 +1,30 @@
+ t('Date Form test'),
+ 'description' => t('Test Date form functions.') ,
+ 'group' => t('Date'),
+ );
+ }
+
+ public function setUp() {
+ // Load the date_api module.
+ parent::setUp('date_test');
+ }
+
+ /**
+ * Tests rendering of a date element in a form.
+ */
+ public function testDateForm() {
+ $this->drupalGet('date-test/form');
+ }
+
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_migrate.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_migrate.test
index cdde115f..ec2ae7d8 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/tests/date_migrate.test
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_migrate.test
@@ -18,6 +18,7 @@ class DateMigrateExampleUnitTest extends DrupalWebTestCase {
'name' => 'Date Migration',
'description' => 'Test migration into date fields',
'group' => 'Date',
+ 'dependencies' => array('migrate', 'features'),
);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_test/date_test.info b/profiles/commerce_kickstart/modules/contrib/date/tests/date_test/date_test.info
new file mode 100644
index 00000000..2f265fa7
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_test/date_test.info
@@ -0,0 +1,14 @@
+name = "Date module tests"
+description = "Support module for date related testing."
+package = Date/Time
+version = VERSION
+core = 7.x
+hidden = TRUE
+dependencies[] = date
+
+; Information added by Drupal.org packaging script on 2017-04-07
+version = "7.x-2.10"
+core = "7.x"
+project = "date"
+datestamp = "1491562090"
+
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_test/date_test.module b/profiles/commerce_kickstart/modules/contrib/date/tests/date_test/date_test.module
new file mode 100644
index 00000000..18540891
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_test/date_test.module
@@ -0,0 +1,40 @@
+ 'Test form with date element',
+ 'description' => "Form with date element to make form related tests",
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('date_test_sample_form'),
+ 'access arguments' => array('access content'),
+ 'type' => MENU_CALLBACK,
+ );
+ return $items;
+}
+
+/**
+ * Form callback. Generates a test form with date elements.
+ */
+function date_test_sample_form($form, &$form_state) {
+ $form['date_test_select'] = array(
+ '#type' => 'date_select',
+ '#title' => t('Sample from'),
+ '#date_format' => 'H:i:s a',
+ '#default_value' => array(
+ 'hour' => 7,
+ 'minute' => 0,
+ 'second' => 0,
+ 'ampm' => 'am'
+ ),
+ );
+
+ return $form;
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_timezone.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_timezone.test
index ddbdcef9..9f2905a2 100644
--- a/profiles/commerce_kickstart/modules/contrib/date/tests/date_timezone.test
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_timezone.test
@@ -16,6 +16,16 @@ class DateTimezoneTestCase extends DateFieldBasic {
);
}
+ public function setUp() {
+ parent::setUp();
+ // Set the timezone explicitly. Otherwise the site's default timezone is
+ // used, which defaults to the server timezone when installing Drupal. This
+ // depends on the environment and is therefore uncertain.
+ // The Australia/Sydney timezone is chosen so all tests are run using an
+ // edge case scenario (UTC+10 and DST).
+ variable_set('date_default_timezone', 'Australia/Sydney');
+ }
+
/**
* @todo.
*/
@@ -23,7 +33,7 @@ class DateTimezoneTestCase extends DateFieldBasic {
// Create a date fields with combinations of various timezone handling and
// granularity.
foreach (array('date', 'datestamp', 'datetime') as $field_type) {
- foreach (array('site', 'none', 'date', 'user', 'utc') as $tz_handling) {
+ foreach (array('site', 'none', 'date', 'user', 'utc', 'Europe/Dublin') as $tz_handling) {
foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $max_granularity) {
// Skip invalid combinations.
if (in_array($max_granularity, array('year', 'month', 'day')) && $tz_handling != 'none') {
@@ -50,6 +60,111 @@ class DateTimezoneTestCase extends DateFieldBasic {
}
}
+ /**
+ * Validates timezone handling with a multi-value date field.
+ */
+ public function testMultiUserTimezone() {
+ // Create date fields with combinations of various types and granularity
+ // using the "Date's Timezone" strategy.
+ $field_type = 'datetime';
+ $tz_handling = 'date';
+ $max_granularity = 'minute';
+
+ // Create date field
+ $field_name = "field_test";
+ $label = 'Test';
+ $options = array(
+ 'label' => $label,
+ 'widget_type' => 'date_text',
+ 'field_name' => $field_name,
+ 'field_type' => $field_type,
+ 'input_format' => 'custom',
+ 'input_format_custom' => 'm/d/Y - H:i:s T',
+ 'cardinality' => 3,
+ 'tz_handling' => $tz_handling,
+ );
+ $this->createMultiDateField($options);
+
+ // Submit a date field form with multiple values
+ $this->dateMultiValueForm($field_name, $field_type, $max_granularity, $tz_handling);
+
+
+ $this->deleteDateField($label);
+ }
+
+ /**
+ * Tests the submission of a date field's widget form when using unlimited
+ * cardinality
+ */
+ public function dateMultiValueForm($field_name, $field_type, $max_granularity, $tz_handling) {
+ variable_set('date_format_long', 'D, m/d/Y - H:i:s T');
+
+ $edit = array();
+ $should_be = array();
+ $edit['title'] = $this->randomName(8);
+ $timezones = array('America/Chicago', 'America/Los_Angeles', 'America/New_York');
+
+ switch ($max_granularity) {
+ case 'hour':
+ $edit[$field_name . '[und][0][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][0][timezone][timezone]'] = 'America/Chicago';
+ $should_be[0] = 'Thu, 10/07/2010 - 10 CDT';
+
+ $edit[$field_name . '[und][1][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][1][timezone][timezone]'] = 'America/Los_Angeles';
+ $should_be[1] = 'Thu, 10/07/2010 - 10 PDT';
+
+ $edit[$field_name . '[und][2][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][2][timezone][timezone]'] = 'America/New_York';
+ $should_be[2] = 'Thu, 10/07/2010 - 10 EDT';
+
+ break;
+ case 'minute':
+ $edit[$field_name . '[und][0][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][0][timezone][timezone]'] = 'America/Chicago';
+ $should_be[0] = 'Thu, 10/07/2010 - 10:30 CDT';
+
+ $edit[$field_name . '[und][1][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][1][timezone][timezone]'] = 'America/Los_Angeles';
+ $should_be[1] = 'Thu, 10/07/2010 - 10:30 PDT';
+
+ $edit[$field_name . '[und][2][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][2][timezone][timezone]'] = 'America/New_York';
+ $should_be[2] = 'Thu, 10/07/2010 - 10:30 EDT';
+
+ break;
+ case 'second':
+ $edit[$field_name . '[und][0][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][0][timezone][timezone]'] = 'America/Chicago';
+ $should_be[0] = 'Thu, 10/07/2010 - 10:30:30 CDT';
+
+ $edit[$field_name . '[und][1][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][1][timezone][timezone]'] = 'America/Los_Angeles';
+ $should_be[1] = 'Thu, 10/07/2010 - 10:30:30 PDT';
+
+ $edit[$field_name . '[und][2][value][date]'] = '10/07/2010 - 10:30';
+ $edit[$field_name . '[und][2][timezone][timezone]'] = 'America/New_York';
+ $should_be[2] = 'Thu, 10/07/2010 - 10:30:30 EDT';
+ break;
+ }
+
+ $this->drupalPost('node/add/story', $edit, t('Save'));
+ $this->assertText($edit['title'], "Node has been created");
+
+ foreach ($should_be as $assertion) {
+ $this->assertText($assertion, "Found the correct date for a $field_type field using $max_granularity granularity with $tz_handling timezone handling.");
+ }
+
+ // Goto the edit page and save the node again.
+ $node = $this->drupalGetNodeByTitle($edit['title']);
+ $this->drupalGet('node/' . $node->nid . '/edit');
+
+ // Re-assert the proper date timezones.
+ foreach ($timezones as $key => $timezone) {
+ $this->assertOptionSelected('edit-field-test-und-' . $key . '-timezone-timezone', $timezone, "Found the correct timezone $timezone for a $field_type field using $max_granularity granularity with $tz_handling timezone handling.");
+ }
+ }
+
/**
* @todo.
*/
@@ -77,17 +192,32 @@ class DateTimezoneTestCase extends DateFieldBasic {
case 'hour':
$edit[$field_name . '[und][0][value][date]'] = '10/07/2010 - 10';
$edit[$field_name . '[und][0][value2][date]'] = '10/07/2010 - 11';
- $should_be = 'Thu, 10/07/2010 - 10 to Thu, 10/07/2010 - 11';
+ if ($tz_handling == 'utc') {
+ $should_be = 'Thu, 10/07/2010 - 21 to Thu, 10/07/2010 - 22';
+ }
+ else {
+ $should_be = 'Thu, 10/07/2010 - 10 to Thu, 10/07/2010 - 11';
+ }
break;
case 'minute':
$edit[$field_name . '[und][0][value][date]'] = '10/07/2010 - 10:30';
$edit[$field_name . '[und][0][value2][date]'] = '10/07/2010 - 11:30';
- $should_be = 'Thu, 10/07/2010 - 10:30 to 11:30';
+ if ($tz_handling == 'utc') {
+ $should_be = 'Thu, 10/07/2010 - 21:30 to 22:30';
+ }
+ else {
+ $should_be = 'Thu, 10/07/2010 - 10:30 to 11:30';
+ }
break;
case 'second':
$edit[$field_name . '[und][0][value][date]'] = '10/07/2010 - 10:30:30';
$edit[$field_name . '[und][0][value2][date]'] = '10/07/2010 - 11:30:30';
- $should_be = 'Thu, 10/07/2010 - 10:30:30 to 11:30:30';
+ if ($tz_handling == 'utc') {
+ $should_be = 'Thu, 10/07/2010 - 21:30:30 to 22:30:30';
+ }
+ else {
+ $should_be = 'Thu, 10/07/2010 - 10:30:30 to 11:30:30';
+ }
break;
}
$this->drupalPost('node/add/story', $edit, t('Save'));
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_views_pager.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_views_pager.test
new file mode 100644
index 00000000..4f5dd97d
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_views_pager.test
@@ -0,0 +1,129 @@
+ 'Date views pager skipping test',
+ 'description' => "Views date pager, option to skip empty pages test",
+ 'group' => 'Date',
+ );
+ }
+
+ /**
+ * Test setup actions.
+ */
+ public function setUp() {
+ // Load the 'date_views', 'views', 'views_ui', 'ctools' modules.
+ parent::setUp('date_views', 'views', 'views_ui', 'ctools');
+ // Set required permissions.
+ $permissions = array('administer views', 'administer site configuration');
+ // Create admin user and login.
+ $admin_user = $this->drupalCreateUser($permissions);
+ $this->drupalLogin($admin_user);
+
+ // Create a new view for test.
+ $view = new view();
+ $view->name = 'test_date_pager';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_date_pager';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'test_date_pager';
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'date_views_pager';
+ $handler->display->display_options['pager']['options']['skip_empty_pages'] = 1;
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Post date */
+ $handler->display->display_options['sorts']['created']['id'] = 'created';
+ $handler->display->display_options['sorts']['created']['table'] = 'node';
+ $handler->display->display_options['sorts']['created']['field'] = 'created';
+ $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+ /* Contextual filter: Date: Date (node) */
+ $handler->display->display_options['arguments']['date_argument']['id'] = 'date_argument';
+ $handler->display->display_options['arguments']['date_argument']['table'] = 'node';
+ $handler->display->display_options['arguments']['date_argument']['field'] = 'date_argument';
+ $handler->display->display_options['arguments']['date_argument']['default_action'] = 'default';
+ $handler->display->display_options['arguments']['date_argument']['default_argument_type'] = 'date';
+ $handler->display->display_options['arguments']['date_argument']['summary']['format'] = 'default_summary';
+ $handler->display->display_options['arguments']['date_argument']['granularity'] = 'hour';
+ $handler->display->display_options['arguments']['date_argument']['date_fields'] = array(
+ 'node.created' => 'node.created',
+ );
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page_1');
+ $handler->display->display_options['path'] = 'test_date_pager';
+
+ $view->save();
+ }
+
+ /**
+ * Test pager skipping.
+ */
+ public function testPagerSkipping() {
+ // Go to view admin page.
+ $this->drupalGet('admin/structure/views/view/display/test_date_pager/edit');
+ // Go to pager options.
+ $this->drupalGet('admin/structure/views/nojs/display/test_date_pager/default/pager_options');
+ // Check if "Skip empty pages" text - exist.
+ $this->assertText('Skip empty pages');
+ // Check if field and it's value is correct.
+ $this->assertFieldByName('pager_options[skip_empty_pages]', '1');
+ // Go back to view admin page.
+ $this->drupalGet('admin/structure/views/view/display/test_date_pager/edit');
+ // Check if pager on empty page are gone.
+ $this->assertNoText('« Prev', 'Previous pager does not exist');
+ $this->assertNoText('Next »', 'Next pager does not exist');
+ }
+
+ /**
+ * Test the view page has no PHP warnings.
+ */
+ public function testPagerWarning() {
+ $this->drupalCreateNode(array('type' => 'blog'));
+ // Set pager to skip empty pages.
+ $edit = array(
+ 'pager_options[skip_empty_pages]' => FALSE,
+ );
+ $this->drupalPost('admin/structure/views/nojs/display/test_date_pager/default/pager_options', $edit, t('Apply'));
+ // Save the view.
+ $this->drupalPost('admin/structure/views/view/test_date_pager/edit', array(), t('Save'));
+
+ // Visit view page. This will throw error, if any PHP warnings or errors.
+ $this->drupalGet('test_date_pager');
+ }
+
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/date/tests/date_views_popup.test b/profiles/commerce_kickstart/modules/contrib/date/tests/date_views_popup.test
new file mode 100644
index 00000000..e3d4306d
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/date/tests/date_views_popup.test
@@ -0,0 +1,106 @@
+ 'Date Views - Popup Test',
+ 'description' => 'Tests date popup in Views',
+ 'group' => 'Date',
+ );
+ }
+
+ /**
+ * Test setup actions.
+ */
+ public function setUp() {
+ parent::setUp();
+ // Load the 'date_popup', 'date_views', 'views', 'views_ui', 'ctools' modules.
+ $modules = array('date_popup', 'date_views', 'views', 'views_ui', 'ctools');
+ $success = module_enable($modules, TRUE);
+ $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
+
+ // Reset/rebuild all data structures after enabling the modules.
+ $this->resetAll();
+
+ // Create a date field.
+ $field_name = "field_test_date_popup";
+ $label = 'Test';
+ $options = array(
+ 'label' => 'Test',
+ 'widget_type' => 'date_popup',
+ 'field_name' => $field_name,
+ 'field_type' => 'datetime',
+ 'input_format' => 'm/d/Y - H:i',
+ );
+ $this->createDateField($options);
+
+ // Set required permissions.
+ $permissions = array('administer views', 'administer site configuration');
+ // Create admin user and login.
+ $admin_user = $this->drupalCreateUser($permissions);
+ $this->drupalLogin($admin_user);
+
+ // Create the view.
+ $view = new view();
+ $view->name = 'test_date_popup';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'Test date_popup';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'test_date_popup_page';
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'none';
+ $handler->display->display_options['pager']['options']['offset'] = '0';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Filter criterion: Content: test_date_popup (field_test_date_popup) */
+ $handler->display->display_options['filters']['field_test_date_popup_value']['id'] = 'field_test_date_popup_value';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['table'] = 'field_data_field_test_date_popup';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['field'] = 'field_test_date_popup_value';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['field_test_date_popup_value']['expose']['operator_id'] = 'field_test_date_popup_value_op';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['expose']['label'] = 'test_date_popup (field_test_date_popup)';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['expose']['operator'] = 'field_test_date_popup_value_op';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['expose']['identifier'] = 'field_test_date_popup_value';
+ $handler->display->display_options['filters']['field_test_date_popup_value']['form_type'] = 'date_popup';
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page');
+ $handler->display->display_options['path'] = 'test-date-popup';
+
+ $view->save();
+ }
+
+ /**
+ * Test date popup.
+ */
+ public function testDatePopup() {
+ // Go to view page.
+ $this->drupalGet('test-date-popup');
+ }
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/README.txt b/profiles/commerce_kickstart/modules/contrib/entity/README.txt
index ed048e42..745dd7fe 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/README.txt
+++ b/profiles/commerce_kickstart/modules/contrib/entity/README.txt
@@ -11,7 +11,15 @@ entity CRUD controller, which helps simplifying the creation of new entity types
This is an API module. You only need to enable it if a module depends on it or
you are interested in using it for development.
-This README is for interested developers. If you are not interested in
+Advanced usage:
+---------------
+You can optimize cache clearing performance by setting the variable
+'entity_rebuild_on_flush' to FALSE. This skips rebuilding of feature
+components and exported entities during cache flushing. Instead, it is triggered
+by the features module only; e.g., when features are reverted.
+
+
+The README below is for interested developers. If you are not interested in
developing, you may stop reading now.
--------------------------------------------------------------------------------
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/ctools/relationships/entity_property.inc b/profiles/commerce_kickstart/modules/contrib/entity/ctools/relationships/entity_property.inc
new file mode 100644
index 00000000..6869146f
--- /dev/null
+++ b/profiles/commerce_kickstart/modules/contrib/entity/ctools/relationships/entity_property.inc
@@ -0,0 +1,153 @@
+ t('Entity property or field (via Entity Metadata Wrapper)'),
+ 'description' => t('Creates any kind of context for entity properties and fields.'),
+ 'context' => 'entity_entity_property_context',
+ 'required context' => new ctools_context_required(t('Entity'), 'entity'),
+ 'edit form' => 'entity_entity_property_edit_form',
+ 'edit form validate' => 'entity_entity_property_edit_form_validate',
+ 'defaults' => array(
+ 'selector' => '',
+ 'target_context' => 'entity',
+ 'concatenator' => ','
+ ),
+);
+
+/**
+ * Return a new context based on an existing context.
+ */
+function entity_entity_property_context($context, $conf) {
+ $plugin = $conf['name'];
+
+ // If unset it wants a generic, unfilled context, which is just NULL.
+ if (empty($context->data)) {
+ return ctools_context_create_empty(isset($conf['target_context']) ? $conf['target_context'] : 'entity', NULL);
+ }
+
+ list($part1, $entity_type) = explode(':', $context->plugin);
+
+ if (isset($context->data) && $entity = $context->data) {
+ // Apply the selector.
+ $wrapper = entity_metadata_wrapper($entity_type, $entity);
+ $parts = explode(':', $conf['selector']);
+
+ try {
+ foreach ($parts as $part) {
+ if (!($wrapper instanceof EntityStructureWrapper || $wrapper instanceof EntityListWrapper)) {
+ $wrapper = NULL;
+ $value = NULL;
+ continue;
+ }
+ $wrapper = $wrapper->get($part);
+ }
+ }
+ catch (EntityMetadataWrapperException $e) {
+ $wrapper = NULL;
+ $value = NULL;
+ }
+
+ if (isset($wrapper)) {
+ $value = $wrapper->value();
+ }
+
+ // Massage list values.
+ if ($wrapper instanceof EntityListWrapper) {
+ $value = $wrapper[0]->value();
+ $argument = implode($conf['concatenator'], $wrapper->value(array('identifier' => TRUE)));
+ }
+ elseif ($wrapper instanceof EntityDrupalWrapper) {
+ $argument = $wrapper->getIdentifier();
+ }
+
+ // Bail out if we were unable to retrieve the value.
+ if (!isset($value)) {
+ return ctools_context_create_empty(isset($conf['target_context']) ? $conf['target_context'] : 'entity', NULL);
+ }
+
+ $context = ctools_context_create($conf['target_context'], $value);
+ // Provide a suiting argument if context is used as argument.
+ if (isset($argument)) {
+ $context->argument = $argument;
+ }
+ return $context;
+ }
+}
+
+function entity_entity_property_edit_form($form, &$form_state) {
+ $conf = $form_state['conf'];
+
+ $form['selector'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Data selector'),
+ '#description' => t('Any valid data selector, e.g. "title" to select a node\'s title, or "field_tags:1" to select the second tag.'),
+ '#default_value' => $conf['selector'],
+ '#required' => TRUE,
+ );
+ $form['concatenator'] = array(
+ '#title' => t('Concatenator (if multiple)'),
+ '#type' => 'select',
+ '#options' => array(',' => ', (AND)', '+' => '+ (OR)'),
+ '#default_value' => $conf['concatenator'],
+ '#prefix' => '';
+ }
}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_feature.info b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_feature.info
index 80d2a908..524fdfaf 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_feature.info
+++ b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_feature.info
@@ -6,9 +6,9 @@ files[] = entity_feature.module
dependencies[] = entity_test
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-02-25
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1424876582"
+datestamp = "1518620551"
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.info b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.info
index d34326c9..b7cceabf 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.info
+++ b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.info
@@ -7,9 +7,9 @@ files[] = entity_test.install
dependencies[] = entity
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-02-25
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1424876582"
+datestamp = "1518620551"
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.module b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.module
index 55855688..727797ae 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.module
+++ b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test.module
@@ -2,7 +2,7 @@
/**
* @file
- * Test moduel for the entity API.
+ * Test module for the entity API.
*/
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test_i18n.info b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test_i18n.info
index 8adf04af..4ca048af 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test_i18n.info
+++ b/profiles/commerce_kickstart/modules/contrib/entity/tests/entity_test_i18n.info
@@ -5,9 +5,9 @@ dependencies[] = i18n_string
package = Multilingual - Internationalization
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-02-25
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1424876582"
+datestamp = "1518620551"
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/theme/entity.theme.inc b/profiles/commerce_kickstart/modules/contrib/entity/theme/entity.theme.inc
index 9238dfdb..fc0ba7c1 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/theme/entity.theme.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/theme/entity.theme.inc
@@ -80,9 +80,12 @@ function template_preprocess_entity_property(&$variables, $hook) {
);
// Populate the content with sensible defaults.
- if (!isset($variables['content'])) {
+ if (!isset($element['#content'])) {
$variables['content'] = entity_property_default_render_value_by_type($element['#entity_wrapped']->{$element['#property_name']});
}
+ else {
+ $variables['content'] = $element['#content'];
+ }
}
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/views/entity.views.inc b/profiles/commerce_kickstart/modules/contrib/entity/views/entity.views.inc
index 59ebaa48..a0179c0c 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/views/entity.views.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/views/entity.views.inc
@@ -605,6 +605,28 @@ class EntityDefaultViewsController {
);
break;
+ case 'duration':
+ $return += $description + array(
+ 'field' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'entity_views_handler_field_duration',
+ 'click sortable' => TRUE,
+ ),
+ 'sort' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'views_handler_sort',
+ ),
+ 'filter' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'views_handler_filter_numeric',
+ ),
+ 'argument' => array(
+ 'real field' => $views_field_name,
+ 'handler' => 'views_handler_argument_numeric',
+ ),
+ );
+ break;
+
case 'uri':
$return += $description + array(
'field' => array(
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_field_handler_helper.inc b/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_field_handler_helper.inc
index 0077f4a3..6bb4fbff 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_field_handler_helper.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_field_handler_helper.inc
@@ -18,7 +18,7 @@ class EntityFieldHandlerHelper {
* Provide appropriate default options for a handler.
*/
public static function option_definition($handler) {
- if (entity_property_list_extract_type($handler->definition['type'])) {
+ if (isset($handler->definition['type']) && entity_property_list_extract_type($handler->definition['type'])) {
$options['list']['contains']['mode'] = array('default' => 'collapse');
$options['list']['contains']['separator'] = array('default' => ', ');
$options['list']['contains']['type'] = array('default' => 'ul');
@@ -32,7 +32,7 @@ class EntityFieldHandlerHelper {
* Provide an appropriate default option form for a handler.
*/
public static function options_form($handler, &$form, &$form_state) {
- if (entity_property_list_extract_type($handler->definition['type'])) {
+ if (isset($handler->definition['type']) && entity_property_list_extract_type($handler->definition['type'])) {
$form['list']['mode'] = array(
'#type' => 'select',
'#title' => t('List handling'),
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_handler_area_entity.inc b/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_handler_area_entity.inc
index f3746942..0c5b7143 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_handler_area_entity.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/views/handlers/entity_views_handler_area_entity.inc
@@ -40,7 +40,7 @@ class entity_views_handler_area_entity extends views_handler_area {
$form['entity_id'] = array(
'#type' => 'textfield',
'#title' => t('Entity id'),
- '#description' => t('Choose the entity you want to display in the area.'),
+ '#description' => t('Choose the entity you want to display in the area. To render an entity given by a contextual filter use "%1" for the first argument, "%2" for the second, etc.'),
'#default_value' => $this->options['entity_id'],
);
@@ -105,6 +105,9 @@ class entity_views_handler_area_entity extends views_handler_area {
* Render an entity using the view mode.
*/
public function render_entity($entity_type, $entity_id, $view_mode) {
+ $tokens = $this->get_render_tokens();
+ // Replace argument tokens in entity id.
+ $entity_id = strtr($entity_id, $tokens);
if (!empty($entity_type) && !empty($entity_id) && !empty($view_mode)) {
$entity = entity_load_single($entity_type, $entity_id);
if (!empty($this->options['bypass_access']) || entity_access('view', $entity_type, $entity)) {
@@ -117,4 +120,31 @@ class entity_views_handler_area_entity extends views_handler_area {
return '';
}
}
+
+ /**
+ * Get the 'render' tokens to use for advanced rendering.
+ *
+ * This runs through all of the fields and arguments that
+ * are available and gets their values. This will then be
+ * used in one giant str_replace().
+ */
+ function get_render_tokens() {
+ $tokens = array();
+ if (!empty($this->view->build_info['substitutions'])) {
+ $tokens = $this->view->build_info['substitutions'];
+ }
+ $count = 0;
+ foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ $token = '%' . ++$count;
+ if (!isset($tokens[$token])) {
+ $tokens[$token] = '';
+ }
+ // Use strip tags as there should never be HTML in the path.
+ // However, we need to preserve special characters like " that
+ // were removed by check_plain().
+ $tokens['%' . $count] = $handler->argument;
+ }
+
+ return $tokens;
+ }
}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/views/plugins/entity_views_plugin_row_entity_view.inc b/profiles/commerce_kickstart/modules/contrib/entity/views/plugins/entity_views_plugin_row_entity_view.inc
index db72b5f5..5e738a8c 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/views/plugins/entity_views_plugin_row_entity_view.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/views/plugins/entity_views_plugin_row_entity_view.inc
@@ -88,6 +88,9 @@ class entity_views_plugin_row_entity_view extends views_plugin_row {
public function render($values) {
if ($entity = $this->get_value($values)) {
+ // Add the view object as views_plugin_row_node_view::render() would.
+ // Otherwise the views theme suggestions won't work properly.
+ $entity->view = $this->view;
$render = $this->rendered_content[entity_id($this->entity_type, $entity)];
return drupal_render($render);
}
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/LICENSE.txt b/profiles/commerce_kickstart/modules/contrib/entityreference/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/PATCHES.txt b/profiles/commerce_kickstart/modules/contrib/entityreference/PATCHES.txt
deleted file mode 100644
index 70a44c35..00000000
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/PATCHES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The following patches have been applied to this project:
-- http://drupal.org/files/1580348-universal-formatters-17.patch
-
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.devel_generate.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.devel_generate.inc
index f6ab0144..fab46dda 100644
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.devel_generate.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.devel_generate.inc
@@ -19,9 +19,13 @@ function _entityreference_devel_generate($object, $field, $instance, $bundle) {
// Get all the entity that are referencable here.
$referencable_entity = entityreference_get_selection_handler($field, $instance)->getReferencableEntities();
if (is_array($referencable_entity) && !empty($referencable_entity)) {
- // Get a random key.
- foreach ($referencable_entity as $type => $eids) {
- $object_field['target_id'] = array_rand($eids);
+ // $referencable_entity is keyed by bundle type.
+ $random_bundle = array_rand($referencable_entity);
+ if (!empty($random_bundle)) {
+ $target_id = array_rand($referencable_entity[$random_bundle]);
+ if (!empty($referencable_entity[$random_bundle][$target_id])) {
+ $object_field['target_id'] = $target_id;
+ }
}
}
return $object_field;
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.feeds.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.feeds.inc
index 3f641415..3da1479c 100644
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.feeds.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.feeds.inc
@@ -125,10 +125,15 @@ function entityreference_feeds_set_target($source, $entity, $target, $value) {
break;
case 'label':
$options = $handler->getReferencableEntities($value, '=');
- $options = reset($options);
- $etids = array_keys($options);
- // Use the first matching entity.
- $entity_id = reset($etids);
+ if ($options) {
+ $options = reset($options);
+ $etids = array_keys($options);
+ // Use the first matching entity.
+ $entity_id = reset($etids);
+ }
+ else {
+ $entity_id = NULL;
+ }
break;
}
/*
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.info b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.info
index d6348ef5..5b2a0f74 100644
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.info
+++ b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.info
@@ -1,18 +1,23 @@
name = Entity Reference
description = Provides a field that can reference other entities.
-core = 7.x
package = Fields
+core = 7.x
+
dependencies[] = entity
dependencies[] = ctools
+test_dependencies[] = feeds
+test_dependencies[] = views
+
; Migrate handler.
files[] = entityreference.migrate.inc
-; Our plugins interfaces and abstract implementations.
+; Plugins interfaces and abstract implementations.
files[] = plugins/selection/abstract.inc
files[] = plugins/selection/views.inc
files[] = plugins/behavior/abstract.inc
+; Views integration.
files[] = views/entityreference_plugin_display.inc
files[] = views/entityreference_plugin_style.inc
files[] = views/entityreference_plugin_row_fields.inc
@@ -22,10 +27,11 @@ files[] = tests/entityreference.handlers.test
files[] = tests/entityreference.taxonomy.test
files[] = tests/entityreference.admin.test
files[] = tests/entityreference.feeds.test
+files[] = tests/entityreference.entity_translation.test
-; Information added by packaging script on 2013-11-20
-version = "7.x-1.1"
+; Information added by Drupal.org packaging script on 2017-08-16
+version = "7.x-1.5"
core = "7.x"
project = "entityreference"
-datestamp = "1384973110"
+datestamp = "1502895850"
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.install b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.install
index 4e248efd..ce610185 100644
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.install
+++ b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.install
@@ -41,6 +41,7 @@ function entityreference_field_schema($field) {
}
// Invoke the behaviors to allow them to change the schema.
+ module_load_include('module', 'entityreference');
foreach (entityreference_get_behavior_handlers($field) as $handler) {
$handler->schema_alter($schema, $field);
}
@@ -161,4 +162,29 @@ function entityreference_update_7002() {
'not null' => TRUE,
));
}
-}
\ No newline at end of file
+}
+
+/**
+ * Implements hook_update_N().
+ *
+ * Remove duplicate rows in the taxonomy_index table.
+ */
+function entityreference_update_7100() {
+ if (db_table_exists('taxonomy_index')) {
+ if (db_table_exists('taxonomy_index_tmp')) {
+ db_drop_table('taxonomy_index_tmp');
+ }
+
+ $tx_schema = drupal_get_schema('taxonomy_index');
+ db_create_table('taxonomy_index_tmp', $tx_schema);
+ $select = db_select('taxonomy_index', 'tx');
+ $select->fields('tx', array('nid', 'tid'));
+ $select->groupBy('tx.nid');
+ $select->groupBy('tx.tid');
+ $select->addExpression('MAX(sticky)', 'sticky');
+ $select->addExpression('MAX(created)', 'created');
+ db_insert('taxonomy_index_tmp')->from($select)->execute();
+ db_drop_table('taxonomy_index');
+ db_rename_table('taxonomy_index_tmp', 'taxonomy_index');
+ }
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.migrate.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.migrate.inc
index 0e95bf0a..35737b52 100644
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.migrate.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.migrate.inc
@@ -1,12 +1,11 @@
'target_id',
diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.module b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.module
index 2c026ac3..c0c9f58f 100644
--- a/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.module
+++ b/profiles/commerce_kickstart/modules/contrib/entityreference/entityreference.module
@@ -1,5 +1,12 @@
array(
+ 'variables' => array('label' => NULL, 'item' => NULL, 'settings' => NULL, 'uri' => NULL),
+ ),
+ 'entityreference_entity_id' => array(
+ 'variables' => array('item' => NULL, 'settings' => NULL),
+ ),
+ );
+}
+
/**
* Implements hook_menu().
*/
@@ -163,7 +184,7 @@ function entityreference_get_behavior_handlers($field, $instance = NULL) {
/**
* Get the behavior handler for a given entityreference field and instance.
*
- * @param $handler
+ * @param $behavior
* The behavior handler name.
*/
function _entityreference_get_behavior_handler($behavior) {
@@ -220,13 +241,15 @@ function entityreference_field_validate($entity_type, $entity, $field, $instance
if ($ids) {
$valid_ids = entityreference_get_selection_handler($field, $instance, $entity_type, $entity)->validateReferencableEntities(array_keys($ids));
- $invalid_entities = array_diff_key($ids, array_flip($valid_ids));
- if ($invalid_entities) {
- foreach ($invalid_entities as $id => $delta) {
- $errors[$field['field_name']][$langcode][$delta][] = array(
- 'error' => 'entityreference_invalid_entity',
- 'message' => t('The referenced entity (@type: @id) is invalid.', array('@type' => $field['settings']['target_type'], '@id' => $id)),
- );
+ if (!empty($valid_ids)) {
+ $invalid_entities = array_diff_key($ids, array_flip($valid_ids));
+ if ($invalid_entities) {
+ foreach ($invalid_entities as $id => $delta) {
+ $errors[$field['field_name']][$langcode][$delta][] = array(
+ 'error' => 'entityreference_invalid_entity',
+ 'message' => t('The referenced entity (@type: @id) is invalid.', array('@type' => $field['settings']['target_type'], '@id' => $id)),
+ );
+ }
}
}
}
@@ -398,6 +421,9 @@ function entityreference_field_settings_form($field, $instance, $has_data) {
return $form;
}
+/**
+ * Callback for custom element processing.
+ */
function _entityreference_field_settings_process($form, $form_state) {
$field = isset($form_state['entityreference']['field']) ? $form_state['entityreference']['field'] : $form['#field'];
$instance = isset($form_state['entityreference']['instance']) ? $form_state['entityreference']['instance'] : $form['#instance'];
@@ -479,11 +505,17 @@ function _entityreference_field_settings_process($form, $form_state) {
return $form;
}
+/**
+ * Custom callback for ajax processing.
+ */
function _entityreference_field_settings_ajax_process($form, $form_state) {
_entityreference_field_settings_ajax_process_element($form, $form);
return $form;
}
+/**
+ * Helper function for custom ajax processing.
+ */
function _entityreference_field_settings_ajax_process_element(&$element, $main_form) {
if (isset($element['#ajax']) && $element['#ajax'] === TRUE) {
$element['#ajax'] = array(
@@ -498,6 +530,9 @@ function _entityreference_field_settings_ajax_process_element(&$element, $main_f
}
}
+/**
+ * Custom callback for element processing.
+ */
function _entityreference_form_process_merge_parent($element) {
$parents = $element['#parents'];
array_pop($parents);
@@ -505,11 +540,17 @@ function _entityreference_form_process_merge_parent($element) {
return $element;
}
+/**
+ * Helper function to remove blank elements.
+ */
function _entityreference_element_validate_filter(&$element, &$form_state) {
$element['#value'] = array_filter($element['#value']);
form_set_value($element, $element['#value'], $form_state);
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_field_settings_validate($form, &$form_state) {
// Store the new values in the form state.
$field = $form['#field'];
@@ -545,6 +586,9 @@ function entityreference_field_instance_settings_form($field, $instance) {
return $form;
}
+/**
+ * Implements hook_field_settings_form().
+ */
function _entityreference_field_instance_settings_form($form, $form_state) {
$field = isset($form_state['entityreference']['field']) ? $form_state['entityreference']['field'] : $form['#field'];
$instance = isset($form_state['entityreference']['instance']) ? $form_state['entityreference']['instance'] : $form['#instance'];
@@ -562,6 +606,9 @@ function _entityreference_field_instance_settings_form($form, $form_state) {
return $form;
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_field_instance_settings_validate($form, &$form_state) {
// Store the new values in the form state.
$instance = $form['#instance'];
@@ -793,7 +840,7 @@ function entityreference_query_entityreference_alter(QueryAlterableInterface $qu
function entityreference_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
// Ensure that the entity target type exists before displaying the widget.
$entity_info = entity_get_info($field['settings']['target_type']);
- if (empty($entity_info)){
+ if (empty($entity_info)) {
return;
}
$entity_type = $instance['entity_type'];
@@ -818,7 +865,9 @@ function entityreference_field_widget_form(&$form, &$form_state, $field, $instan
// Build an array of entities ID.
foreach ($items as $item) {
- $entity_ids[] = $item['target_id'];
+ if (isset($item['target_id'])) {
+ $entity_ids[] = $item['target_id'];
+ }
}
// Load those entities and loop through them to extract their labels.
@@ -879,6 +928,9 @@ function entityreference_field_widget_form(&$form, &$form_state, $field, $instan
}
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_autocomplete_validate($element, &$form_state, $form) {
// If a value was entered into the autocomplete...
$value = '';
@@ -903,6 +955,9 @@ function _entityreference_autocomplete_validate($element, &$form_state, $form) {
form_set_value($element, $value, $form_state);
}
+/**
+ * Implements hook_validate().
+ */
function _entityreference_autocomplete_tags_validate($element, &$form_state, $form) {
$value = array();
// If a value was entered into the autocomplete...
@@ -949,7 +1004,8 @@ function entityreference_field_widget_error($element, $error) {
* The entity type.
* @param $bundle_name
* The bundle name.
- * @return
+ *
+ * @return bool
* True if user can access this menu item.
*/
function entityreference_autocomplete_access_callback($type, $field_name, $entity_type, $bundle_name) {
@@ -981,10 +1037,11 @@ function entityreference_autocomplete_access_callback($type, $field_name, $entit
*/
function entityreference_autocomplete_callback($type, $field_name, $entity_type, $bundle_name, $entity_id = '', $string = '') {
// If the request has a '/' in the search text, then the menu system will have
- // split it into multiple arguments and $string will only be a partial. We want
- // to make sure we recover the intended $string.
+ // split it into multiple arguments and $string will only be a partial.
+ // We want to make sure we recover the intended $string.
$args = func_get_args();
- // Shift off the $type, $field_name, $entity_type, $bundle_name, and $entity_id args.
+ // Shift off the $type, $field_name, $entity_type,
+ // $bundle_name, and $entity_id args.
array_shift($args);
array_shift($args);
array_shift($args);
@@ -1020,6 +1077,7 @@ function entityreference_autocomplete_callback($type, $field_name, $entity_type,
*/
function entityreference_autocomplete_callback_get_matches($type, $field, $instance, $entity_type, $entity_id = '', $string = '') {
$matches = array();
+ $prefix = '';
$entity = NULL;
if ($entity_id !== 'NULL') {
@@ -1034,7 +1092,8 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
$handler = entityreference_get_selection_handler($field, $instance, $entity_type, $entity);
if ($type == 'tags') {
- // The user enters a comma-separated list of tags. We only autocomplete the last tag.
+ // The user enters a comma-separated list of tags.
+ // We only autocomplete the last tag.
$tags_typed = drupal_explode_tags($string);
$tag_last = drupal_strtolower(array_pop($tags_typed));
if (!empty($tag_last)) {
@@ -1043,19 +1102,22 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
}
else {
// The user enters a single tag.
- $prefix = '';
$tag_last = $string;
}
if (isset($tag_last)) {
// Get an array of matching entities.
$entity_labels = $handler->getReferencableEntities($tag_last, $instance['widget']['settings']['match_operator'], 10);
-
+ $denied_label = t(ENTITYREFERENCE_DENIED);
// Loop through the products and convert them into autocomplete output.
foreach ($entity_labels as $values) {
foreach ($values as $entity_id => $label) {
+ // Never autocomplete entities that aren't accessible.
+ if ($label == $denied_label) {
+ continue;
+ }
$key = "$label ($entity_id)";
- // Strip things like starting/trailing white spaces, line breaks and tags.
+ // Strip starting/trailing white spaces, line breaks and tags.
$key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(decode_entities(strip_tags($key)))));
// Names containing commas or quotes must be wrapped in quotes.
if (strpos($key, ',') !== FALSE || strpos($key, '"') !== FALSE) {
@@ -1069,7 +1131,7 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
drupal_json_output($matches);
}
-/**
+ /**
* Introspects field and instance settings, and determines the correct settings
* for the functioning of the formatter.
*
@@ -1106,6 +1168,7 @@ function entityreference_field_formatter_info() {
'field types' => array('entityreference'),
'settings' => array(
'link' => FALSE,
+ 'bypass_access' => FALSE,
),
),
'entityreference_entity_id' => array(
@@ -1120,6 +1183,7 @@ function entityreference_field_formatter_info() {
'settings' => array(
'view_mode' => 'default',
'links' => TRUE,
+ 'use_content_language' => TRUE,
),
),
);
@@ -1132,8 +1196,16 @@ function entityreference_field_formatter_settings_form($field, $instance, $view_
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
$field_type_settings = entityreference_field_type_settings($field);
+ $element = array();
if ($display['type'] == 'entityreference_label') {
+ $element['bypass_access'] = array(
+ '#title' => t('Show entity labels regardless of user access'),
+ '#description' => t("All entities in the field will be shown, without checking them for access. If the 'Link' setting is also enabled, an entity which the user does not have access to view will show without a link."),
+ '#type' => 'checkbox',
+ '#default_value' => $settings['bypass_access'],
+ );
+
$element['link'] = array(
'#title' => t('Link label to the referenced entity'),
'#type' => 'checkbox',
@@ -1163,6 +1235,12 @@ function entityreference_field_formatter_settings_form($field, $instance, $view_
'#title' => t('Show links'),
'#default_value' => $settings['links'],
);
+
+ $element['use_content_language'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use current content language'),
+ '#default_value' => $settings['use_content_language'],
+ );
}
return $element;
@@ -1180,6 +1258,7 @@ function entityreference_field_formatter_settings_summary($field, $instance, $vi
if ($display['type'] == 'entityreference_label') {
$summary[] = $settings['link'] ? t('Link to the referenced entity') : t('No link');
+ $summary[] = $settings['bypass_access'] ? t('Show labels regardless of access') : t('Respect entity access for label visibility');
}
if ($display['type'] == 'entityreference_entity_view') {
@@ -1190,6 +1269,7 @@ function entityreference_field_formatter_settings_summary($field, $instance, $vi
}
$summary[] = t('Rendered as @mode', array('@mode' => $view_mode_label));
$summary[] = !empty($settings['links']) ? t('Display links') : t('Do not display links');
+ $summary[] = !empty($settings['use_content_language']) ? t('Use current content language') : t('Use field language');
}
return implode('
', $summary); @@ -1226,7 +1306,7 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $ foreach ($items[$id] as $delta => $item) { // Check whether the referenced entity could be loaded. - if (isset($target_entities[$item[$column]])) { + if (isset($target_entities[$item[$column]]) && isset($target_entities[$item[$column]])) { // Replace the instance value with the term data. $items[$id][$delta]['entity'] = $target_entities[$item[$column]]; // Check whether the user has access to the referenced entity. @@ -1258,38 +1338,74 @@ function entityreference_field_formatter_view($entity_type, $entity, $field, $in $target_type = $field_type_settings['entity_type']; $column = $field_type_settings['column']; - // Rebuild the items list to contain only those with access. - foreach ($items as $key => $item) { - if (empty($item['access'])) { - unset($items[$key]); - } - } - switch ($display['type']) { case 'entityreference_label': $handler = entityreference_get_selection_handler($field, $instance, $entity_type, $entity); foreach ($items as $delta => $item) { - $label = $handler->getLabel($item['entity']); - // If the link is to be displayed and the entity has a uri, display a link. - // Note the assignment ($url = ) here is intended to be an assignment. - if ($display['settings']['link'] && ($uri = entity_uri($target_type, $item['entity']))) { - $result[$delta] = array('#markup' => l($label, $uri['path'], $uri['options'])); + // Skip an item that is not accessible, unless we're allowing output of + // entity labels without considering access. + if (empty($item['access']) && !$display['settings']['bypass_access']) { + continue; } - else { - $result[$delta] = array('#markup' => check_plain($label)); + + // Calling EntityReferenceHandler::getLabel() would make a repeated, + // wasteful call to entity_access(). + $label = entity_label($field['settings']['target_type'], $item['entity']); + + // Check if the settings and access allow a link to be displayed. + $display_link = $display['settings']['link'] && $item['access']; + + $uri = NULL; + + // If the link is allowed and the entity has a uri, display a link. + if ($display_link) { + $uri = entity_uri($target_type, $item['entity']); } + + $result[$delta] = array( + '#theme' => 'entityreference_label', + '#label' => $label, + '#item' => $item, + '#uri' => $uri, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_id': foreach ($items as $delta => $item) { - $result[$delta] = array('#markup' => check_plain($item[$column])); + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + + $result[$delta] = array( + '#theme' => 'entityreference_entity_id', + '#item' => $item, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_view': + $target_langcode = $langcode; + if (!empty($settings['use_content_language']) && !empty($GLOBALS['language_content']->language)) { + $target_langcode = $GLOBALS['language_content']->language; + } + foreach ($items as $delta => $item) { + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + // Protect ourselves from recursive rendering. static $depth = 0; $depth++; @@ -1297,9 +1413,9 @@ function entityreference_field_formatter_view($entity_type, $entity, $field, $in throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $target_type, '@entity_id' => $item[$column]))); } - $entity = clone $item['entity']; - unset($entity->content); - $result[$delta] = entity_view($target_type, array($item[$column] => $entity), $settings['view_mode'], $langcode, FALSE); + $target_entity = clone $item['entity']; + unset($target_entity->content); + $result[$delta] = entity_view($target_type, array($item[$column] => $target_entity), $settings['view_mode'], $target_langcode, FALSE); if (empty($settings['links']) && isset($result[$delta][$target_type][$column]['links'])) { $result[$delta][$target_type][$item[$column]]['links']['#access'] = FALSE; @@ -1326,3 +1442,44 @@ function entityreference_views_api() { 'path' => drupal_get_path('module', 'entityreference') . '/views', ); } + +/** + * Theme label. + * + * @ingroup themeable. + */ +function theme_entityreference_label($vars) { + $label = $vars['label']; + $settings = $vars['settings']; + $item = $vars['item']; + $uri = $vars['uri']; + + $output = ''; + + // If the link is to be displayed and the entity has a uri, display a link. + // Note the assignment ($url = ) here is intended to be an assignment. + if ($settings['display']['link'] && isset($uri['path'])) { + $output .= l($label, $uri['path'], $uri['options']); + } + else { + $output .= check_plain($label); + } + + return $output; +} + +/** + * Theme entity_id + * + * @ingroup themeable. + */ +function theme_entityreference_entity_id($vars) { + $settings = $vars['settings']; + $item = $vars['item']; + + $output = ''; + + $output = check_plain($item['target_id']); + + return $output; +} diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info b/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info index 88ad7b5d..70bcc4f2 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info @@ -4,9 +4,9 @@ core = 7.x package = Fields dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php index 43ac693f..075b54d7 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php @@ -144,18 +144,20 @@ protected function buildNodeIndex($node) { // already inserted in taxonomy_build_node_index(). $tid_all = array_diff($tid_all, $original_tid_all); - // Insert index entries for all the node's terms. + // Insert index entries for all the node's terms, preventing duplicates. if (!empty($tid_all)) { - $query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created')); foreach ($tid_all as $tid) { - $query->values(array( + $row = array( 'nid' => $node->nid, 'tid' => $tid, 'sticky' => $sticky, 'created' => $node->created, - )); + ); + $query = db_merge('taxonomy_index') + ->key($row) + ->fields($row); + $query->execute(); } - $query->execute(); } } } diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php index 444a74cc..6ec28a4b 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php @@ -208,7 +208,11 @@ public function validateReferencableEntities(array $ids) { * Implements EntityReferenceHandler::validateAutocompleteInput(). */ public function validateAutocompleteInput($input, &$element, &$form_state, $form) { - $entities = $this->getReferencableEntities($input, '=', 6); + $bundled_entities = $this->getReferencableEntities($input, '=', 6); + $entities = array(); + foreach($bundled_entities as $entities_list) { + $entities += $entities_list; + } if (empty($entities)) { // Error if there are no entities available for a required field. form_error($element, t('There are no entities matching "%value"', array('%value' => $input))); @@ -305,7 +309,7 @@ protected function reAlterQuery(SelectQueryInterface $query, $tag, $base_table) */ public function getLabel($entity) { $target_type = $this->field['settings']['target_type']; - return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -'); + return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED); } /** @@ -339,9 +343,11 @@ public function ensureBaseTable(SelectQueryInterface $query) { // Join the known base-table. $target_type = $this->field['settings']['target_type']; $entity_info = entity_get_info($target_type); + $target_type_base_table = $entity_info['base table']; $id = $entity_info['entity keys']['id']; + // Return the alias of the table. - return $query->innerJoin($target_type, NULL, "%alias.$id = $alias.entity_id"); + return $query->innerJoin($target_type_base_table, NULL, "%alias.$id = $alias.entity_id"); } } @@ -543,7 +549,7 @@ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAI if ($vocabulary = taxonomy_vocabulary_machine_name_load($bundle)) { if ($terms = taxonomy_get_tree($vocabulary->vid, 0, NULL, TRUE)) { foreach ($terms as $term) { - $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain($term->name); + $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain(entity_label('taxonomy_term', $term)); } } } diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php index 1b036a7d..cbed33b1 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php @@ -9,12 +9,13 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio * Implements EntityReferenceHandler::getInstance(). */ public static function getInstance($field, $instance = NULL, $entity_type = NULL, $entity = NULL) { - return new EntityReference_SelectionHandler_Views($field, $instance); + return new EntityReference_SelectionHandler_Views($field, $instance, $entity); } - protected function __construct($field, $instance) { + protected function __construct($field, $instance, $entity) { $this->field = $field; $this->instance = $instance; + $this->entity = $entity; } /** @@ -52,13 +53,32 @@ public static function settingsForm($field, $instance) { ); $default = !empty($view_settings['args']) ? implode(', ', $view_settings['args']) : ''; + $description = t('Provide a comma separated list of arguments to pass to the view.') . '
' . t('This field supports tokens.'); + + if (!module_exists('token')) { + $description .= '
' . t('Install the token module to get more tokens and display available once.', array('@url' => 'http://drupal.org/project/token')); + } + $form['view']['args'] = array( '#type' => 'textfield', '#title' => t('View arguments'), '#default_value' => $default, '#required' => FALSE, - '#description' => t('Provide a comma separated list of arguments to pass to the view.'), + '#description' => $description, + '#maxlength' => '512', ); + if (module_exists('token')) { + // Get the token type for the entity type our field is in (a type 'taxonomy_term' has a 'term' type token). + $info = entity_get_info($instance['entity_type']); + + $form['view']['tokens'] = array( + '#theme' => 'token_tree', + '#token_types' => array($info['token type']), + '#global_types' => TRUE, + '#click_insert' => TRUE, + '#dialog' => TRUE, + ); + } } else { $form['view']['no_view_help'] = array( @@ -84,6 +104,7 @@ protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $ return FALSE; } $this->view->set_display($display_name); + $this->view->pre_execute(); // Make sure the query is not cached. $this->view->is_cacheable = FALSE; @@ -104,7 +125,7 @@ protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $ */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView($match, $match_operator, $limit)) { // Get the results. @@ -133,12 +154,14 @@ function countReferencableEntities($match = NULL, $match_operator = 'CONTAINS') function validateReferencableEntities(array $ids) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView(NULL, 'CONTAINS', 0, $ids)) { // Get the results. $entities = $this->view->execute_display($display_name, $args); - $result = array_keys($entities); + if (!empty($entities)) { + $result = array_keys($entities); + } } return $result; } @@ -164,6 +187,49 @@ public function entityFieldQueryAlter(SelectQueryInterface $query) { } + /** + * Handles arguments for views. + * + * Replaces tokens using token_replace(). + * + * @param array $args + * Usually $this->field['settings']['handler_settings']['view']['args']. + * + * @return array + * The arguments to be send to the View. + */ + protected function handleArgs($args) { + if (!module_exists('token')) { + return $args; + } + + // Parameters for token_replace(). + $data = array(); + $options = array('clear' => TRUE); + + if ($entity = $this->entity) { + // D7 HACK: For new entities, entity and revision id are not set. This leads to + // * token replacement emitting PHP warnings + // * views choking on empty arguments + // We workaround this by filling in '0' for these IDs + // and use a clone to leave no traces of our unholy doings. + $info = entity_get_info($this->instance['entity_type']); + if (!isset($entity->{$info['entity keys']['id']})) { + $entity = clone $entity; + $entity->{$info['entity keys']['id']} = '0'; + if (!empty($info['entity keys']['revision'])) { + $entity->{$info['entity keys']['revision']} = '0'; + } + } + + $data[$info['token type']] = $entity; + } + // Replace tokens for each argument. + foreach ($args as $key => $arg) { + $args[$key] = token_replace($arg, $data, $options); + } + return $args; + } } function entityreference_view_settings_validate($element, &$form_state, $form) { diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc index 1d2ea0d3..a4805b1f 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc @@ -21,8 +21,9 @@ interface EntityReference_SelectionHandler { * Return a list of referencable entities. * * @return - * An array of referencable entities, which keys are entity ids and - * values (safe HTML) labels to be displayed to the user. + * A nested array of entities, the first level is keyed by the + * entity bundle, which contains an array of entity labels (safe HTML), + * keyed by the entity ID. */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0); diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test index 9a121198..ec78e7bc 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test @@ -21,7 +21,7 @@ class EntityReferenceAdminTestCase extends DrupalWebTestCase { parent::setUp(array('field_ui', 'entity', 'ctools', 'entityreference')); // Create test user. - $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types')); + $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer fields')); $this->drupalLogin($this->admin_user); // Create content type, with underscores. diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test index 4dc1901f..32248cc0 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test @@ -17,6 +17,7 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ 'name' => 'Feeds integration (field mapper)', 'description' => 'Test Feeds Mapper support for fields.', 'group' => 'Entity Reference', + 'dependencies' => array('feeds'), ); } @@ -28,10 +29,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ module_enable(array('entityreference_feeds_test'), TRUE); $this->resetAll(); - if (!module_exists('feeds')) { - return; - } - $permissions[] = 'access content'; $permissions[] = 'administer site configuration'; $permissions[] = 'administer content types'; @@ -157,10 +154,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ * Basic test loading a double entry CSV file. */ public function test() { - if (!module_exists('feeds')) { - return; - } - $this->drupalLogin($this->admin_user); $this->drupalGet('admin/structure/types/manage/article/fields'); $this->assertText('Ref - entity ID', t('Found Entity reference field %field.', array('%field' => 'field_er_id'))); diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test index b88e1069..1367b44a 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test @@ -194,6 +194,21 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), ); $this->assertReferencable($field, $referencable_tests, 'Node handler (admin)'); + + // Verify autocomplete input validation. + $handler = entityreference_get_selection_handler($field); + $element = array( + '#parents' => array('element_name'), + ); + $form_state = array(); + $form = array(); + $value = $handler->validateAutocompleteInput($nodes['published1']->title, $element, $form_state, $form); + $this->assertEqual($value, $nodes['published1']->nid); + + $invalid_input = $this->randomName(); + $value = $handler->validateAutocompleteInput($invalid_input, $element, $form_state, $form); + $this->assertNull($value); + $this->assertEqual(form_get_error($element), t('There are no entities matching "%value"', array('%value' => $invalid_input))); } /** @@ -256,7 +271,7 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), 'result' => array( 'user' => array( - $users['admin']->uid => '- Restricted access -', + $users['admin']->uid => ENTITYREFERENCE_DENIED, $users['non_admin']->uid => $user_labels['non_admin'], ), ), diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test index 6e4afb78..94b3f568 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test @@ -112,4 +112,52 @@ class EntityReferenceTaxonomyTestCase extends DrupalWebTestCase { $this->assertFalse(taxonomy_select_nodes(1)); } + /** + * Add a second ER field from node/article to taxonomy. + * + * This should not cause {taxonomy_index} to receive duplicate entries. + */ + protected function setupForIndexDuplicates() { + // Create an entity reference field. + $field = array( + 'entity_types' => array('node'), + 'settings' => array( + 'handler' => 'base', + 'target_type' => 'taxonomy_term', + 'handler_settings' => array( + 'target_bundles' => array(), + ), + ), + 'field_name' => 'field_entityreference_term2', + 'type' => 'entityreference', + ); + $field = field_create_field($field); + $instance = array( + 'field_name' => 'field_entityreference_term2', + 'bundle' => 'article', + 'entity_type' => 'node', + ); + + // Enable the taxonomy-index behavior. + $instance['settings']['behaviors']['taxonomy-index']['status'] = TRUE; + field_create_instance($instance); + } + + /** + * Make sure the index only contains one entry for a given node->term + * reference, even when multiple ER fields link from the node bundle to terms. + */ + public function testIndexDuplicates() { + // Extra setup for this test: add another ER field on this content type. + $this->setupForIndexDuplicates(); + + // Assert node insert with reference to term in first field. + $tid = 1; + $settings = array(); + $settings['type'] = 'article'; + $settings['field_entityreference_term'][LANGUAGE_NONE][0]['target_id'] = $tid; + $node = $this->drupalCreateNode($settings); + + $this->assertEqual(taxonomy_select_nodes($tid), array($node->nid)); + } } diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info index 311ae3f4..5bbf9b6f 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info @@ -8,9 +8,9 @@ dependencies[] = feeds dependencies[] = feeds_ui dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc index f13e88a8..cca36509 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc @@ -81,8 +81,9 @@ class entityreference_plugin_display extends views_plugin_display { $field = $this->view->query->fields[$this->view->field[$field_alias]->field_alias]; } else { - $this->view->query->add_field($this->view->field[$field_alias]->options['table'], $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->options['field'], array()); - $field = $this->view->query->fields[$this->view->field[$field_alias]->options['field']]; + $field_table = $this->view->query->ensure_table($this->view->field[$field_alias]->table, $this->view->field[$field_alias]->relationship); + $this->view->query->add_field($field_table, $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->field, array()); + $field = $this->view->query->fields[$this->view->field[$field_alias]->field]; } // Add an OR condition for the field $conditions->condition($field['table'] . '.' . $field['field'], $value, 'LIKE'); diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc index fadaa9ee..b72a2357 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc @@ -26,7 +26,7 @@ class entityreference_plugin_style extends views_plugin_style { '#title' => t('Search fields'), '#options' => $options, '#required' => TRUE, - '#default_value' => $this->options['search_fields'], + '#default_value' => isset($this->options['search_fields']) ? $this->options['search_fields'] : array(), '#description' => t('Select the field(s) that will be searched when using the autocomplete widget.'), '#weight' => -3, ); diff --git a/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php b/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php index a0317bf9..cd6ab11f 100755 --- a/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php +++ b/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php @@ -39,6 +39,12 @@
+
+
@@ -36,7 +38,11 @@
-- - 'date_nav'))), $prev_url, $prev_options); ?> + 'date_nav')); + print l(t($text), $prev_url, $prev_options); + ?> @@ -46,4 +52,4 @@
',
+ '#suffix' => '
',
+ '#description' => t("When the resulting value is multiple valued and the context is passed on to a view as argument, the value can be concatenated in the form of 1+2+3 (for OR) or 1,2,3 (for AND)."),
+ );
+ return $form;
+}
+
+function entity_entity_property_edit_form_validate($form, &$form_state) {
+ $context_key = $form_state['values']['context'];
+ $context = $form_state['contexts'][$context_key];
+ $entity_type = $context->type[2];
+
+ try {
+ $all_properties = entity_get_all_property_info($entity_type);
+ $wrapper = entity_metadata_wrapper($entity_type, NULL, array('property info' => $all_properties));
+ $parts = explode(':', $form_state['values']['selector']);
+ foreach ($parts as $part) {
+ if (!($wrapper instanceof EntityStructureWrapper || $wrapper instanceof EntityListWrapper)) {
+ form_set_error('selector', t('Unable to apply the data selector part %key.'. array('%key' => $part)));
+ continue;
+ }
+ $wrapper = $wrapper->get($part);
+ }
+ $type = entity_entity_property_map_data_type($wrapper->type());
+ $form_state['conf']['target_context'] = $type;
+ }
+ catch (EntityMetadataWrapperException $e) {
+ form_set_error('selector', t('Unable to apply the data selector on entity type %type. @reason', array('@reason' => $e->getMessage(), '%type' => $entity_type)));
+ }
+
+ // Auto-generate a sane identifier.
+ if ($form_state['values']['identifier'] == $form['identifier']['#default_value']) {
+ $form_state['values']['identifier'] = 'Entity property ' . $entity_type . ':' . check_plain($form_state['values']['selector']);
+ }
+}
+
+/**
+ * Maps an entity-property data type to ctools types.
+ */
+function entity_entity_property_map_data_type($type) {
+ // Remove list<> wrappers from types.
+ while ($item_type = entity_property_list_extract_type($type)) {
+ $type = $item_type;
+ }
+ // Massage data type of entites to c
+ if (entity_get_info($type)) {
+ $type = "entity:$type";
+ }
+ if ($type == 'text') {
+ $type = 'string';
+ }
+ return $type;
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/entity.features.inc b/profiles/commerce_kickstart/modules/contrib/entity/entity.features.inc
index e266aaf5..0ec3e618 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/entity.features.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/entity.features.inc
@@ -7,6 +7,12 @@
/**
* Returns the configured entity features controller.
+ *
+ * @param string $type
+ * The entity type to get the controller for.
+ *
+ * @return EntityDefaultFeaturesController
+ * The configured entity features controller.
*/
function entity_features_get_controller($type) {
$static = &drupal_static(__FUNCTION__);
@@ -85,6 +91,7 @@ class EntityDefaultFeaturesController {
$fields = field_info_instances($this->info['bundle of'], $entity->{$this->bundleKey});
foreach ($fields as $name => $field) {
$pipe['field'][] = "{$field['entity_type']}-{$field['bundle']}-{$field['field_name']}";
+ $pipe['field_instance'][] = "{$field['entity_type']}-{$field['bundle']}-{$field['field_name']}";
}
}
}
@@ -125,9 +132,7 @@ class EntityDefaultFeaturesController {
*/
function revert($module = NULL) {
if ($defaults = features_get_default($this->type, $module)) {
- foreach ($defaults as $name => $entity) {
- entity_delete($this->type, $name);
- }
+ entity_delete_multiple($this->type, array_keys($defaults));
}
}
}
@@ -146,6 +151,8 @@ function entity_features_api() {
}
/**
+ * Implements hook_features_export_options().
+ *
* Features component callback.
*/
function entity_features_export_options($a1, $a2 = NULL) {
@@ -157,6 +164,8 @@ function entity_features_export_options($a1, $a2 = NULL) {
}
/**
+ * Implements hook_features_export().
+ *
* Features component callback.
*/
function entity_features_export($data, &$export, $module_name = '', $entity_type) {
@@ -164,6 +173,8 @@ function entity_features_export($data, &$export, $module_name = '', $entity_type
}
/**
+ * Implements hook_features_export_render().
+ *
* Features component callback.
*/
function entity_features_export_render($module, $data, $export = NULL, $entity_type) {
@@ -171,8 +182,23 @@ function entity_features_export_render($module, $data, $export = NULL, $entity_t
}
/**
+ * Implements hook_features_revert().
+ *
* Features component callback.
*/
function entity_features_revert($module = NULL, $entity_type) {
return entity_features_get_controller($entity_type)->revert($module);
}
+
+/**
+ * Implements hook_features_post_restore().
+ *
+ * Rebuild all defaults when a features rebuild is triggered - even the ones not
+ * handled by features itself.
+ */
+function entity_features_post_restore($op, $items = array()) {
+ if ($op == 'rebuild') {
+ // Use features rebuild to rebuild the features independent exports too.
+ entity_defaults_rebuild();
+ }
+}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/entity.info b/profiles/commerce_kickstart/modules/contrib/entity/entity.info
index ff88ce54..0b865a04 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/entity.info
+++ b/profiles/commerce_kickstart/modules/contrib/entity/entity.info
@@ -25,9 +25,9 @@ files[] = views/handlers/entity_views_handler_field_uri.inc
files[] = views/handlers/entity_views_handler_relationship_by_bundle.inc
files[] = views/handlers/entity_views_handler_relationship.inc
files[] = views/plugins/entity_views_plugin_row_entity_view.inc
-; Information added by Drupal.org packaging script on 2015-02-25
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1424876582"
+datestamp = "1518620551"
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/entity.install b/profiles/commerce_kickstart/modules/contrib/entity/entity.install
index f6f8cc2f..118820b8 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/entity.install
+++ b/profiles/commerce_kickstart/modules/contrib/entity/entity.install
@@ -13,6 +13,14 @@ function entity_enable() {
entity_entitycache_installed_modules();
}
+/**
+ * Implements hook_uninstall().
+ */
+function entity_uninstall() {
+ // Delete variables.
+ variable_del('entity_rebuild_on_flush');
+}
+
/**
* The entity API modules have been merged into a single module.
*/
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/entity.module b/profiles/commerce_kickstart/modules/contrib/entity/entity.module
index d4a882cd..da0acf69 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/entity.module
+++ b/profiles/commerce_kickstart/modules/contrib/entity/entity.module
@@ -184,8 +184,17 @@ function entity_ui_entity_page_view($entity) {
* Gets the page title for the passed operation.
*/
function entity_ui_get_page_title($op, $entity_type, $entity = NULL) {
- module_load_include('inc', 'entity', 'includes/entity.ui');
- $label = entity_label($entity_type, $entity);
+ if (isset($entity)) {
+ module_load_include('inc', 'entity', 'includes/entity.ui');
+ $label = entity_label($entity_type, $entity);
+ list(, , $bundle) = entity_extract_ids($entity_type, $entity);
+ }
+ else {
+ $info = entity_get_info($entity_type);
+ $label = $info['label'];
+ $bundle = NULL;
+ }
+
switch ($op) {
case 'view':
return $label;
@@ -200,12 +209,7 @@ function entity_ui_get_page_title($op, $entity_type, $entity = NULL) {
case 'export':
return t('Export @label', array('@label' => $label));
}
- if (isset($entity)) {
- list(, , $bundle) = entity_extract_ids($entity_type, $entity);
- }
- else {
- $bundle = NULL;
- }
+
return entity_ui_get_action_title($op, $entity_type, $bundle);
}
@@ -600,7 +604,7 @@ function entity_id($entity_type, $entity) {
* content language of the current request.
* @param $page
* (optional) If set will control if the entity is rendered: if TRUE
- * the entity will be rendered without its title, so that it can be embeded
+ * the entity will be rendered without its title, so that it can be embedded
* in another context. If FALSE the entity will be displayed with its title
* in a mode suitable for lists.
* If unset, the page mode will be enabled if the current path is the URI
@@ -1076,16 +1080,18 @@ function entity_flush_caches() {
// case of enabling or disabling modules we already rebuild defaults in
// entity_modules_enabled() and entity_modules_disabled(), so we do not need
// to do it again.
- if (current_path() != 'admin/modules/list/confirm') {
+ // Also check if rebuilding on cache flush is explicitly disabled.
+ if (current_path() != 'admin/modules/list/confirm' && variable_get('entity_rebuild_on_flush', TRUE)) {
entity_defaults_rebuild();
}
// Care about entitycache tables.
if (module_exists('entitycache')) {
$tables = array();
- foreach (entity_crud_get_info() as $entity_type => $entity_info) {
- if (isset($entity_info['module']) && !empty($entity_info['entity cache'])) {
- $tables[] = 'cache_entity_' . $entity_type;
+ $tables_created = variable_get('entity_cache_tables_created');
+ if (is_array($tables_created)) {
+ foreach ($tables_created as $module => $entity_cache_tables) {
+ $tables = array_merge($tables, $entity_cache_tables);
}
}
return $tables;
@@ -1372,7 +1378,7 @@ function entity_get_extra_fields_controller($type = NULL) {
* Returns a property wrapper for the given data.
*
* If an entity is wrapped, the wrapper can be used to retrieve further wrappers
- * for the entitity properties. For that the wrapper support chaining, e.g. you
+ * for the entity properties. For that the wrapper support chaining, e.g. you
* can use a node wrapper to get the node authors mail address:
*
* @code
@@ -1563,7 +1569,7 @@ function _entity_info_add_metadata(&$entity_info) {
* Implements hook_ctools_plugin_directory().
*/
function entity_ctools_plugin_directory($module, $plugin) {
- if ($module == 'ctools' && $plugin == 'content_types') {
- return 'ctools/content_types';
+ if ($module == 'ctools') {
+ return "ctools/$plugin";
}
}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/entity.test b/profiles/commerce_kickstart/modules/contrib/entity/entity.test
index 03c2551a..fd8cea12 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/entity.test
+++ b/profiles/commerce_kickstart/modules/contrib/entity/entity.test
@@ -1342,6 +1342,74 @@ class EntityMetadataNodeRevisionAccessTestCase extends DrupalWebTestCase {
}
}
+/**
+ * Tests basic entity_access() functionality for taxonomy terms.
+ */
+class EntityMetadataTaxonomyAccessTestCase extends EntityWebTestCase {
+ public static function getInfo() {
+ return array(
+ 'name' => 'Entity Metadata Taxonomy Access',
+ 'description' => 'Test entity_access() for taxonomy terms',
+ 'group' => 'Entity API',
+ );
+ }
+
+ /**
+ * Asserts entity_access() correctly grants or denies access.
+ */
+ function assertTaxonomyMetadataAccess($ops, $term, $account) {
+ foreach ($ops as $op => $result) {
+ $msg = t("entity_access() returns @result with operation '@op'.", array('@result' => $result ? 'TRUE' : 'FALSE', '@op' => $op));
+ $access = entity_access($op, 'taxonomy_term', $term, $account);
+ $this->assertEqual($result, $access, $msg);
+ }
+ }
+
+ /**
+ * @inheritdoc
+ */
+ function setUp() {
+ parent::setUp('entity', 'taxonomy');
+ // Clear permissions for authenticated users.
+ db_delete('role_permission')
+ ->condition('rid', DRUPAL_AUTHENTICATED_RID)
+ ->execute();
+ }
+
+ /**
+ * Runs basic tests for entity_access() function.
+ */
+ function testTaxonomyMetadataAccess() {
+ $vocab = $this->createVocabulary();
+ $term = entity_property_values_create_entity('taxonomy_term', array(
+ 'name' => $this->randomName(),
+ 'vocabulary' => $vocab,
+ ))->save()->value();
+ // Clear permissions static cache to get new taxonomy permissions.
+ drupal_static_reset('checkPermissions');
+
+ // Check assignment of view permissions.
+ $user1 = $this->drupalCreateUser(array('access content'));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => TRUE, 'update' => FALSE, 'delete' => FALSE), $term, $user1);
+
+ // Check assignment of edit permissions.
+ $user2 = $this->drupalCreateUser(array('edit terms in ' . $vocab->vid));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => FALSE, 'update' => TRUE, 'delete' => FALSE), $term, $user2);
+
+ // Check assignment of delete permissions.
+ $user3 = $this->drupalCreateUser(array('delete terms in ' . $vocab->vid));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => FALSE, 'update' => FALSE, 'delete' => TRUE), $term, $user3);
+
+ // Check assignment of view, edit, delete permissions.
+ $user4 = $this->drupalCreateUser(array('access content', 'edit terms in ' . $vocab->vid, 'delete terms in ' . $vocab->vid));
+ $this->assertTaxonomyMetadataAccess(array('create' => FALSE, 'view' => TRUE, 'update' => TRUE, 'delete' => TRUE), $term, $user4);
+
+ // Check assignment of administration permissions.
+ $user5 = $this->drupalCreateUser(array('administer taxonomy'));
+ $this->assertTaxonomyMetadataAccess(array('create' => TRUE, 'view' => TRUE, 'update' => TRUE, 'delete' => TRUE), $term, $user5);
+ }
+}
+
/**
* Tests provided entity property info of the core modules.
*/
@@ -1466,6 +1534,7 @@ class EntityMetadataIntegrationTestCase extends EntityWebTestCase {
$book = array('bid' => $node->nid, 'plid' => $node->book['mlid']);
$node2 = $this->drupalCreateNode(array('type' => 'book', 'book' => $book));
$node3 = $this->drupalCreateNode(array('type' => 'page'));
+ $node4 = $this->drupalCreateNode(array('type' => 'book', 'book' => array('bid' => 0, 'plid' => -1)));
// Test whether the properties work.
$wrapper = entity_metadata_wrapper('node', $node2);
@@ -1477,6 +1546,10 @@ class EntityMetadataIntegrationTestCase extends EntityWebTestCase {
$wrapper = entity_metadata_wrapper('node', $node3);
$this->assertEmpty($wrapper, 'book');
$this->assertEmptyArray($wrapper, 'book_ancestors');
+
+ // Test a book node which is not contained in a hierarchy.
+ $wrapper = entity_metadata_wrapper('node', $node4);
+ $this->assertEmptyArray($wrapper, 'book_ancestors');
}
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/entity_token.info b/profiles/commerce_kickstart/modules/contrib/entity/entity_token.info
index b579ced1..c59c6502 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/entity_token.info
+++ b/profiles/commerce_kickstart/modules/contrib/entity/entity_token.info
@@ -5,9 +5,9 @@ files[] = entity_token.tokens.inc
files[] = entity_token.module
dependencies[] = entity
-; Information added by Drupal.org packaging script on 2015-02-25
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
core = "7.x"
project = "entity"
-datestamp = "1424876582"
+datestamp = "1518620551"
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.controller.inc b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.controller.inc
index f675a63a..5e86b529 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.controller.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.controller.inc
@@ -107,7 +107,7 @@ interface EntityAPIControllerInterface extends DrupalEntityControllerInterface {
* content language of the current request.
* @param $page
* (optional) If set will control if the entity is rendered: if TRUE
- * the entity will be rendered without its title, so that it can be embeded
+ * the entity will be rendered without its title, so that it can be embedded
* in another context. If FALSE the entity will be displayed with its title
* in a mode suitable for lists.
* If unset, the page mode will be enabled if the current path is the URI
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.inc b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.inc
index be24499d..2f504f36 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.inc
@@ -5,6 +5,168 @@
* Provides a base class for entities.
*/
+/**
+ * Interface for class based entities.
+ */
+interface EntityInterface {
+
+ /**
+ * Returns the internal, numeric identifier.
+ *
+ * Returns the numeric identifier, even if the entity type has specified a
+ * name key. In the latter case, the numeric identifier is supposed to be used
+ * when dealing generically with entities or internally to refer to an entity,
+ * i.e. in a relational database. If unsure, use Entity:identifier().
+ */
+ public function internalIdentifier();
+
+ /**
+ * Returns the entity identifier, i.e. the entities name or numeric id.
+ *
+ * @return
+ * The identifier of the entity. If the entity type makes use of a name key,
+ * the name is returned, else the numeric id.
+ *
+ * @see entity_id()
+ */
+ public function identifier();
+
+ /**
+ * Returns the info of the type of the entity.
+ *
+ * @see entity_get_info()
+ */
+ public function entityInfo();
+
+ /**
+ * Returns the type of the entity.
+ */
+ public function entityType();
+
+ /**
+ * Returns the bundle of the entity.
+ *
+ * @return
+ * The bundle of the entity. Defaults to the entity type if the entity type
+ * does not make use of different bundles.
+ */
+ public function bundle();
+
+ /**
+ * Returns the EntityMetadataWrapper of the entity.
+ *
+ * @return EntityDrupalWrapper
+ * An EntityMetadataWrapper containing the entity.
+ */
+ public function wrapper();
+
+ /**
+ * Returns the label of the entity.
+ *
+ * Modules may alter the label by specifying another 'label callback' using
+ * hook_entity_info_alter().
+ *
+ * @see entity_label()
+ */
+ public function label();
+
+ /**
+ * Returns the uri of the entity just as entity_uri().
+ *
+ * Modules may alter the uri by specifying another 'uri callback' using
+ * hook_entity_info_alter().
+ *
+ * @see entity_uri()
+ */
+ public function uri();
+
+ /**
+ * Checks if the entity has a certain exportable status.
+ *
+ * @param $status
+ * A status constant, i.e. one of ENTITY_CUSTOM, ENTITY_IN_CODE,
+ * ENTITY_OVERRIDDEN or ENTITY_FIXED.
+ *
+ * @return bool
+ * For exportable entities TRUE if the entity has the status, else FALSE.
+ * In case the entity is not exportable, NULL is returned.
+ *
+ * @see entity_has_status()
+ */
+ public function hasStatus($status);
+
+ /**
+ * Permanently saves the entity.
+ *
+ * @see entity_save()
+ */
+ public function save();
+
+ /**
+ * Permanently deletes the entity.
+ *
+ * @see entity_delete()
+ */
+ public function delete();
+
+ /**
+ * Exports the entity.
+ *
+ * @see entity_export()
+ */
+ public function export($prefix = '');
+
+ /**
+ * Generate an array for rendering the entity.
+ *
+ * @see entity_view()
+ */
+ public function view($view_mode = 'full', $langcode = NULL, $page = NULL);
+
+ /**
+ * Builds a structured array representing the entity's content.
+ *
+ * @see entity_build_content()
+ */
+ public function buildContent($view_mode = 'full', $langcode = NULL);
+
+ /**
+ * Gets the raw, translated value of a property or field.
+ *
+ * Supports retrieving field translations as well as i18n string translations.
+ *
+ * Note that this returns raw data values, which might not reflect what
+ * has been declared for hook_entity_property_info() as no 'getter callbacks'
+ * are invoked or no referenced entities are loaded. For retrieving values
+ * reflecting the property info make use of entity metadata wrappers, see
+ * entity_metadata_wrapper().
+ *
+ * @param $property
+ * The name of the property to return; e.g., 'title'.
+ * @param $langcode
+ * (optional) The language code of the language to which the value should
+ * be translated. If set to NULL, the default display language is being
+ * used.
+ *
+ * @return
+ * The raw, translated property value; or the raw, un-translated value if no
+ * translation is available.
+ *
+ * @todo Implement an analogous setTranslation() method for updating.
+ */
+ public function getTranslation($property, $langcode = NULL);
+
+ /**
+ * Checks whether the entity is the default revision.
+ *
+ * @return Boolean
+ *
+ * @see entity_revision_is_default()
+ */
+ public function isDefaultRevision();
+
+}
+
/**
* A common class for entities.
*
@@ -25,7 +187,7 @@
* public $count = 0;
* @endcode
*/
-class Entity {
+class Entity implements EntityInterface {
protected $entityType;
protected $entityInfo;
@@ -34,9 +196,7 @@ class Entity {
protected $wrapper;
/**
- * Creates a new entity.
- *
- * @see entity_create()
+ * {@inheritdoc}
*/
public function __construct(array $values = array(), $entityType = NULL) {
if (empty($entityType)) {
@@ -61,62 +221,42 @@ class Entity {
}
/**
- * Returns the internal, numeric identifier.
- *
- * Returns the numeric identifier, even if the entity type has specified a
- * name key. In the latter case, the numeric identifier is supposed to be used
- * when dealing generically with entities or internally to refer to an entity,
- * i.e. in a relational database. If unsure, use Entity:identifier().
+ * {@inheritdoc}
*/
public function internalIdentifier() {
return isset($this->{$this->idKey}) ? $this->{$this->idKey} : NULL;
}
/**
- * Returns the entity identifier, i.e. the entities name or numeric id.
- *
- * @return
- * The identifier of the entity. If the entity type makes use of a name key,
- * the name is returned, else the numeric id.
- *
- * @see entity_id()
+ * {@inheritdoc}
*/
public function identifier() {
return isset($this->{$this->nameKey}) ? $this->{$this->nameKey} : NULL;
}
/**
- * Returns the info of the type of the entity.
- *
- * @see entity_get_info()
+ * {@inheritdoc}
*/
public function entityInfo() {
return $this->entityInfo;
}
/**
- * Returns the type of the entity.
+ * {@inheritdoc}
*/
public function entityType() {
return $this->entityType;
}
/**
- * Returns the bundle of the entity.
- *
- * @return
- * The bundle of the entity. Defaults to the entity type if the entity type
- * does not make use of different bundles.
+ * {@inheritdoc}
*/
public function bundle() {
return !empty($this->entityInfo['entity keys']['bundle']) ? $this->{$this->entityInfo['entity keys']['bundle']} : $this->entityType;
}
/**
- * Returns the EntityMetadataWrapper of the entity.
- *
- * @return EntityDrupalWrapper
- * An EntityMetadataWrapper containing the entity.
+ * {@inheritdoc}
*/
public function wrapper() {
if (empty($this->wrapper)) {
@@ -130,12 +270,7 @@ class Entity {
}
/**
- * Returns the label of the entity.
- *
- * Modules may alter the label by specifying another 'label callback' using
- * hook_entity_info_alter().
- *
- * @see entity_label()
+ * {@inheritdoc}
*/
public function label() {
// If the default label flag is enabled, this is being invoked recursively.
@@ -165,12 +300,7 @@ class Entity {
}
/**
- * Returns the uri of the entity just as entity_uri().
- *
- * Modules may alter the uri by specifying another 'uri callback' using
- * hook_entity_info_alter().
- *
- * @see entity_uri()
+ * {@inheritdoc}
*/
public function uri() {
if (isset($this->entityInfo['uri callback']) && $this->entityInfo['uri callback'] == 'entity_class_uri') {
@@ -188,17 +318,7 @@ class Entity {
}
/**
- * Checks if the entity has a certain exportable status.
- *
- * @param $status
- * A status constant, i.e. one of ENTITY_CUSTOM, ENTITY_IN_CODE,
- * ENTITY_OVERRIDDEN or ENTITY_FIXED.
- *
- * @return
- * For exportable entities TRUE if the entity has the status, else FALSE.
- * In case the entity is not exportable, NULL is returned.
- *
- * @see entity_has_status()
+ * {@inheritdoc}
*/
public function hasStatus($status) {
if (!empty($this->entityInfo['exportable'])) {
@@ -207,18 +327,14 @@ class Entity {
}
/**
- * Permanently saves the entity.
- *
- * @see entity_save()
+ * {@inheritdoc}
*/
public function save() {
return entity_get_controller($this->entityType)->save($this);
}
/**
- * Permanently deletes the entity.
- *
- * @see entity_delete()
+ * {@inheritdoc}
*/
public function delete() {
$id = $this->identifier();
@@ -228,55 +344,28 @@ class Entity {
}
/**
- * Exports the entity.
- *
- * @see entity_export()
+ * {@inheritdoc}
*/
public function export($prefix = '') {
return entity_get_controller($this->entityType)->export($this, $prefix);
}
/**
- * Generate an array for rendering the entity.
- *
- * @see entity_view()
+ * {@inheritdoc}
*/
public function view($view_mode = 'full', $langcode = NULL, $page = NULL) {
return entity_get_controller($this->entityType)->view(array($this), $view_mode, $langcode, $page);
}
/**
- * Builds a structured array representing the entity's content.
- *
- * @see entity_build_content()
+ * {@inheritdoc}
*/
public function buildContent($view_mode = 'full', $langcode = NULL) {
return entity_get_controller($this->entityType)->buildContent($this, $view_mode, $langcode);
}
/**
- * Gets the raw, translated value of a property or field.
- *
- * Supports retrieving field translations as well as i18n string translations.
- *
- * Note that this returns raw data values, which might not reflect what
- * has been declared for hook_entity_property_info() as no 'getter callbacks'
- * are invoked or no referenced entities are loaded. For retrieving values
- * reflecting the property info make use of entity metadata wrappers, see
- * entity_metadata_wrapper().
- *
- * @param $property_name
- * The name of the property to return; e.g., 'title'.
- * @param $langcode
- * (optional) The language code of the language to which the value should
- * be translated. If set to NULL, the default display language is being
- * used.
- *
- * @return
- * The raw, translated property value; or the raw, un-translated value if no
- * translation is available.
- *
- * @todo Implement an analogous setTranslation() method for updating.
+ * {@inheritdoc}
*/
public function getTranslation($property, $langcode = NULL) {
$all_info = entity_get_all_property_info($this->entityType);
@@ -296,11 +385,7 @@ class Entity {
}
/**
- * Checks whether the entity is the default revision.
- *
- * @return Boolean
- *
- * @see entity_revision_is_default()
+ * {@inheritdoc}
*/
public function isDefaultRevision() {
if (!empty($this->entityInfo['entity keys']['revision'])) {
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.property.inc b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.property.inc
index 38e4fd7b..e8714e67 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.property.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.property.inc
@@ -69,7 +69,7 @@ function entity_property_info_defaults() {
* (optiona) The entity type to return properties for.
*
* @return
- * An array of info about properties. If the type is ommitted, all known
+ * An array of info about properties. If the type is omitted, all known
* properties are returned.
*/
function entity_get_all_property_info($entity_type = NULL) {
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.ui.inc b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.ui.inc
index 1826da40..24e3c2b9 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.ui.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.ui.inc
@@ -127,8 +127,8 @@ class EntityDefaultUIController {
* Use per bundle form ids if possible, such that easy per bundle alterations
* are supported too.
*
- * Note that for performance reasons, this method is only invoked for forms,
- * which receive the entity_type as first argument. Thus any forms added, must
+ * Note that for performance reasons, this method is invoked only for forms
+ * which receive the entity_type as first argument. Thus any forms added must
* follow that pattern.
*
* @see entity_forms()
@@ -645,7 +645,7 @@ function entity_ui_operation_form($form, &$form_state, $entity_type, $entity, $o
*/
function entity_ui_main_form_defaults($form, &$form_state, $entity = NULL, $op = NULL) {
// Now equals entity_ui_form_defaults() but is still here to keep backward
- // compatability.
+ // compatibility.
return entity_ui_form_defaults($form, $form_state, $form_state['entity_type'], $entity, $op);
}
@@ -760,7 +760,7 @@ function entity_ui_validate_machine_name($element, &$form_state) {
function theme_entity_ui_overview_item($variables) {
$output = $variables['url'] ? l($variables['label'], $variables['url']['path'], $variables['url']['options']) : check_plain($variables['label']);
if ($variables['name']) {
- $output .= ' (' . t('Machine name') . ': ' . check_plain($variables['name']) . ')';
+ $output .= ' (' . t('Machine name') . ': ' . check_plain($variables['name']) . ')';
}
return $output;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.wrapper.inc b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.wrapper.inc
index 06b89adf..860d2c33 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.wrapper.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/includes/entity.wrapper.inc
@@ -119,7 +119,11 @@ abstract class EntityMetadataWrapper {
*/
public function set($value) {
if (!$this->validate($value)) {
- throw new EntityMetadataWrapperException('Invalid data value given. Be sure it matches the required data type and format.');
+ throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
+ // An exception's message is output through check_plain().
+ '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
+ '!location' => $this->debugIdentifierLocation(),
+ )));
}
$this->clear();
$this->data = $value;
@@ -231,6 +235,21 @@ abstract class EntityMetadataWrapper {
return !empty($this->info['parent']) ? $this->info['parent']->propertyAccess($this->info['name'], $op, $account) : TRUE;
}
+ /**
+ * Returns a string to use to identify this wrapper in error messages.
+ *
+ * @return
+ * A string that identifies this wrapper and its chain of ancestors, of the
+ * form 'grandparentidentifier->parentidentifier->identifier'.
+ */
+ public function debugIdentifierLocation() {
+ $debug = $this->info['name'];
+ if (isset($this->info['parent'])) {
+ $debug = $this->info['parent']->debugIdentifierLocation() . '->' . $debug;
+ }
+ return $debug;
+ }
+
/**
* Prepare for serializiation.
*/
@@ -734,7 +753,11 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
*/
public function set($value) {
if (!$this->validate($value)) {
- throw new EntityMetadataWrapperException('Invalid data value given. Be sure it matches the required data type and format.');
+ throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
+ // An exception's message is output through check_plain().
+ '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
+ '!location' => $this->debugIdentifierLocation(),
+ )));
}
if ($this->info['type'] == 'entity' && $value === $this) {
// Nothing to do.
@@ -821,7 +844,12 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
}
else {
// This is not a property, so fallback on entity access.
- return $this->entityAccess($op == 'edit' ? 'update' : 'view', $account);
+ if ($op == 'edit') {
+ // If the operation is "edit" determine if its actually a "create" for
+ // new un-saved entities, or an "update" for existing ones.
+ return $this->entityAccess($this->getIdentifier() ? 'update' : 'create', $account);
+ }
+ return $this->entityAccess('view', $account);
}
}
@@ -909,6 +937,27 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
}
}
+ /**
+ * Returns a string to use to identify this wrapper in error messages.
+ */
+ public function debugIdentifierLocation() {
+ // An entity wrapper can be at the top of the chain or a part of it.
+ if (isset($this->info['name'])) {
+ // This wrapper is part of a chain, eg in the position node->author.
+ // Return the name.
+ $debug = $this->info['name'];
+ }
+ else {
+ // This is a wrapper for an actual entity: return its type and id.
+ $debug = $this->info['type'] . '(' . $this->getIdentifier() . ')';
+ }
+
+ if (isset($this->info['parent'])) {
+ $debug = $this->info['parent']->debugIdentifierLocation() . '->' . $debug;
+ }
+ return $debug;
+ }
+
/**
* Prepare for serializiation.
*/
@@ -1067,7 +1116,7 @@ class EntityListWrapper extends EntityMetadataWrapper implements IteratorAggrega
*/
public function getIterator() {
// In case there is no data available, just iterate over the first item.
- return new EntityMetadataWrapperIterator($this, $this->dataAvailable() ? array_keys(parent::value()) : array(0));
+ return new EntityMetadataWrapperIterator($this, ($this->dataAvailable() && is_array(parent::value())) ? array_keys(parent::value()) : array(0));
}
/**
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/modules/callbacks.inc b/profiles/commerce_kickstart/modules/contrib/entity/modules/callbacks.inc
index 26f802e6..ee156ab3 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/modules/callbacks.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/modules/callbacks.inc
@@ -29,7 +29,7 @@ function entity_metadata_book_get_properties($node, array $options, $name, $enti
case 'book_ancestors':
$ancestors = array();
- while (!empty($node->book['plid'])) {
+ while (!empty($node->book['plid']) && $node->book['plid'] != -1) {
$link = book_link_load($node->book['plid']);
array_unshift($ancestors, $link['nid']);
$node = node_load($link['nid']);
@@ -670,9 +670,11 @@ function entity_metadata_field_file_validate_item($items, $context) {
function entity_metadata_no_hook_node_access($op, $node = NULL, $account = NULL) {
// First deal with the case where a $node is provided.
if (isset($node)) {
- if ($op == 'create') {
+ if (empty($node->vid) && in_array($op, array('create', 'update'))) {
+ // This is a new node or the original node.
if (isset($node->type)) {
- return node_access($op, $node->type, $account);
+ $op = empty($node->nid) || !empty($node->is_new) ? 'create' : 'update';
+ return node_access($op, $op == 'create' ? $node->type : $node, $account);
}
else {
throw new EntityMalformedException('Permission to create a node was requested but no node type was given.');
@@ -796,14 +798,35 @@ function entity_metadata_comment_properties_access($op, $property, $entity = NUL
* Access callback for the taxonomy entities.
*/
function entity_metadata_taxonomy_access($op, $entity = NULL, $account = NULL, $entity_type = NULL) {
- if ($entity_type == 'taxonomy_vocabulary') {
- return user_access('administer taxonomy', $account);
- }
- if (isset($entity) && $op == 'update' && !isset($account) && taxonomy_term_edit_access($entity)) {
+ // If user has administer taxonomy permission then no further checks.
+ if (user_access('administer taxonomy', $account)) {
return TRUE;
}
- if (user_access('administer taxonomy', $account) || user_access('access content', $account) && $op == 'view') {
- return TRUE;
+ switch ($op) {
+ case "view":
+ if (user_access('access content', $account)) {
+ return TRUE;
+ }
+ break;
+ case "update":
+ if ($entity_type == 'taxonomy_term') {
+ return user_access("edit terms in $entity->vid", $account);
+ }
+ break;
+ case "create":
+ if ($entity_type == 'taxonomy_term') {
+ // Check for taxonomy_access_fix contrib module which adds additional
+ // permissions to create new terms in a given vocabulary.
+ if (function_exists('taxonomy_access_fix_access')) {
+ return taxonomy_access_fix_access('add terms', $entity->vocabulary_machine_name);
+ }
+ }
+ break;
+ case "delete":
+ if ($entity_type == 'taxonomy_term') {
+ return user_access("delete terms in $entity->vid", $account);
+ }
+ break;
}
return FALSE;
}
diff --git a/profiles/commerce_kickstart/modules/contrib/entity/modules/node.info.inc b/profiles/commerce_kickstart/modules/contrib/entity/modules/node.info.inc
index 3512d9a0..f146a7e8 100644
--- a/profiles/commerce_kickstart/modules/contrib/entity/modules/node.info.inc
+++ b/profiles/commerce_kickstart/modules/contrib/entity/modules/node.info.inc
@@ -163,4 +163,10 @@ function entity_metadata_node_entity_property_info_alter(&$info) {
'auto creation' => 'entity_property_create_array',
'field' => TRUE,
);
+
+ // Make it a list if cardinality is not 1.
+ $field_body = field_info_field('body');
+ if (isset($field_body) && $field_body['cardinality'] != 1) {
+ $info['node']['properties']['body']['type'] = 'list', $summary); @@ -1226,7 +1306,7 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $ foreach ($items[$id] as $delta => $item) { // Check whether the referenced entity could be loaded. - if (isset($target_entities[$item[$column]])) { + if (isset($target_entities[$item[$column]]) && isset($target_entities[$item[$column]])) { // Replace the instance value with the term data. $items[$id][$delta]['entity'] = $target_entities[$item[$column]]; // Check whether the user has access to the referenced entity. @@ -1258,38 +1338,74 @@ function entityreference_field_formatter_view($entity_type, $entity, $field, $in $target_type = $field_type_settings['entity_type']; $column = $field_type_settings['column']; - // Rebuild the items list to contain only those with access. - foreach ($items as $key => $item) { - if (empty($item['access'])) { - unset($items[$key]); - } - } - switch ($display['type']) { case 'entityreference_label': $handler = entityreference_get_selection_handler($field, $instance, $entity_type, $entity); foreach ($items as $delta => $item) { - $label = $handler->getLabel($item['entity']); - // If the link is to be displayed and the entity has a uri, display a link. - // Note the assignment ($url = ) here is intended to be an assignment. - if ($display['settings']['link'] && ($uri = entity_uri($target_type, $item['entity']))) { - $result[$delta] = array('#markup' => l($label, $uri['path'], $uri['options'])); + // Skip an item that is not accessible, unless we're allowing output of + // entity labels without considering access. + if (empty($item['access']) && !$display['settings']['bypass_access']) { + continue; } - else { - $result[$delta] = array('#markup' => check_plain($label)); + + // Calling EntityReferenceHandler::getLabel() would make a repeated, + // wasteful call to entity_access(). + $label = entity_label($field['settings']['target_type'], $item['entity']); + + // Check if the settings and access allow a link to be displayed. + $display_link = $display['settings']['link'] && $item['access']; + + $uri = NULL; + + // If the link is allowed and the entity has a uri, display a link. + if ($display_link) { + $uri = entity_uri($target_type, $item['entity']); } + + $result[$delta] = array( + '#theme' => 'entityreference_label', + '#label' => $label, + '#item' => $item, + '#uri' => $uri, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_id': foreach ($items as $delta => $item) { - $result[$delta] = array('#markup' => check_plain($item[$column])); + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + + $result[$delta] = array( + '#theme' => 'entityreference_entity_id', + '#item' => $item, + '#settings' => array( + 'display' => $display['settings'], + 'field' => $field['settings'], + ), + ); } break; case 'entityreference_entity_view': + $target_langcode = $langcode; + if (!empty($settings['use_content_language']) && !empty($GLOBALS['language_content']->language)) { + $target_langcode = $GLOBALS['language_content']->language; + } + foreach ($items as $delta => $item) { + // Skip an item that is not accessible. + if (empty($item['access'])) { + continue; + } + // Protect ourselves from recursive rendering. static $depth = 0; $depth++; @@ -1297,9 +1413,9 @@ function entityreference_field_formatter_view($entity_type, $entity, $field, $in throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $target_type, '@entity_id' => $item[$column]))); } - $entity = clone $item['entity']; - unset($entity->content); - $result[$delta] = entity_view($target_type, array($item[$column] => $entity), $settings['view_mode'], $langcode, FALSE); + $target_entity = clone $item['entity']; + unset($target_entity->content); + $result[$delta] = entity_view($target_type, array($item[$column] => $target_entity), $settings['view_mode'], $target_langcode, FALSE); if (empty($settings['links']) && isset($result[$delta][$target_type][$column]['links'])) { $result[$delta][$target_type][$item[$column]]['links']['#access'] = FALSE; @@ -1326,3 +1442,44 @@ function entityreference_views_api() { 'path' => drupal_get_path('module', 'entityreference') . '/views', ); } + +/** + * Theme label. + * + * @ingroup themeable. + */ +function theme_entityreference_label($vars) { + $label = $vars['label']; + $settings = $vars['settings']; + $item = $vars['item']; + $uri = $vars['uri']; + + $output = ''; + + // If the link is to be displayed and the entity has a uri, display a link. + // Note the assignment ($url = ) here is intended to be an assignment. + if ($settings['display']['link'] && isset($uri['path'])) { + $output .= l($label, $uri['path'], $uri['options']); + } + else { + $output .= check_plain($label); + } + + return $output; +} + +/** + * Theme entity_id + * + * @ingroup themeable. + */ +function theme_entityreference_entity_id($vars) { + $settings = $vars['settings']; + $item = $vars['item']; + + $output = ''; + + $output = check_plain($item['target_id']); + + return $output; +} diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info b/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info index 88ad7b5d..70bcc4f2 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info @@ -4,9 +4,9 @@ core = 7.x package = Fields dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php index 43ac693f..075b54d7 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php @@ -144,18 +144,20 @@ protected function buildNodeIndex($node) { // already inserted in taxonomy_build_node_index(). $tid_all = array_diff($tid_all, $original_tid_all); - // Insert index entries for all the node's terms. + // Insert index entries for all the node's terms, preventing duplicates. if (!empty($tid_all)) { - $query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created')); foreach ($tid_all as $tid) { - $query->values(array( + $row = array( 'nid' => $node->nid, 'tid' => $tid, 'sticky' => $sticky, 'created' => $node->created, - )); + ); + $query = db_merge('taxonomy_index') + ->key($row) + ->fields($row); + $query->execute(); } - $query->execute(); } } } diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php index 444a74cc..6ec28a4b 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php @@ -208,7 +208,11 @@ public function validateReferencableEntities(array $ids) { * Implements EntityReferenceHandler::validateAutocompleteInput(). */ public function validateAutocompleteInput($input, &$element, &$form_state, $form) { - $entities = $this->getReferencableEntities($input, '=', 6); + $bundled_entities = $this->getReferencableEntities($input, '=', 6); + $entities = array(); + foreach($bundled_entities as $entities_list) { + $entities += $entities_list; + } if (empty($entities)) { // Error if there are no entities available for a required field. form_error($element, t('There are no entities matching "%value"', array('%value' => $input))); @@ -305,7 +309,7 @@ protected function reAlterQuery(SelectQueryInterface $query, $tag, $base_table) */ public function getLabel($entity) { $target_type = $this->field['settings']['target_type']; - return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -'); + return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED); } /** @@ -339,9 +343,11 @@ public function ensureBaseTable(SelectQueryInterface $query) { // Join the known base-table. $target_type = $this->field['settings']['target_type']; $entity_info = entity_get_info($target_type); + $target_type_base_table = $entity_info['base table']; $id = $entity_info['entity keys']['id']; + // Return the alias of the table. - return $query->innerJoin($target_type, NULL, "%alias.$id = $alias.entity_id"); + return $query->innerJoin($target_type_base_table, NULL, "%alias.$id = $alias.entity_id"); } } @@ -543,7 +549,7 @@ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAI if ($vocabulary = taxonomy_vocabulary_machine_name_load($bundle)) { if ($terms = taxonomy_get_tree($vocabulary->vid, 0, NULL, TRUE)) { foreach ($terms as $term) { - $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain($term->name); + $options[$vocabulary->machine_name][$term->tid] = str_repeat('-', $term->depth) . check_plain(entity_label('taxonomy_term', $term)); } } } diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php index 1b036a7d..cbed33b1 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Views.class.php @@ -9,12 +9,13 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio * Implements EntityReferenceHandler::getInstance(). */ public static function getInstance($field, $instance = NULL, $entity_type = NULL, $entity = NULL) { - return new EntityReference_SelectionHandler_Views($field, $instance); + return new EntityReference_SelectionHandler_Views($field, $instance, $entity); } - protected function __construct($field, $instance) { + protected function __construct($field, $instance, $entity) { $this->field = $field; $this->instance = $instance; + $this->entity = $entity; } /** @@ -52,13 +53,32 @@ public static function settingsForm($field, $instance) { ); $default = !empty($view_settings['args']) ? implode(', ', $view_settings['args']) : ''; + $description = t('Provide a comma separated list of arguments to pass to the view.') . '
' . t('This field supports tokens.'); + + if (!module_exists('token')) { + $description .= '
' . t('Install the token module to get more tokens and display available once.', array('@url' => 'http://drupal.org/project/token')); + } + $form['view']['args'] = array( '#type' => 'textfield', '#title' => t('View arguments'), '#default_value' => $default, '#required' => FALSE, - '#description' => t('Provide a comma separated list of arguments to pass to the view.'), + '#description' => $description, + '#maxlength' => '512', ); + if (module_exists('token')) { + // Get the token type for the entity type our field is in (a type 'taxonomy_term' has a 'term' type token). + $info = entity_get_info($instance['entity_type']); + + $form['view']['tokens'] = array( + '#theme' => 'token_tree', + '#token_types' => array($info['token type']), + '#global_types' => TRUE, + '#click_insert' => TRUE, + '#dialog' => TRUE, + ); + } } else { $form['view']['no_view_help'] = array( @@ -84,6 +104,7 @@ protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $ return FALSE; } $this->view->set_display($display_name); + $this->view->pre_execute(); // Make sure the query is not cached. $this->view->is_cacheable = FALSE; @@ -104,7 +125,7 @@ protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $ */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView($match, $match_operator, $limit)) { // Get the results. @@ -133,12 +154,14 @@ function countReferencableEntities($match = NULL, $match_operator = 'CONTAINS') function validateReferencableEntities(array $ids) { $display_name = $this->field['settings']['handler_settings']['view']['display_name']; - $args = $this->field['settings']['handler_settings']['view']['args']; + $args = $this->handleArgs($this->field['settings']['handler_settings']['view']['args']); $result = array(); if ($this->initializeView(NULL, 'CONTAINS', 0, $ids)) { // Get the results. $entities = $this->view->execute_display($display_name, $args); - $result = array_keys($entities); + if (!empty($entities)) { + $result = array_keys($entities); + } } return $result; } @@ -164,6 +187,49 @@ public function entityFieldQueryAlter(SelectQueryInterface $query) { } + /** + * Handles arguments for views. + * + * Replaces tokens using token_replace(). + * + * @param array $args + * Usually $this->field['settings']['handler_settings']['view']['args']. + * + * @return array + * The arguments to be send to the View. + */ + protected function handleArgs($args) { + if (!module_exists('token')) { + return $args; + } + + // Parameters for token_replace(). + $data = array(); + $options = array('clear' => TRUE); + + if ($entity = $this->entity) { + // D7 HACK: For new entities, entity and revision id are not set. This leads to + // * token replacement emitting PHP warnings + // * views choking on empty arguments + // We workaround this by filling in '0' for these IDs + // and use a clone to leave no traces of our unholy doings. + $info = entity_get_info($this->instance['entity_type']); + if (!isset($entity->{$info['entity keys']['id']})) { + $entity = clone $entity; + $entity->{$info['entity keys']['id']} = '0'; + if (!empty($info['entity keys']['revision'])) { + $entity->{$info['entity keys']['revision']} = '0'; + } + } + + $data[$info['token type']] = $entity; + } + // Replace tokens for each argument. + foreach ($args as $key => $arg) { + $args[$key] = token_replace($arg, $data, $options); + } + return $args; + } } function entityreference_view_settings_validate($element, &$form_state, $form) { diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc index 1d2ea0d3..a4805b1f 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/plugins/selection/abstract.inc @@ -21,8 +21,9 @@ interface EntityReference_SelectionHandler { * Return a list of referencable entities. * * @return - * An array of referencable entities, which keys are entity ids and - * values (safe HTML) labels to be displayed to the user. + * A nested array of entities, the first level is keyed by the + * entity bundle, which contains an array of entity labels (safe HTML), + * keyed by the entity ID. */ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0); diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test index 9a121198..ec78e7bc 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.admin.test @@ -21,7 +21,7 @@ class EntityReferenceAdminTestCase extends DrupalWebTestCase { parent::setUp(array('field_ui', 'entity', 'ctools', 'entityreference')); // Create test user. - $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types')); + $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer fields')); $this->drupalLogin($this->admin_user); // Create content type, with underscores. diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test index 4dc1901f..32248cc0 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.feeds.test @@ -17,6 +17,7 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ 'name' => 'Feeds integration (field mapper)', 'description' => 'Test Feeds Mapper support for fields.', 'group' => 'Entity Reference', + 'dependencies' => array('feeds'), ); } @@ -28,10 +29,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ module_enable(array('entityreference_feeds_test'), TRUE); $this->resetAll(); - if (!module_exists('feeds')) { - return; - } - $permissions[] = 'access content'; $permissions[] = 'administer site configuration'; $permissions[] = 'administer content types'; @@ -157,10 +154,6 @@ class FeedsMapperFieldTestCase extends DrupalWebTestCase{ * Basic test loading a double entry CSV file. */ public function test() { - if (!module_exists('feeds')) { - return; - } - $this->drupalLogin($this->admin_user); $this->drupalGet('admin/structure/types/manage/article/fields'); $this->assertText('Ref - entity ID', t('Found Entity reference field %field.', array('%field' => 'field_er_id'))); diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test index b88e1069..1367b44a 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.handlers.test @@ -194,6 +194,21 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), ); $this->assertReferencable($field, $referencable_tests, 'Node handler (admin)'); + + // Verify autocomplete input validation. + $handler = entityreference_get_selection_handler($field); + $element = array( + '#parents' => array('element_name'), + ); + $form_state = array(); + $form = array(); + $value = $handler->validateAutocompleteInput($nodes['published1']->title, $element, $form_state, $form); + $this->assertEqual($value, $nodes['published1']->nid); + + $invalid_input = $this->randomName(); + $value = $handler->validateAutocompleteInput($invalid_input, $element, $form_state, $form); + $this->assertNull($value); + $this->assertEqual(form_get_error($element), t('There are no entities matching "%value"', array('%value' => $invalid_input))); } /** @@ -256,7 +271,7 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase { ), 'result' => array( 'user' => array( - $users['admin']->uid => '- Restricted access -', + $users['admin']->uid => ENTITYREFERENCE_DENIED, $users['non_admin']->uid => $user_labels['non_admin'], ), ), diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test index 6e4afb78..94b3f568 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/entityreference.taxonomy.test @@ -112,4 +112,52 @@ class EntityReferenceTaxonomyTestCase extends DrupalWebTestCase { $this->assertFalse(taxonomy_select_nodes(1)); } + /** + * Add a second ER field from node/article to taxonomy. + * + * This should not cause {taxonomy_index} to receive duplicate entries. + */ + protected function setupForIndexDuplicates() { + // Create an entity reference field. + $field = array( + 'entity_types' => array('node'), + 'settings' => array( + 'handler' => 'base', + 'target_type' => 'taxonomy_term', + 'handler_settings' => array( + 'target_bundles' => array(), + ), + ), + 'field_name' => 'field_entityreference_term2', + 'type' => 'entityreference', + ); + $field = field_create_field($field); + $instance = array( + 'field_name' => 'field_entityreference_term2', + 'bundle' => 'article', + 'entity_type' => 'node', + ); + + // Enable the taxonomy-index behavior. + $instance['settings']['behaviors']['taxonomy-index']['status'] = TRUE; + field_create_instance($instance); + } + + /** + * Make sure the index only contains one entry for a given node->term + * reference, even when multiple ER fields link from the node bundle to terms. + */ + public function testIndexDuplicates() { + // Extra setup for this test: add another ER field on this content type. + $this->setupForIndexDuplicates(); + + // Assert node insert with reference to term in first field. + $tid = 1; + $settings = array(); + $settings['type'] = 'article'; + $settings['field_entityreference_term'][LANGUAGE_NONE][0]['target_id'] = $tid; + $node = $this->drupalCreateNode($settings); + + $this->assertEqual(taxonomy_select_nodes($tid), array($node->nid)); + } } diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info index 311ae3f4..5bbf9b6f 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info @@ -8,9 +8,9 @@ dependencies[] = feeds dependencies[] = feeds_ui dependencies[] = entityreference -; Information added by packaging script on 2013-11-20 -version = "7.x-1.1" +; Information added by Drupal.org packaging script on 2017-08-16 +version = "7.x-1.5" core = "7.x" project = "entityreference" -datestamp = "1384973110" +datestamp = "1502895850" diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc index f13e88a8..cca36509 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_display.inc @@ -81,8 +81,9 @@ class entityreference_plugin_display extends views_plugin_display { $field = $this->view->query->fields[$this->view->field[$field_alias]->field_alias]; } else { - $this->view->query->add_field($this->view->field[$field_alias]->options['table'], $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->options['field'], array()); - $field = $this->view->query->fields[$this->view->field[$field_alias]->options['field']]; + $field_table = $this->view->query->ensure_table($this->view->field[$field_alias]->table, $this->view->field[$field_alias]->relationship); + $this->view->query->add_field($field_table, $this->view->field[$field_alias]->real_field, $this->view->field[$field_alias]->field, array()); + $field = $this->view->query->fields[$this->view->field[$field_alias]->field]; } // Add an OR condition for the field $conditions->condition($field['table'] . '.' . $field['field'], $value, 'LIKE'); diff --git a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc index fadaa9ee..b72a2357 100644 --- a/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc +++ b/profiles/commerce_kickstart/modules/contrib/entityreference/views/entityreference_plugin_style.inc @@ -26,7 +26,7 @@ class entityreference_plugin_style extends views_plugin_style { '#title' => t('Search fields'), '#options' => $options, '#required' => TRUE, - '#default_value' => $this->options['search_fields'], + '#default_value' => isset($this->options['search_fields']) ? $this->options['search_fields'] : array(), '#description' => t('Select the field(s) that will be searched when using the autocomplete widget.'), '#weight' => -3, ); diff --git a/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php b/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php index a0317bf9..cd6ab11f 100755 --- a/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php +++ b/profiles/commerce_kickstart/modules/contrib/eva/eva-display-entity-view.tpl.php @@ -39,6 +39,12 @@
+
+
+
+