openinfra/groups
Code Issues Proposed changes

Upgrade Drupal Commons to 7.x-3.23

Browse Source 
Apply the security fixes including:
- Drupal Core - Moderately Critical - Multiple Vulnerabilities - SA-CORE-2015-001
- SA-CONTRIB-2015-079 - Chaos tool suite (ctools) - Multiple vulnerabilities

The following patches were applied to 7.x-3.23 commons modules:
- patches/0001-utility-links-block-install-theme.patch
- patches/0002-events-page-refactor-to-pages-module.patch

Installation profile got a refactor of module installation, as groups_ modules
and l10n_updates deployed from an installation task to avoid memory
exhausted errors of the installation process.

Change-Id: I48481657124fdbbee84e1cbfec3a3a2b5f475c2c
This commit is contained in:
Marton Kiss 2015-03-24 16:05:07 +01:00
parent 75d4303d31
commit c2acc71500
143 changed files with 1735 additions and 1439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drupal-org-core.make
View File

@ -3,9 +3,9 @@ core = 7.x
; Download Drupal core and apply core patches if needed. ; Download Drupal core and apply core patches if needed.
projects[drupal][type] = "core" projects[drupal][type] = "core"
projects[drupal][version] = "7.34" projects[drupal][version] = "7.35"
projects[drupal][download][type] = get projects[drupal][download][type] = get
projects[drupal][download][url] = http://ftp.drupal.org/files/projects/drupal-7.34.tar.gz projects[drupal][download][url] = http://ftp.drupal.org/files/projects/drupal-7.35.tar.gz
; This patch allows install profile to list requirements on the install page ; This patch allows install profile to list requirements on the install page
; http://drupal.org/node/1971072 ; http://drupal.org/node/1971072

212
drupal-org.make
View File

@ -5,7 +5,7 @@ core = 7.x
projects[addressfield][type] = "module" projects[addressfield][type] = "module"
projects[addressfield][subdir] = "contrib" projects[addressfield][subdir] = "contrib"
projects[addressfield][version] = "1.0-beta5" projects[addressfield][version] = "1.0"
projects[addressfield_tokens][type] = "module" projects[addressfield_tokens][type] = "module"
projects[addressfield_tokens][subdir] = "contrib" projects[addressfield_tokens][subdir] = "contrib"
@ -20,7 +20,7 @@ projects[admin_icons][download][revision] = "60d9f28801533fecc92216a60d444d89d80
projects[apachesolr][type] = "module" projects[apachesolr][type] = "module"
projects[apachesolr][subdir] = "contrib" projects[apachesolr][subdir] = "contrib"
projects[apachesolr][version] = "1.6" projects[apachesolr][version] = "1.7"
projects[apachesolr_og][type] = "module" projects[apachesolr_og][type] = "module"
projects[apachesolr_og][subdir] = "contrib" projects[apachesolr_og][subdir] = "contrib"
@ -50,10 +50,7 @@ projects[apachesolr_user][patch][] = "http://drupal.org/files/2077281-apache-sol
projects[breakpoints][type] = "module" projects[breakpoints][type] = "module"
projects[breakpoints][subdir] = "contrib" projects[breakpoints][subdir] = "contrib"
projects[breakpoints][download][type] = "git" projects[breakpoints][version] = "1.3"
projects[breakpoints][download][url] = "http://git.drupal.org/project/breakpoints.git"
projects[breakpoints][download][branch] = "7.x-1.x"
projects[breakpoints][download][revision] = "c4f3665"
projects[connector][type] = "module" projects[connector][type] = "module"
projects[connector][subdir] = "contrib" projects[connector][subdir] = "contrib"
@ -61,37 +58,19 @@ projects[connector][version] = "1.0-beta2"
projects[ckeditor][type] = "module" projects[ckeditor][type] = "module"
projects[ckeditor][subdir] = "contrib" projects[ckeditor][subdir] = "contrib"
projects[ckeditor][download][type] = "git" projects[ckeditor][version] = "1.16"
projects[ckeditor][download][url] = "http://git.drupal.org/project/ckeditor.git"
projects[ckeditor][download][branch] = "7.x-1.x"
projects[ckeditor][download][revision] = "b69a9ac"
; Only load CSS when necessary.
; https://drupal.org/node/1370894
projects[ckeditor][patch][] = "https://drupal.org/files/issues/attach-ckeditor-css-1370894-8.patch"
; Accomodate latest Media changes. ; Accomodate latest Media changes.
; https://drupal.org/node/2159403 ; https://drupal.org/node/2159403
projects[ckeditor][patch][] = "https://drupal.org/files/issues/ckeditor-accomodate-latest-media-changes-0.patch" projects[ckeditor][patch][] = "https://drupal.org/files/issues/make_ckeditor_plugin-2159403-141.patch"
; Remove redundant external plugin declarations.
; https://drupal.org/comment/8284591#comment-8284591
projects[ckeditor][patch][] = "https://drupal.org/files/issues/ckeditor-remove-external-plugin-declarations-1-alt.patch"
projects[ctools][type] = "module" projects[ctools][type] = "module"
projects[ctools][subdir] = "contrib" projects[ctools][subdir] = "contrib"
projects[ctools][download][type] = "git" projects[ctools][version] = "1.7"
projects[ctools][download][url] = "http://git.drupal.org/project/ctools.git"
projects[ctools][download][branch] = "7.x-1.x"
projects[ctools][download][revision] = "e720f61d"
projects[custom_search][type] = "module" projects[custom_search][type] = "module"
projects[custom_search][subdir] = "contrib" projects[custom_search][subdir] = "contrib"
projects[custom_search][version] = "1.16" projects[custom_search][version] = "1.18"
; Avoid akward sanitization of user-entered search strings.
; https://drupal.org/node/2012210
projects[custom_search][patch][] = "http://drupal.org/files/commons_search_js_encode.patch"
projects[date][type] = "module" projects[date][type] = "module"
projects[date][subdir] = "contrib" projects[date][subdir] = "contrib"
@ -145,6 +124,13 @@ projects[entitycache][version] = "1.2"
; http://drupal.org/node/1349566#comment-7781063 ; http://drupal.org/node/1349566#comment-7781063
projects[entitycache][patch][] = "http://drupal.org/files/add-translation-information-on-each-request-1349566-12.patch" projects[entitycache][patch][] = "http://drupal.org/files/add-translation-information-on-each-request-1349566-12.patch"
projects[entity_embed][version] = "1.x-dev"
projects[entity_embed][type] = "module"
projects[entity_embed][subdir] = "contrib"
projects[entity_embed][download][type] = "git"
projects[entity_embed][download][revision] = "dcd4bac"
projects[entity_embed][download][branch] = "7.x-1.x"
projects[entityreference][type] = "module" projects[entityreference][type] = "module"
projects[entityreference][subdir] = "contrib" projects[entityreference][subdir] = "contrib"
projects[entityreference][version] = "1.1" projects[entityreference][version] = "1.1"
@ -153,25 +139,28 @@ projects[entityreference_prepopulate][type] = "module"
projects[entityreference_prepopulate][subdir] = "contrib" projects[entityreference_prepopulate][subdir] = "contrib"
projects[entityreference_prepopulate][version] = "1.5" projects[entityreference_prepopulate][version] = "1.5"
; Entityreference prepopulate overwrites field instance custom default value functions.
; https://drupal.org/node/2304301#comment-8973459
projects[entityreference_prepopulate][patch][] = "https://drupal.org/files/issues/check-for-default-value-function-2304301-1.patch"
projects[entity_translation][type] = "module" projects[entity_translation][type] = "module"
projects[entity_translation][subdir] = "contrib" projects[entity_translation][subdir] = "contrib"
projects[entity_translation][version] = "1.0-beta3" projects[entity_translation][version] = "1.0-beta4"
projects[facetapi][type] = "module" projects[facetapi][type] = "module"
projects[facetapi][subdir] = "contrib" projects[facetapi][subdir] = "contrib"
projects[facetapi][version] = "1.3" projects[facetapi][version] = "1.5"
projects[features][type] = "module" projects[features][type] = "module"
projects[features][subdir] = "contrib" projects[features][subdir] = "contrib"
projects[features][version] = "2.0" projects[features][version] = "2.4"
projects[file_entity][type] = "module" projects[file_entity][type] = "module"
projects[file_entity][subdir] = "contrib" projects[file_entity][subdir] = "contrib"
projects[file_entity][version] = "2.0-alpha3" projects[file_entity][download][type] = "git"
projects[file_entity][download][url] = "http://git.drupal.org/project/file_entity.git"
; Issue #2081713: Fix undefined index errors with empty (remote) files. projects[file_entity][download][branch] = "7.x-2.x"
; https://drupal.org/node/2081713 projects[file_entity][download][revision] = "b610413"
projects[file_entity][patch][] = "https://drupal.org/files/issues/add-filesize-checks-2081713-13.patch"
projects[flag][type] = "module" projects[flag][type] = "module"
projects[flag][subdir] = "contrib" projects[flag][subdir] = "contrib"
@ -202,14 +191,14 @@ projects[http_client][version] = "2.4"
projects[i18n][type] = "module" projects[i18n][type] = "module"
projects[i18n][subdir] = "contrib" projects[i18n][subdir] = "contrib"
projects[i18n][version] = "1.11" projects[i18n][version] = "1.12"
projects[i18nviews][type] = "module" projects[i18nviews][type] = "module"
projects[i18nviews][subdir] = "contrib" projects[i18nviews][subdir] = "contrib"
projects[i18nviews][download][type] = "git" projects[i18nviews][download][type] = "git"
projects[i18nviews][download][url] = "http://git.drupal.org/project/i18nviews.git" projects[i18nviews][download][url] = "http://git.drupal.org/project/i18nviews.git"
projects[i18nviews][download][branch] = "7.x-3.x" projects[i18nviews][download][branch] = "7.x-3.x"
projects[i18nviews][download][revision] = "26bd52c" projects[i18nviews][download][revision] = "27e9809"
projects[kissmetrics][type] = "module" projects[kissmetrics][type] = "module"
projects[kissmetrics][subdir] = "contrib" projects[kissmetrics][subdir] = "contrib"
@ -217,7 +206,7 @@ projects[kissmetrics][version] = "1.0-rc3"
projects[l10n_update][type] = "module" projects[l10n_update][type] = "module"
projects[l10n_update][subdir] = "contrib" projects[l10n_update][subdir] = "contrib"
projects[l10n_update][version] = "1.0" projects[l10n_update][version] = "1.1"
projects[libraries][type] = "module" projects[libraries][type] = "module"
projects[libraries][subdir] = "contrib" projects[libraries][subdir] = "contrib"
@ -225,46 +214,49 @@ projects[libraries][version] = "2.2"
projects[lingotek][type] = "module" projects[lingotek][type] = "module"
projects[lingotek][subdir] = "contrib" projects[lingotek][subdir] = "contrib"
projects[lingotek][version] = "5.06" projects[lingotek][version] = "6.01"
projects[link][type] = "module" projects[link][type] = "module"
projects[link][subdir] = "contrib" projects[link][subdir] = "contrib"
projects[link][version] = "1.2" projects[link][version] = "1.3"
projects[media][type] = "module" projects[media][type] = "module"
projects[media][subdir] = "contrib" projects[media][subdir] = "contrib"
projects[media][download][type] = "git" projects[media][download][type] = "git"
projects[media][download][url] = "http://git.drupal.org/project/media.git" projects[media][download][url] = "http://git.drupal.org/project/media.git"
projects[media][download][branch] = "7.x-2.x" projects[media][download][branch] = "7.x-2.x"
projects[media][download][revision] = "b2c2d78" projects[media][download][revision] = "7d9671f"
; New filelfield browser widget is massively confusing the user
; https://drupal.org/comment/8570379#comment-8570379
projects[media][patch][] = "https://drupal.org/files/issues/automatically-attach-files-2216329-2.patch"
projects[media_oembed][type] = "module" projects[media_oembed][type] = "module"
projects[media_oembed][subdir] = "contrib" projects[media_oembed][subdir] = "contrib"
projects[media_oembed][version] = "2.1" projects[media_oembed][version] = "2.2"
projects[memcache][type] = "module" projects[memcache][type] = "module"
projects[memcache][subdir] = "contrib" projects[memcache][subdir] = "contrib"
projects[memcache][version] = "1.0" projects[memcache][version] = "1.5"
projects[menu_attributes][type] = "module" projects[menu_attributes][type] = "module"
projects[menu_attributes][subdir] = "contrib" projects[menu_attributes][subdir] = "contrib"
projects[menu_attributes][version] = "1.0-rc2" projects[menu_attributes][version] = "1.0-rc3"
projects[message][type] = "module" projects[message][type] = "module"
projects[message][subdir] = "contrib" projects[message][subdir] = "contrib"
projects[message][version] = "1.9" projects[message][download][type] = "git"
projects[message][download][url] = "http://git.drupal.org/project/message.git"
projects[message][download][branch] = "7.x-1.x"
projects[message][download][revision] = "3bbdd5e6"
; Make message access alterable. ; Make message access alterable.
; http://drupal.org/node/1920560#comment-7080942 ; https://drupal.org/node/1920560#comment-7080942
projects[message][patch][] = "http://drupal.org/files/1920560-message-access-alterable.patch" projects[message][patch][] = "https://drupal.org/files/1920560-message-access-alterable.patch"
; Add support for the undefined language. ; Add support for the undefined language.
; http://drupal.org/node/2006702#comment-7842259 ; https://drupal.org/node/2006702#comment-7842259
projects[message][patch][] = "http://drupal.org/files/message_field_undefined-lang.2006702-14.patch" projects[message][patch][] = "https://drupal.org/files/message_field_undefined-lang.2006702-14.patch"
; Fix Undefined index: message_type in _field_ui on field listings
; https://drupal.org/node/1391442
projects[message][patch][] = "https://drupal.org/files/issues/message-entity_info_hook_notice_undefined_index-1391442-34.patch"
projects[message_notify][type] = "module" projects[message_notify][type] = "module"
projects[message_notify][subdir] = "contrib" projects[message_notify][subdir] = "contrib"
@ -274,9 +266,17 @@ projects[message_subscribe][type] = "module"
projects[message_subscribe][subdir] = "contrib" projects[message_subscribe][subdir] = "contrib"
projects[message_subscribe][version] = "1.0-rc2" projects[message_subscribe][version] = "1.0-rc2"
; Message Subscribe sends emails regardless of context
; https://www.drupal.org/node/1828184
projects[message_subscribe][patch][] = "https://drupal.org/files/issues/group-context-1828184-53.patch"
; By default, don't notify blocked users
; https://www.drupal.org/node/2184567
projects[message_subscribe][patch][] = "https://drupal.org/files/issues/2184567-message-subscribe-blocked-users-23.patch"
projects[metatag][type] = "module" projects[metatag][type] = "module"
projects[metatag][subdir] = "contrib" projects[metatag][subdir] = "contrib"
projects[metatag][version] = "1.0-beta9" projects[metatag][version] = "1.4"
projects[module_filter][type] = "module" projects[module_filter][type] = "module"
projects[module_filter][subdir] = "contrib" projects[module_filter][subdir] = "contrib"
@ -284,15 +284,11 @@ projects[module_filter][version] = "2.0"
projects[mollom][type] = "module" projects[mollom][type] = "module"
projects[mollom][subdir] = "contrib" projects[mollom][subdir] = "contrib"
projects[mollom][version] = "2.10" projects[mollom][version] = "2.13"
projects[navbar][type] = "module" projects[navbar][type] = "module"
projects[navbar][subdir] = "contrib" projects[navbar][subdir] = "contrib"
projects[navbar][version] = "1.4" projects[navbar][version] = "1.6"
; Change I-beam cursors in the navbar to be a pointer instead.
; https://drupal.org/node/2173041
projects[navbar][patch][] = "https://drupal.org/files/issues/2173041-3-i-beam-menu-hover.patch"
projects[oauth][type] = "module" projects[oauth][type] = "module"
projects[oauth][subdir] = "contrib" projects[oauth][subdir] = "contrib"
@ -312,19 +308,29 @@ projects[oembed][download][url] = "http://git.drupal.org/project/oembed.git"
projects[oembed][download][branch] = "7.x-1.x" projects[oembed][download][branch] = "7.x-1.x"
projects[oembed][download][revision] = "9aa5303" projects[oembed][download][revision] = "9aa5303"
; Remove the media submodule as it conflicts with the Media: oEmbed module.
; https://drupal.org/node/2269745#comment-8796261
projects[oembed][patch][] = "https://drupal.org/files/issues/remove-media-submodule-2269745-2.patch"
projects[og][type] = "module" projects[og][type] = "module"
projects[og][subdir] = "contrib" projects[og][subdir] = "contrib"
projects[og][version] = "2.7" projects[og][version] = "2.7"
; Fix missing class of login links in subscription field
projects[og][patch][] = "patches/0003-fix-og-subscribe-link-classes.patch"
; Auto-assign role to group manager broken on groups with overridden roles. ; Auto-assign role to group manager broken on groups with overridden roles.
; https://drupal.org/node/2005800#comment-7684873 ; https://drupal.org/node/2005800#comment-7684873
projects[og][patch][] = "http://drupal.org/files/issues/og-default-role-member-2005800-25.patch" projects[og][patch][] = "https://drupal.org/files/issues/og-default-role-member-2005800-25.patch"
; og_ui should give users the theme, not admin ui when creating groups. ; og_ui should give users the theme, not admin ui when creating groups.
; http://drupal.org/node/1800208 ; https://drupal.org/node/1800208
projects[og][patch][] = "http://drupal.org/files/og_ui-group_node_add_theme-1800208-5.patch" projects[og][patch][] = "https://drupal.org/files/og_ui-group_node_add_theme-1800208-5.patch"
; Missing permissions when installing a new site.
; https://drupal.org/node/2301831
projects[og][patch][] = "https://drupal.org/files/issues/og-missing-permission-roles-2301831-1.patch"
; Missing permissions when reverting features.
; https://drupal.org/node/2021673
projects[og][patch][] = "https://drupal.org/files/og-Do_not_export_nonexisting_roles-2021673-1.patch"
projects[panelizer][type] = "module" projects[panelizer][type] = "module"
projects[panelizer][subdir] = "contrib" projects[panelizer][subdir] = "contrib"
@ -339,7 +345,7 @@ projects[panels][download][revision] = "8059bda2b"
projects[paranoia][type] = "module" projects[paranoia][type] = "module"
projects[paranoia][subdir] = "contrib" projects[paranoia][subdir] = "contrib"
projects[paranoia][version] = "1.3" projects[paranoia][version] = "1.4"
projects[pathauto][type] = "module" projects[pathauto][type] = "module"
projects[pathauto][subdir] = "contrib" projects[pathauto][subdir] = "contrib"
@ -350,30 +356,7 @@ projects[pathauto][patch][] = "https://www.drupal.org/files/pathauto-add-drush-s
projects[picture][type] = "module" projects[picture][type] = "module"
projects[picture][subdir] = "contrib" projects[picture][subdir] = "contrib"
projects[picture][download][type] = "git" projects[picture][version] = "1.5"
projects[picture][download][url] = "http://git.drupal.org/project/picture.git"
projects[picture][download][branch] = "7.x-1.x"
projects[picture][download][revision] = "18b94b9"
; Add ctools as a dependency
; https://drupal.org/node/2173043
projects[picture][patch][] = "https://drupal.org/files/issues/add-ctools-dependency-2173043-1.patch"
; Allow filter tips to be translated
; https://drupal.org/node/2139459
projects[picture][patch][] = "https://drupal.org/files/issues/translate-filter-tips-2139459-1.patch"
; Move hook_uninstall() to picture.install to fix issues on uninstall.
; https://drupal.org/node/2173015
projects[picture][patch][] = "https://drupal.org/files/issues/move-uninstall-hook-implementation-2173015-1.patch"
; Remove implementation of hook_file_formatter_info() to remove duplicate file formatter.
; https://drupal.org/node/2172841
projects[picture][patch][] = "https://drupal.org/files/issues/remove-file-formatter-hook-implementation-2172831-1.patch"
; Remove implementation of hook_ctools_plugin_api() to fix issues with features.
; https://drupal.org/node/2172831
projects[picture][patch][] = "https://drupal.org/files/issues/remove-ctools-hook-implementation-2172831-1.patch"
projects[pm_existing_pages][type] = "module" projects[pm_existing_pages][type] = "module"
projects[pm_existing_pages][subdir] = "contrib" projects[pm_existing_pages][subdir] = "contrib"
@ -398,7 +381,7 @@ projects[quicktabs][patch][] = "http://drupal.org/files/2104643-revert-qt-487518
projects[r4032login][type] = "module" projects[r4032login][type] = "module"
projects[r4032login][subdir] = "contrib" projects[r4032login][subdir] = "contrib"
projects[r4032login][version] = "1.7" projects[r4032login][version] = "1.8"
projects[radioactivity][type] = "module" projects[radioactivity][type] = "module"
projects[radioactivity][subdir] = "contrib" projects[radioactivity][subdir] = "contrib"
@ -422,7 +405,7 @@ projects[realname][version] = "1.2"
; Realname entityreference autocomplete API update ; Realname entityreference autocomplete API update
; https://drupal.org/node/2225889 ; https://drupal.org/node/2225889
projects[realname][patch][] = "https://drupal.org/files/issues/2225889-realname-correct-menu-2.patch" projects[realname][patch][] = "https://drupal.org/files/issues/2225889-realname-correct-menu-3.patch"
projects[redirect][type] = "module" projects[redirect][type] = "module"
projects[redirect][subdir] = "contrib" projects[redirect][subdir] = "contrib"
@ -434,15 +417,15 @@ projects[registration][version] = "1.3"
projects[rich_snippets][type] = "module" projects[rich_snippets][type] = "module"
projects[rich_snippets][subdir] = "contrib" projects[rich_snippets][subdir] = "contrib"
projects[rich_snippets][version] = "1.0-beta3" projects[rich_snippets][version] = "1.0-beta4"
projects[rules][type] = "module" projects[rules][type] = "module"
projects[rules][subdir] = "contrib" projects[rules][subdir] = "contrib"
projects[rules][version] = "2.7" projects[rules][version] = "2.9"
projects[schemaorg][type] = "module" projects[schemaorg][type] = "module"
projects[schemaorg][subdir] = "contrib" projects[schemaorg][subdir] = "contrib"
projects[schemaorg][version] = "1.0-beta4" projects[schemaorg][version] = "1.0-rc1"
projects[search_facetapi][type] = "module" projects[search_facetapi][type] = "module"
projects[search_facetapi][subdir] = "contrib" projects[search_facetapi][subdir] = "contrib"
@ -450,7 +433,7 @@ projects[search_facetapi][version] = "1.0-beta2"
projects[sharethis][type] = "module" projects[sharethis][type] = "module"
projects[sharethis][subdir] = "contrib" projects[sharethis][subdir] = "contrib"
projects[sharethis][version] = "2.6" projects[sharethis][version] = "2.10"
projects[smartcrop][type] = "module" projects[smartcrop][type] = "module"
projects[smartcrop][subdir] = "contrib" projects[smartcrop][subdir] = "contrib"
@ -465,11 +448,11 @@ projects[strongarm][download][revision] = "5a2326ba67e59923ecce63d9bb5e0ed6548ab
projects[timeago][type] = "module" projects[timeago][type] = "module"
projects[timeago][subdir] = "contrib" projects[timeago][subdir] = "contrib"
projects[timeago][version] = "2.2" projects[timeago][version] = "2.3"
; Provide a dedicated date type. ; Provide a dedicated date type.
; http://drupal.org/node/1427226#comment-6638836 ; https://drupal.org/node/1427226#comment-6638836
projects[timeago][patch][] = "http://drupal.org/files/1427226-timeago-date-type.patch" projects[timeago][patch][] = "https://drupal.org/files/issues/1427226-timeago-date-type-6.patch"
projects[title][type] = "module" projects[title][type] = "module"
projects[title][subdir] = "contrib" projects[title][subdir] = "contrib"
@ -477,7 +460,7 @@ projects[title][version] = "1.0-alpha7"
projects[token][type] = "module" projects[token][type] = "module"
projects[token][subdir] = "contrib" projects[token][subdir] = "contrib"
projects[token][version] = "1.5" projects[token][version] = "1.6"
projects[translation_helpers][type] = "module" projects[translation_helpers][type] = "module"
projects[translation_helpers][subdir] = "contrib" projects[translation_helpers][subdir] = "contrib"
@ -493,7 +476,7 @@ projects[views][version] = "3.10"
; Update Views Content access filter per core performance improvements. ; Update Views Content access filter per core performance improvements.
; https://drupal.org/comment/8516039#comment-8516039 ; https://drupal.org/comment/8516039#comment-8516039
projects[views][patch][] = "https://drupal.org/files/issues/2204257-views-content-access-filter-core-depends-on-core-patch.patch" projects[views][patch][] = "https://drupal.org/files/issues/views-content_access_filter_per_core_performance-2204257-4_0.patch"
projects[views_bulk_operations][type] = "module" projects[views_bulk_operations][type] = "module"
projects[views_bulk_operations][subdir] = "contrib" projects[views_bulk_operations][subdir] = "contrib"
@ -509,15 +492,11 @@ projects[views_litepager][version] = "3.0"
projects[views_load_more][type] = "module" projects[views_load_more][type] = "module"
projects[views_load_more][subdir] = "contrib" projects[views_load_more][subdir] = "contrib"
projects[views_load_more][version] = "1.2" projects[views_load_more][version] = "1.5"
; Suppress notice error when loading more content from views_load_more.
; https://drupal.org/node/2207467
projects[views_load_more][patch][] = "https://drupal.org/files/issues/fix-notice-undefined-index-2152935-3.patch"
projects[votingapi][type] = "module" projects[votingapi][type] = "module"
projects[votingapi][subdir] = "contrib" projects[votingapi][subdir] = "contrib"
projects[votingapi][version] = "2.11" projects[votingapi][version] = "2.12"
projects[voting_rules][type] = "module" projects[voting_rules][type] = "module"
projects[voting_rules][subdir] = "contrib" projects[voting_rules][subdir] = "contrib"
@ -581,7 +560,7 @@ projects[feeds_fetcher_directory][patch][] = "https://drupal.org/files/feeds_fet
projects[jquery_update][type] = "module" projects[jquery_update][type] = "module"
projects[jquery_update][subdir] = "contrib" projects[jquery_update][subdir] = "contrib"
projects[jquery_update][version] = "2.4" projects[jquery_update][version] = "2.5"
projects[panels_ajax_tab][type] = "module" projects[panels_ajax_tab][type] = "module"
projects[panels_ajax_tab][subdir] = "contrib" projects[panels_ajax_tab][subdir] = "contrib"
@ -622,10 +601,7 @@ projects[adaptivetheme][download][revision] = "18693ff59db7cb3171f282a982d04fe65
projects[ember][type] = "theme" projects[ember][type] = "theme"
projects[ember][subdir] = "contrib" projects[ember][subdir] = "contrib"
projects[ember][download][type] = "git" projects[ember][version] = "2.0-alpha3"
projects[ember][download][url] = "http://git.drupal.org/project/ember.git"
projects[ember][download][branch] = "7.x-2.x"
projects[ember][download][revision] = "caf4df7"
projects[sky][type] = "theme" projects[sky][type] = "theme"
projects[sky][subdir] = "contrib" projects[sky][subdir] = "contrib"
@ -643,11 +619,11 @@ libraries[backbone][type] = "libraries"
libraries[backbone][download][url] = "https://github.com/jashkenas/backbone/archive/1.1.0.tar.gz" libraries[backbone][download][url] = "https://github.com/jashkenas/backbone/archive/1.1.0.tar.gz"
libraries[ckeditor][download][type] = "get" libraries[ckeditor][download][type] = "get"
libraries[ckeditor][download][url] = "http://download.cksource.com/CKEditor/CKEditor/CKEditor%204.3.4/ckeditor_4.3.4_full.zip" libraries[ckeditor][download][url] = "http://download.cksource.com/CKEditor/CKEditor/CKEditor%204.4.7/ckeditor_4.4.7_full.zip"
libraries[ckeditor][type] = "libraries" libraries[ckeditor][type] = "libraries"
libraries[ckeditor_lineutils][download][type] = "get" libraries[ckeditor_lineutils][download][type] = "get"
libraries[ckeditor_lineutils][download][url] = "http://download.ckeditor.com/lineutils/releases/lineutils_4.3.4.zip" libraries[ckeditor_lineutils][download][url] = "http://download.ckeditor.com/lineutils/releases/lineutils_4.4.7.zip"
libraries[ckeditor_lineutils][type] = "libraries" libraries[ckeditor_lineutils][type] = "libraries"
libraries[ckeditor_lineutils][subdir] = "ckeditor/plugins" libraries[ckeditor_lineutils][subdir] = "ckeditor/plugins"
libraries[ckeditor_lineutils][directory_name] = "lineutils" libraries[ckeditor_lineutils][directory_name] = "lineutils"
@ -658,6 +634,12 @@ libraries[ckeditor_widget][type] = "libraries"
libraries[ckeditor_widget][subdir] = "ckeditor/plugins" libraries[ckeditor_widget][subdir] = "ckeditor/plugins"
libraries[ckeditor_widget][directory_name] = "widget" libraries[ckeditor_widget][directory_name] = "widget"
libraries[ckeditor_widget][download][type] = "get"
libraries[ckeditor_widget][download][url] = "http://download.ckeditor.com/widget/releases/widget_4.4.7.zip"
libraries[ckeditor_widget][type] = "libraries"
libraries[ckeditor_widget][subdir] = "ckeditor/plugins"
libraries[ckeditor_widget][directory_name] = "widget"
libraries[modernizr][download][type] = "get" libraries[modernizr][download][type] = "get"
libraries[modernizr][type] = "libraries" libraries[modernizr][type] = "libraries"
libraries[modernizr][download][url] = "https://github.com/Modernizr/Modernizr/archive/v2.7.1.tar.gz" libraries[modernizr][download][url] = "https://github.com/Modernizr/Modernizr/archive/v2.7.1.tar.gz"

18
groups.info
View File

@ -48,7 +48,6 @@ dependencies[] = googleanalytics
dependencies[] = http_client dependencies[] = http_client
dependencies[] = jquery_update dependencies[] = jquery_update
dependencies[] = libraries dependencies[] = libraries
dependencies[] = l10n_update
dependencies[] = markdown dependencies[] = markdown
dependencies[] = media dependencies[] = media
dependencies[] = media_internet dependencies[] = media_internet
@ -147,20 +146,3 @@ dependencies[] = feeds_fetcher_directory
; Custom modules ; Custom modules
dependencies[] = field_property_list dependencies[] = field_property_list
dependencies[] = field_group_location dependencies[] = field_group_location
; Features
dependencies[] = groups_groups
dependencies[] = groups_directory
dependencies[] = groups_footer
dependencies[] = groups_homepage
dependencies[] = groups_common
dependencies[] = groups_comment
dependencies[] = groups_auth
dependencies[] = groups_oauth2
dependencies[] = groups_oauth2_picture
dependencies[] = groups_feeds
dependencies[] = groups_events
dependencies[] = groups_events_pages
dependencies[] = groups_pages
dependencies[] = groups_reports
dependencies[] = groups_wikis

16
groups.install_callbacks.inc Normal file
View File

@ -0,0 +1,16 @@
<?php
/**
* @file
* Contains Batch API callbacks used during installation.
*/
/**
* BatchAPI callback.
*
* @see groups_install_additional_modules()
*/
function _groups_enable_module($module, $module_name, &$context) {
module_enable(array($module), FALSE);
$context['message'] = st('Installed %module module.', array('%module' => $module_name));
}

80
groups.profile
View File

@ -93,6 +93,11 @@ function groups_install_tasks() {
'groups_revert_features' => array( 'groups_revert_features' => array(
'display' => FALSE, 'display' => FALSE,
), ),
'groups_install_additional_modules' => array(
'display_name' => st('Install additional functionality'),
'display' => FALSE,
'type' => 'batch',
),
'groups_demo_content' => array( 'groups_demo_content' => array(
'display' => FALSE, 'display' => FALSE,
'type' => '', 'type' => '',
@ -260,6 +265,81 @@ function field_property_list_reverse_lookup() {
); );
} }
/**
* array_filter() callback used to filter out already installed dependencies.
*/
function _groups_filter_dependencies($dependency) {
return !module_exists($dependency);
}
/**
* Install additional modules.
*
* The groups modules installed from this hook to avoid
* memory exhausted error messages.
*
* l10n_update module move to the end of the queue to
* avoid download of translations during module
* deployment.
*/
function groups_install_additional_modules() {
$modules = array(
'groups_common',
'groups_groups',
'groups_directory',
'groups_footer',
'groups_events',
'groups_homepage',
'groups_comment',
'groups_auth',
'groups_oauth2',
'groups_oauth2_picture',
'groups_feeds',
'groups_events_pages',
'groups_pages',
'groups_reports',
'groups_wikis',
);
// Resolve the dependencies now, so that module_enable() doesn't need
// to do it later for each individual module (which kills performance).
$files = system_rebuild_module_data();
// Add l10n_update module as last one to avoid translation file fetch
// during deployment.
$modules[] = 'l10n_update';
$files['l10n_update']->sort = -999;
$modules_sorted = array();
foreach ($modules as $module) {
if ($files[$module]->requires) {
// Create a list of dependencies that haven't been installed yet.
$dependencies = array_keys($files[$module]->requires);
$dependencies = array_filter($dependencies, '_groups_filter_dependencies');
// Add them to the module list.
$modules = array_merge($modules, $dependencies);
}
}
$modules = array_unique($modules);
foreach ($modules as $module) {
$modules_sorted[$module] = $files[$module]->sort;
}
arsort($modules_sorted);
$operations = array();
// Enable the selected modules.
foreach ($modules_sorted as $module => $weight) {
$operations[] = array('_groups_enable_module', array($module, $files[$module]->info['name']));
}
$batch = array(
'title' => st('Installing additional functionality'),
'operations' => $operations,
'file' => drupal_get_path('profile', 'groups') . '/groups.install_callbacks.inc',
);
return $batch;
}
/** /**
* Create demo group * Create demo group
*/ */

12
modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.info
View File

@ -1,18 +1,20 @@
name = Commons Activity Page name = Commons Activity Page
description = Allows users to view a stream of site-wide and personalized activity. description = Provides a landing page which lists site activity.
core = 7.x
package = Commons - Landing pages package = Commons - Landing pages
core = 7.x
dependencies[] = commons_activity_streams dependencies[] = commons_activity_streams
dependencies[] = commons_featured dependencies[] = commons_featured
dependencies[] = ctools dependencies[] = ctools
dependencies[] = page_manager dependencies[] = page_manager
features[ctools][] = page_manager:pages_default:1 features[ctools][] = page_manager:pages_default:1
features[features_api][] = api:2 features[features_api][] = api:2
features[page_manager_pages][] = commons_activity_streams_activity features[page_manager_pages][] = commons_activity_streams_activity
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

18
modules/commons/commons_activity_streams/commons_activity_streams.features.inc
View File

@ -38,11 +38,7 @@ function commons_activity_streams_default_message_type() {
"language" : "", "language" : "",
"arguments" : null, "arguments" : null,
"message_text" : { "und" : [ "message_text" : { "und" : [
{ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
"value" : "[message:user:picture:35x35]",
"format" : "filtered_html",
"safe_value" : "[message:user:picture:35x35]"
},
{ {
"value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E commented on \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title_field]\\u003C\\/a\\u003E", "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E commented on \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title_field]\\u003C\\/a\\u003E",
"format" : "full_html", "format" : "full_html",
@ -70,11 +66,7 @@ function commons_activity_streams_default_message_type() {
"language" : "", "language" : "",
"arguments" : null, "arguments" : null,
"message_text" : { "und" : [ "message_text" : { "und" : [
{ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
"value" : "[message:user:picture:35x35]",
"format" : "filtered_html",
"safe_value" : "[message:user:picture:35x35]"
},
{ {
"value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E created \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title_field]\\u003C\\/a\\u003E", "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E created \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title_field]\\u003C\\/a\\u003E",
"format" : "full_html", "format" : "full_html",
@ -102,11 +94,7 @@ function commons_activity_streams_default_message_type() {
"language" : "", "language" : "",
"arguments" : null, "arguments" : null,
"message_text" : { "und" : [ "message_text" : { "und" : [
{ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
"value" : "[message:user:picture:35x35]",
"format" : "filtered_html",
"safe_value" : "[message:user:picture:35x35]"
},
{ {
"value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E has an updated profile", "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E has an updated profile",
"format" : "full_html", "format" : "full_html",

12
modules/commons/commons_activity_streams/commons_activity_streams.info
View File

@ -1,6 +1,8 @@
name = Commons Activity Streams name = Commons Activity Streams
core = 7.x description = Displays a listing of site-wide and user-specific site activity.
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_follow dependencies[] = commons_follow
dependencies[] = ctools dependencies[] = ctools
dependencies[] = entity dependencies[] = entity
@ -13,6 +15,7 @@ dependencies[] = token
dependencies[] = views dependencies[] = views
dependencies[] = views_content dependencies[] = views_content
dependencies[] = views_load_more dependencies[] = views_load_more
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -30,6 +33,7 @@ features[variable][] = timeago_comment
features[variable][] = timeago_node features[variable][] = timeago_node
features[views_view][] = commons_activity_streams_activity features[views_view][] = commons_activity_streams_activity
features[views_view][] = commons_activity_streams_user_activity features[views_view][] = commons_activity_streams_user_activity
features_exclude[field][message-commons_activity_streams_comment_created-field_target_comments] = message-commons_activity_streams_comment_created-field_target_comments features_exclude[field][message-commons_activity_streams_comment_created-field_target_comments] = message-commons_activity_streams_comment_created-field_target_comments
features_exclude[field][message-commons_activity_streams_comment_created-field_target_nodes] = message-commons_activity_streams_comment_created-field_target_nodes features_exclude[field][message-commons_activity_streams_comment_created-field_target_nodes] = message-commons_activity_streams_comment_created-field_target_nodes
features_exclude[field][message-commons_activity_streams_node_created-field_target_nodes] = message-commons_activity_streams_node_created-field_target_nodes features_exclude[field][message-commons_activity_streams_node_created-field_target_nodes] = message-commons_activity_streams_node_created-field_target_nodes
@ -38,9 +42,9 @@ features_exclude[field_base][field_target_nodes] = field_target_nodes
features_exclude[field_base][field_target_comments] = field_target_comments features_exclude[field_base][field_target_comments] = field_target_comments
features_exclude[views_view][commons_bw_all] = commons_bw_all features_exclude[views_view][commons_bw_all] = commons_bw_all
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

11
modules/commons/commons_activity_streams/commons_activity_streams.install
View File

@ -63,3 +63,14 @@ function commons_activity_streams_update_3106() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Accommodate changes to message definitions.
*/
function commons_activity_streams_update_3107() {
$revert = array(
'commons_activity_streams' => array('message_type'),
);
features_revert($revert);
return array();
}

40
modules/commons/commons_activity_streams/commons_activity_streams.module
View File

@ -218,14 +218,18 @@ function commons_activity_streams_user_profile_submit($form, &$form_state) {
* Implements hook_token_info(). * Implements hook_token_info().
*/ */
function commons_activity_streams_token_info() { function commons_activity_streams_token_info() {
$styles = image_styles();
$tokens = array(); $tokens = array();
$styles = image_styles();
// Create a token to retrieve the user picture formatted using any of the
// currently defined image styles.
foreach ($styles as $style_name => $style) { foreach ($styles as $style_name => $style) {
$tokens['picture:' . $style_name] = array( $tokens['picture:' . $style_name] = array(
'name' => t('Picture: @st image style', array('@st' => $style_name)), 'name' => t('Picture: @st image style', array('@st' => $style_name)),
'description' => t('Picture: @st image style', array('@st' => $style_name)), 'description' => t('Picture: @st image style', array('@st' => $style_name)),
); );
} }
return array( return array(
'tokens' => array( 'tokens' => array(
'user' => $tokens, 'user' => $tokens,
@ -238,42 +242,44 @@ function commons_activity_streams_token_info() {
*/ */
function commons_activity_streams_tokens($type, $tokens, array $data = array(), array $options = array()) { function commons_activity_streams_tokens($type, $tokens, array $data = array(), array $options = array()) {
$replacements = array(); $replacements = array();
if ($type == 'user' && isset($data['user'])) { if ($type == 'user' && isset($data['user'])) {
$user = $data['user']; $account = $data['user'];
$user_wrapper = entity_metadata_wrapper('user', $user);
$alt = $user->name; // Generate suitable alternative text using the user's username.
if (isset($user->field_name_first)) { $username = format_username($account);
$alt = $user_wrapper->field_name_first->value(); $alt = t("@name's picture", array('@name' => $username));
if (isset($user->field_name_last)) {
$alt .= " " . $user_wrapper->field_name_last->value();
}
}
$alt = t("@name's picture", array('@name' => $alt));
foreach ($tokens as $token => $original) { foreach ($tokens as $token => $original) {
if (strpos($token, 'picture:') !== FALSE) { if (strpos($token, 'picture:') !== FALSE) {
list( , $style) = explode(':', $token); list( , $style) = explode(':', $token);
$path = variable_get('user_picture_default', '/profiles/commons/images/avatars/user-avatar.png');
if (!empty($user->picture)) { // Prefer unique account pictures but fall back to the default user
$path = image_style_url($style, $user->picture->uri); // picture if necessary.
} $path = $account->picture ? $account->picture->uri : variable_get('user_picture_default', '/profiles/commons/images/avatars/user-avatar.png');
$image_variables = array( $image_variables = array(
'path' => $path, 'path' => image_style_url($style, $path),
'alt' => $alt, 'alt' => $alt,
'title' => $alt, 'title' => $alt,
'class' => array('image-style-none'), 'class' => array('image-style-none'),
); );
$image = theme('image', $image_variables); $image = theme('image', $image_variables);
$user_path = user_uri($user); $user_path = user_uri($account);
$link_options = array( $link_options = array(
'attributes' => array( 'attributes' => array(
'title' => t('View user profile.'), 'title' => t('View user profile.'),
), ),
'html' => TRUE, 'html' => TRUE,
); );
$replacements[$original] = "<div class='user-picture'>" . l($image, $user_path['path'], $link_options) . "</div>"; $replacements[$original] = "<div class='user-picture'>" . l($image, $user_path['path'], $link_options) . "</div>";
} }
} }
} }
return $replacements; return $replacements;
} }

12
modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.info
View File

@ -1,18 +1,20 @@
name = Commons Activity Streams Groups name = Commons Activity Streams Groups
description = Contains Organic Groups integration for Commons Activity Streams description = Integrates site activity with Organic Groups.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_activity_streams dependencies[] = commons_activity_streams
dependencies[] = entity dependencies[] = entity
dependencies[] = views dependencies[] = views
dependencies[] = views_content dependencies[] = views_content
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
features[views_view][] = activity_group features[views_view][] = activity_group
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

8
modules/commons/commons_body/commons_body.features.field_base.inc
View File

@ -19,14 +19,6 @@ function commons_body_field_default_field_bases() {
0 => 'node', 0 => 'node',
), ),
'field_name' => 'body', 'field_name' => 'body',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',

12
modules/commons/commons_body/commons_body.info
View File

@ -1,16 +1,18 @@
name = Commons Body Field name = Commons Body Field
description = Provides a simple body field for re-use by various Commons content types description = Provides a simple body field for re-use by various Commons content types.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = features dependencies[] = features
dependencies[] = field_sql_storage dependencies[] = field_sql_storage
dependencies[] = text dependencies[] = text
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = body features[field_base][] = body
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

8
modules/commons/commons_bw/commons_bw.features.field_base.inc
View File

@ -17,14 +17,6 @@ function commons_bw_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'title_field', 'field_name' => 'title_field',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',

6
modules/commons/commons_bw/commons_bw.features.field_instance.inc
View File

@ -38,13 +38,13 @@ function commons_bw_field_definition(&$field_instances, $bundle) {
'label' => 'above', 'label' => 'above',
'settings' => array(), 'settings' => array(),
'type' => 'hidden', 'type' => 'hidden',
'weight' => 12, 'weight' => -50,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'above', 'label' => 'above',
'settings' => array(), 'settings' => array(),
'type' => 'hidden', 'type' => 'hidden',
'weight' => 0, 'weight' => -50,
), ),
), ),
'display_in_partial_form' => !empty($display_in_partial_form[$bundle]), 'display_in_partial_form' => !empty($display_in_partial_form[$bundle]),
@ -67,7 +67,7 @@ function commons_bw_field_definition(&$field_instances, $bundle) {
'size' => '60', 'size' => '60',
), ),
'type' => 'text_textfield', 'type' => 'text_textfield',
'weight' => -5, 'weight' => -50,
), ),
); );
} }

17
modules/commons/commons_bw/commons_bw.info
View File

@ -1,20 +1,23 @@
name = Commons Tabbed Browsing Widget name = Commons Browsing Widget
core = 7.x description = Provides a single content area with multiple panels for adding and browsing content by content type.
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_groups dependencies[] = commons_groups
dependencies[] = features dependencies[] = features
dependencies[] = og dependencies[] = og
dependencies[] = quicktabs dependencies[] = quicktabs
dependencies[] = quicktabs_tabstyles dependencies[] = quicktabs_tabstyles
dependencies[] = title dependencies[] = title
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = title_field features[field_base][] = title_field
files[] = includes/views/handlers/commons_bw_handler_node_partial_form.inc
; Views handlers
; Information added by Drupal.org packaging script on 2014-06-25 files[] = includes/views/handlers/commons_bw_handler_node_partial_form.inc
version = "7.x-3.15"
; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

11
modules/commons/commons_bw/commons_bw.install
View File

@ -32,3 +32,14 @@ function commons_bw_update_7302() {
drupal_flush_all_caches(); drupal_flush_all_caches();
} }
/**
* Standardize browsing widget field weights.
*/
function commons_bw_update_7303() {
$revert = array(
'commons_bw' => array('field_instance'),
);
features_revert($revert);
return array();
}

44
modules/commons/commons_bw/commons_bw.module
View File

@ -28,14 +28,48 @@ function commons_bw_system_info_alter(&$info, $file, $type) {
// so that Features is aware of the instance and can successfully revert the // so that Features is aware of the instance and can successfully revert the
// field_instance component back to its default state. // field_instance component back to its default state.
if ($file->name == 'commons_bw') { if ($file->name == 'commons_bw') {
foreach (node_type_get_types() as $node_type) { foreach (node_type_get_types() as $node_type_object) {
$type = $node_type->type; $node_type = $node_type_object->type;
if (commons_bw_node_auto_title_instance($type)) { if (commons_bw_node_auto_title_instance($node_type)) {
$info['features']['field_instance'][] = "node-$type-title_field"; $info['features']['field_instance'][] = "node-$node_type-title_field";
} }
} }
} }
// Dynamically adding a field to a content type results in features
// automatically detecting Commons BW as a dependency.
// We manually exclude the dependency in order to prevent the content type
// modules from appearing overridden and to allow them to be used
// independently of Commons BW.
$node_types = &drupal_static(__FUNCTION__);
if (!isset($node_types)) {
foreach (module_implements('node_info') as $module) {
$node_types[$module] = call_user_func($module . '_node_info');
}
}
if (isset($node_types[$file->name])) {
foreach ($node_types[$file->name] as $node_type => $node_info) {
if (commons_bw_node_auto_title_instance($node_type)) {
$info['features_exclude']['dependencies']['commons_bw'] = 'commons_bw';
}
}
}
}
/**
* Implements hook_modules_enabled().
*/
function commons_bw_modules_enabled($modules) {
// Ensure that dynamically added title_field fields are in the default state
// when modules that provide content types are enabled.
foreach ($modules as $module) {
if (module_hook($module, 'node_info')) {
features_revert(array('commons_bw' => array('field_instance')));
}
}
} }
/** /**
@ -169,7 +203,7 @@ function commons_bw_partial_node_form($form, &$form_state, $bundle, $group_id =
// Add a default form title. // Add a default form title.
$form['title'] = array( $form['title'] = array(
'#markup' => t('Create content'), '#markup' => t('Create content'),
'#weight' => -50, '#weight' => -100,
); );
// Display the user's picture. // Display the user's picture.

15
modules/commons/commons_content_moderation/commons_content_moderation.info
View File

@ -1,12 +1,14 @@
name = Commons Content moderation name = Commons Content Moderation
description = Commons Content moderation description = Provides a content moderator role which allows privileged users to moderate content and users.
package = Commons - Building blocks
core = 7.x core = 7.x
package = Commons - Building Blocks
dependencies[] = ctools dependencies[] = ctools
dependencies[] = flag dependencies[] = flag
dependencies[] = flag_abuse dependencies[] = flag_abuse
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = views dependencies[] = views
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -16,11 +18,12 @@ features[user_role][] = content moderator
features[variable][] = flag_abuse_flags features[variable][] = flag_abuse_flags
features[views_view][] = commons_content_moderation_reported_comments features[views_view][] = commons_content_moderation_reported_comments
features[views_view][] = commons_content_moderation_reported_nodes features[views_view][] = commons_content_moderation_reported_nodes
features_exclude[dependencies][features] = features features_exclude[dependencies][features] = features
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

20
modules/commons/commons_documents/commons_documents.commons.inc
View File

@ -12,6 +12,8 @@ function commons_documents_commons_entity_integration() {
'node' => array( 'node' => array(
'document' => array( 'document' => array(
'is_group_content' => TRUE, 'is_group_content' => TRUE,
'exclude_rate' => TRUE,
'exclude_rate_comments' => TRUE,
), ),
), ),
); );
@ -32,3 +34,21 @@ function commons_documents_commons_bw_group_widget() {
), ),
); );
} }
/**
* Implements hook_commons_bw_create_all_widget().
*/
function commons_documents_commons_bw_create_all_widget($group) {
if (og_user_access('node', $group->nid, 'create document content')) {
$link = l(t('Create a document'),'node/add/document',
array('attributes' => array('class' => 'commons-documents-create'), 'query' => array('og_group_ref' => $group->nid))
);
return array(
'commons_documents' => array(
'link' => $link,
'text' => t('Share a document'),
'#weight' => 6,
),
);
}
}

8
modules/commons/commons_documents/commons_documents.features.field_base.inc
View File

@ -17,14 +17,6 @@ function commons_documents_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_document_file', 'field_name' => 'field_document_file',
'foreign keys' => array(
'fid' => array(
'columns' => array(
'fid' => 'fid',
),
'table' => 'file_managed',
),
),
'indexes' => array( 'indexes' => array(
'fid' => array( 'fid' => array(
0 => 'fid', 0 => 'fid',

12
modules/commons/commons_documents/commons_documents.features.field_instance.inc
View File

@ -22,7 +22,7 @@ function commons_documents_field_default_field_instances() {
'module' => 'text', 'module' => 'text',
'settings' => array(), 'settings' => array(),
'type' => 'text_default', 'type' => 'text_default',
'weight' => 2, 'weight' => -49,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -31,7 +31,7 @@ function commons_documents_field_default_field_instances() {
'trim_length' => 600, 'trim_length' => 600,
), ),
'type' => 'text_summary_or_trimmed', 'type' => 'text_summary_or_trimmed',
'weight' => 1, 'weight' => -49,
), ),
), ),
'display_in_partial_form' => 1, 'display_in_partial_form' => 1,
@ -51,7 +51,7 @@ function commons_documents_field_default_field_instances() {
'summary_rows' => 5, 'summary_rows' => 5,
), ),
'type' => 'text_textarea_with_summary', 'type' => 'text_textarea_with_summary',
'weight' => 1, 'weight' => -49,
), ),
); );
@ -66,13 +66,13 @@ function commons_documents_field_default_field_instances() {
'module' => 'file', 'module' => 'file',
'settings' => array(), 'settings' => array(),
'type' => 'file_default', 'type' => 'file_default',
'weight' => 4, 'weight' => -48,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'above', 'label' => 'above',
'settings' => array(), 'settings' => array(),
'type' => 'hidden', 'type' => 'hidden',
'weight' => 0, 'weight' => -48,
), ),
), ),
'display_in_partial_form' => 1, 'display_in_partial_form' => 1,
@ -94,7 +94,7 @@ function commons_documents_field_default_field_instances() {
'progress_indicator' => 'throbber', 'progress_indicator' => 'throbber',
), ),
'type' => 'file_generic', 'type' => 'file_generic',
'weight' => 2, 'weight' => -48,
), ),
); );

18
modules/commons/commons_documents/commons_documents.info
View File

@ -1,18 +1,24 @@
name = Commons Documents name = Commons Documents
core = 7.x description = Provides a Document content type for sharing files.
package = Commons - Content types package = Commons - Content types
core = 7.x
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = commons_groups
dependencies[] = commons_topics dependencies[] = commons_topics
dependencies[] = ctools dependencies[] = ctools
dependencies[] = entity
dependencies[] = entityreference dependencies[] = entityreference
dependencies[] = features dependencies[] = features
dependencies[] = file dependencies[] = file
dependencies[] = node
dependencies[] = og dependencies[] = og
dependencies[] = og_ui dependencies[] = og_ui
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = taxonomy
dependencies[] = text
dependencies[] = views dependencies[] = views
dependencies[] = views_litepager dependencies[] = views_litepager
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -45,9 +51,11 @@ features[variable][] = node_preview_document
features[variable][] = node_submitted_document features[variable][] = node_submitted_document
features[views_view][] = commons_bw_documents features[views_view][] = commons_bw_documents
; Information added by Drupal.org packaging script on 2014-06-25 features_exclude[dependencies][commons_trusted_contacts] = commons_trusted_contacts
version = "7.x-3.15"
; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

20
modules/commons/commons_documents/commons_documents.install
View File

@ -1,14 +1,17 @@
<?php <?php
/** /**
* Set default document roles upon enable * Set default polls roles upon enable
*/ */
function commons_documents_enable() { function commons_documents_enable() {
features_revert(array('commons_documents' => array('og_features_permission', 'field_instance', 'field_base', 'variable', 'views_view', 'node'))); $revert = array(
'commons_documents' => array('og_features_permission'),
);
features_revert($revert);
$groups = og_get_all_group(); $groups = og_get_all_group();
foreach ($groups as $gid) { foreach ($groups AS $gid) {
commons_groups_features_permission_rebuild('commons_documents', $gid); commons_groups_features_permission_rebuild('commons_documents', $gid);
} }
} }
@ -128,3 +131,14 @@ function commons_documents_update_7009() {
return array(); return array();
} }
/**
* Standardize browsing widget field weights.
*/
function commons_documents_update_7010() {
$revert = array(
'commons_documents' => array('field_instance'),
);
features_revert($revert);
return array();
}

36
modules/commons/commons_events/commons_events.features.field_base.inc
View File

@ -17,7 +17,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_date', 'field_name' => 'field_date',
'foreign keys' => array(),
'indexes' => array(), 'indexes' => array(),
'locked' => 0, 'locked' => 0,
'module' => 'date', 'module' => 'date',
@ -47,7 +46,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_location', 'field_name' => 'field_location',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',
@ -74,14 +72,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_logo', 'field_name' => 'field_logo',
'foreign keys' => array(
'fid' => array(
'columns' => array(
'fid' => 'fid',
),
'table' => 'file_managed',
),
),
'indexes' => array( 'indexes' => array(
'fid' => array( 'fid' => array(
0 => 'fid', 0 => 'fid',
@ -104,7 +94,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_number_of_attendees', 'field_name' => 'field_number_of_attendees',
'foreign keys' => array(),
'indexes' => array(), 'indexes' => array(),
'locked' => 0, 'locked' => 0,
'module' => 'number', 'module' => 'number',
@ -120,14 +109,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_offsite_url', 'field_name' => 'field_offsite_url',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',
@ -149,14 +130,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_organizers', 'field_name' => 'field_organizers',
'foreign keys' => array(
'users' => array(
'columns' => array(
'target_id' => 'uid',
),
'table' => 'users',
),
),
'indexes' => array( 'indexes' => array(
'target_id' => array( 'target_id' => array(
0 => 'target_id', 0 => 'target_id',
@ -190,14 +163,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_registration', 'field_name' => 'field_registration',
'foreign keys' => array(
'registration_type' => array(
'columns' => array(
'registration_type' => 'name',
),
'table' => 'registration_type',
),
),
'indexes' => array( 'indexes' => array(
'registration_type' => array( 'registration_type' => array(
0 => 'registration_type', 0 => 'registration_type',
@ -217,7 +182,6 @@ function commons_events_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_registration_type', 'field_name' => 'field_registration_type',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',

6
modules/commons/commons_events/commons_events.features.field_instance.inc
View File

@ -28,7 +28,7 @@ function commons_events_field_default_field_instances() {
'module' => 'text', 'module' => 'text',
'settings' => array(), 'settings' => array(),
'type' => 'text_default', 'type' => 'text_default',
'weight' => 5, 'weight' => -49,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -37,7 +37,7 @@ function commons_events_field_default_field_instances() {
'trim_length' => 600, 'trim_length' => 600,
), ),
'type' => 'text_summary_or_trimmed', 'type' => 'text_summary_or_trimmed',
'weight' => 3, 'weight' => -49,
), ),
), ),
'entity_type' => 'node', 'entity_type' => 'node',
@ -57,7 +57,7 @@ function commons_events_field_default_field_instances() {
'summary_rows' => 5, 'summary_rows' => 5,
), ),
'type' => 'text_textarea_with_summary', 'type' => 'text_textarea_with_summary',
'weight' => 1, 'weight' => -49,
), ),
); );

37
modules/commons/commons_events/commons_events.features.menu_links.inc
View File

@ -1,37 +0,0 @@
<?php
/**
* @file
* commons_events.features.menu_links.inc
*/
/**
* Implements hook_menu_default_menu_links().
*/
function commons_events_menu_default_menu_links() {
$menu_links = array();
// Exported menu link: main-menu:events
$menu_links['main-menu:events'] = array(
'menu_name' => 'main-menu',
'link_path' => 'events',
'router_path' => 'events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
'identifier' => 'main-menu:events',
),
'module' => 'menu',
'hidden' => 0,
'external' => 0,
'has_children' => 0,
'expanded' => 0,
'weight' => 2,
'customized' => 1,
);
// Translatables
// Included for use with string extractors like potx.
t('Events');
return $menu_links;
}

37
modules/commons/commons_events/commons_events.info
View File

@ -1,15 +1,16 @@
name = Commons Events name = Commons Events
description = Provides the Event features for Drupal Commons. description = Provides an Event content type for hosting events.
core = 7.x
package = Commons - Content types package = Commons - Content types
core = 7.x
dependencies[] = addressfield dependencies[] = addressfield
dependencies[] = addressfield_tokens dependencies[] = addressfield_tokens
dependencies[] = block dependencies[] = block
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = commons_follow_node
dependencies[] = commons_groups
dependencies[] = commons_notify
dependencies[] = commons_location dependencies[] = commons_location
; @todo Move message- field instances into another module in order to allow
; Commons Events to function independently of Commons Notify.
dependencies[] = commons_notify
dependencies[] = commons_topics dependencies[] = commons_topics
dependencies[] = ctools dependencies[] = ctools
dependencies[] = date dependencies[] = date
@ -22,7 +23,7 @@ dependencies[] = features
dependencies[] = field_sql_storage dependencies[] = field_sql_storage
dependencies[] = image dependencies[] = image
dependencies[] = list dependencies[] = list
dependencies[] = menu dependencies[] = message
dependencies[] = node dependencies[] = node
dependencies[] = number dependencies[] = number
dependencies[] = og dependencies[] = og
@ -37,6 +38,7 @@ dependencies[] = text
dependencies[] = views dependencies[] = views
dependencies[] = views_content dependencies[] = views_content
dependencies[] = views_load_more dependencies[] = views_load_more
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -60,8 +62,8 @@ features[field_instance][] = node-event-field_registration
features[field_instance][] = node-event-field_registration_type features[field_instance][] = node-event-field_registration_type
features[field_instance][] = message-commons_events_event_node_created-field_message_rendered_body features[field_instance][] = message-commons_events_event_node_created-field_message_rendered_body
features[field_instance][] = message-commons_events_event_node_created-field_message_rendered_subject features[field_instance][] = message-commons_events_event_node_created-field_message_rendered_subject
features[field_instance][] = message-commons_events_event_node_created-field_target_comments
features[field_instance][] = message-commons_events_event_node_created-field_target_nodes features[field_instance][] = message-commons_events_event_node_created-field_target_nodes
features[menu_links][] = main-menu:events
features[message_type][] = commons_events_event_node_created features[message_type][] = commons_events_event_node_created
features[node][] = event features[node][] = event
features[og_features_permission][] = node:group:create event content features[og_features_permission][] = node:group:create event content
@ -70,7 +72,6 @@ features[og_features_permission][] = node:group:delete own event content
features[og_features_permission][] = node:group:update any event content features[og_features_permission][] = node:group:update any event content
features[og_features_permission][] = node:group:update own event content features[og_features_permission][] = node:group:update own event content
features[registration_type][] = event features[registration_type][] = event
features[schemaorg][] = node-event
features[user_permission][] = create event content features[user_permission][] = create event content
features[user_permission][] = create event registration features[user_permission][] = create event registration
features[user_permission][] = delete own event content features[user_permission][] = delete own event content
@ -86,6 +87,7 @@ features[variable][] = comment_event
features[variable][] = comment_form_location_event features[variable][] = comment_form_location_event
features[variable][] = comment_preview_event features[variable][] = comment_preview_event
features[variable][] = comment_subject_field_event features[variable][] = comment_subject_field_event
features[variable][] = field_bundle_settings_message__commons_events_event_node_created
features[variable][] = field_bundle_settings_node__event features[variable][] = field_bundle_settings_node__event
features[variable][] = menu_options_event features[variable][] = menu_options_event
features[variable][] = menu_parent_event features[variable][] = menu_parent_event
@ -96,16 +98,17 @@ features[views_view][] = commons_events_event_attendee_list
features[views_view][] = commons_events_organizers features[views_view][] = commons_events_organizers
features[views_view][] = commons_events_upcoming features[views_view][] = commons_events_upcoming
features[views_view][] = commons_events_user_upcoming_events features[views_view][] = commons_events_user_upcoming_events
files[] = commons_events.features.inc
files[] = commons_events.features.field_base.inc
files[] = commons_events.features.field_instance.inc
files[] = commons_events.strongarm.inc
files[] = includes/commons_events.forms.inc
files[] = includes/commons_events.theme.inc
; Information added by Drupal.org packaging script on 2014-06-25 ; Manually remove the Commons Follow module as a dependency until
version = "7.x-3.15" ; https://www.drupal.org/node/766264 is fixed. Commons Follow dynamically adds a
; views pane for events the user follows which causes Commons Events to appear
; overridden.
features_exclude[dependencies][commons_follow] = commons_follow
features_exclude[dependencies][commons_trusted_contacts] = commons_trusted_contacts
; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

34
modules/commons/commons_events/commons_events.install
View File

@ -272,3 +272,37 @@ function commons_events_update_7014() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Ensure that the target comments field instance used for custom event messages
* is detected and fix Commons Events appearing overridden.
*/
function commons_events_update_7015() {
$revert = array(
'commons_events' => array('field_instance'),
);
features_revert($revert);
return array();
}
/**
* Move event menu item handling from menu links to page manager pages.
*/
function commons_events_update_7016() {
$revert = array(
'commons_events' => array('page_manager_pages'),
);
features_revert($revert);
return array();
}
/**
* Standardize browsing widget field weights.
*/
function commons_events_update_7017() {
$revert = array(
'commons_events' => array('field_instance'),
);
features_revert($revert);
return array();
}

24
modules/commons/commons_events/commons_events.module
View File

@ -51,7 +51,7 @@ function commons_events_menu_alter(&$items) {
* Access callback for showing the Attendees tab. * Access callback for showing the Attendees tab.
*/ */
function commons_events_attendee_access($event_node) { function commons_events_attendee_access($event_node) {
if ($event_node->type == 'event') { if ($event_node->type == 'event' && user_access('view event registration')) {
return TRUE; return TRUE;
} }
@ -229,12 +229,18 @@ function commons_events_entity_view_alter(&$build, $type) {
} }
/** /**
* Implements hook_form_FORM_ID_alter(). * Implements hook_form_BASE_FORM_ID_alter().
*/ */
function commons_events_form_node_form_alter(&$form, &$form_state, $form_id) { function commons_events_form_node_form_alter(&$form, &$form_state, $form_id) {
$node = $form_state['node']; $node = $form_state['node'];
if ($node->type == 'event') { list(, , $bundle) = entity_extract_ids('node', $node);
if ($bundle == 'event' && empty($node->nid)) {
drupal_set_title(t('Create an event'));
}
if ($bundle == 'event') {
// Attach custom CSS and JS to the form. // Attach custom CSS and JS to the form.
$form['#attached']['css'][] = drupal_get_path('module', 'commons_events') . '/css/commons_events.css'; $form['#attached']['css'][] = drupal_get_path('module', 'commons_events') . '/css/commons_events.css';
$form['#attached']['js'][] = drupal_get_path('module', 'commons_events') . '/js/commons_events.js'; $form['#attached']['js'][] = drupal_get_path('module', 'commons_events') . '/js/commons_events.js';
@ -319,11 +325,11 @@ function commons_events_form_node_form_alter(&$form, &$form_state, $form_id) {
$form['event_registration_settings']['field_registration'] = $form['field_registration']; $form['event_registration_settings']['field_registration'] = $form['field_registration'];
// Unset all of the original registration settings. // Unset all of the original registration settings.
unset($form['field_organizers']); hide($form['field_organizers']);
unset($form['field_registration_type']); hide($form['field_registration_type']);
unset($form['field_status']); hide($form['field_status']);
unset($form['field_number_of_attendees']); hide($form['field_number_of_attendees']);
unset($form['field_registration']); hide($form['field_registration']);
// Add additional submission and validation handlers. // Add additional submission and validation handlers.
$form['#validate'][] = 'commons_events_node_form_validate'; $form['#validate'][] = 'commons_events_node_form_validate';
@ -623,7 +629,7 @@ function theme_commons_events_date_display_range_advanced($variables) {
} }
/** /**
* Implements commons_notify_message_selection_alter(). * Implements hook_commons_notify_message_selection_alter().
*/ */
function commons_events_commons_notify_message_selection_alter(&$message_type, $hook, $node) { function commons_events_commons_notify_message_selection_alter(&$message_type, $hook, $node) {
// Provide a special message type that describes the event details // Provide a special message type that describes the event details

34
modules/commons/commons_events/commons_events.strongarm.inc
View File

@ -59,6 +59,40 @@ function commons_events_strongarm() {
$strongarm->value = 1; $strongarm->value = 1;
$export['comment_subject_field_event'] = $strongarm; $export['comment_subject_field_event'] = $strongarm;
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'field_bundle_settings_message__commons_events_event_node_created';
$strongarm->value = array(
'view_modes' => array(),
'extra_fields' => array(
'form' => array(),
'display' => array(
'message__message_text__0' => array(
'message_notify_email_subject' => array(
'visible' => TRUE,
'weight' => 0,
),
'message_notify_email_body' => array(
'visible' => FALSE,
'weight' => 0,
),
),
'message__message_text__1' => array(
'message_notify_email_subject' => array(
'visible' => FALSE,
'weight' => 0,
),
'message_notify_email_body' => array(
'visible' => TRUE,
'weight' => 0,
),
),
),
),
);
$export['field_bundle_settings_message__commons_events_event_node_created'] = $strongarm;
$strongarm = new stdClass(); $strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1; $strongarm->api_version = 1;

62
modules/commons/commons_events/commons_events.views_default.inc
View File

@ -701,68 +701,6 @@ function commons_events_views_default_views() {
$handler->display->display_options['arguments']['uid']['summary']['number_of_records'] = '0'; $handler->display->display_options['arguments']['uid']['summary']['number_of_records'] = '0';
$handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary'; $handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['uid']['summary_options']['items_per_page'] = '25'; $handler->display->display_options['arguments']['uid']['summary_options']['items_per_page'] = '25';
/* Display: You follow - pane */
$handler = $view->new_display('panel_pane', 'You follow - pane', 'panel_pane_3');
$handler->display->display_options['defaults']['title'] = FALSE;
$handler->display->display_options['title'] = 'You follow';
$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'default';
$handler->display->display_options['defaults']['style_options'] = FALSE;
$handler->display->display_options['defaults']['row_plugin'] = FALSE;
$handler->display->display_options['row_plugin'] = 'fields';
$handler->display->display_options['row_options']['inline'] = array(
'capacity_used' => 'capacity_used',
'comment_count' => 'comment_count',
);
$handler->display->display_options['defaults']['row_options'] = FALSE;
$handler->display->display_options['defaults']['empty'] = FALSE;
$handler->display->display_options['defaults']['relationships'] = FALSE;
/* Relationship: Flags: commons_follow_node */
$handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
$handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
$handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
$handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'commons_follow_node';
$handler->display->display_options['defaults']['fields'] = FALSE;
/* Field: Content: Title */
$handler->display->display_options['fields']['title_field']['id'] = 'title_field';
$handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
$handler->display->display_options['fields']['title_field']['field'] = 'title_field';
$handler->display->display_options['fields']['title_field']['label'] = '';
$handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
/* Field: Content: Address */
$handler->display->display_options['fields']['field_address']['id'] = 'field_address';
$handler->display->display_options['fields']['field_address']['table'] = 'field_data_field_address';
$handler->display->display_options['fields']['field_address']['field'] = 'field_address';
$handler->display->display_options['fields']['field_address']['label'] = '';
$handler->display->display_options['fields']['field_address']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_address']['click_sort_column'] = 'country';
$handler->display->display_options['fields']['field_address']['settings'] = array(
'use_widget_handlers' => 1,
'format_handlers' => array(
'address' => 'address',
),
);
/* Field: Registration Settings: Spaces used */
$handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used';
$handler->display->display_options['fields']['capacity_used']['table'] = 'node';
$handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used';
$handler->display->display_options['fields']['capacity_used']['label'] = '';
$handler->display->display_options['fields']['capacity_used']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['capacity_used']['alter']['text'] = '<strong>[capacity_used]</strong> attendees,';
$handler->display->display_options['fields']['capacity_used']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['capacity_used']['separator'] = '';
/* Field: Content: Comment count */
$handler->display->display_options['fields']['comment_count']['id'] = 'comment_count';
$handler->display->display_options['fields']['comment_count']['table'] = 'node_comment_statistics';
$handler->display->display_options['fields']['comment_count']['field'] = 'comment_count';
$handler->display->display_options['fields']['comment_count']['label'] = '';
$handler->display->display_options['fields']['comment_count']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['comment_count']['alter']['text'] = '<strong>[comment_count]</strong> comments';
$handler->display->display_options['fields']['comment_count']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['comment_count']['separator'] = '';
$handler->display->display_options['defaults']['arguments'] = FALSE;
$translatables['commons_events_user_upcoming_events'] = array( $translatables['commons_events_user_upcoming_events'] = array(
t('Master'), t('Master'),
t('more'), t('more'),

7
modules/commons/commons_events/includes/commons_events.forms.inc
View File

@ -30,7 +30,7 @@ function commons_events_attend_event_form($form, &$form_state, $event_node, $reg
$form['count'] = array( $form['count'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#default_value' => '0', '#default_value' => '0',
'#description' => ' + Guests', '#description' => t('+ Guests'),
'#size' => 2, '#size' => 2,
'#maxlength' => 2, '#maxlength' => 2,
'#required' => false, '#required' => false,
@ -94,8 +94,13 @@ function commons_events_attend_event_form_submit($form, $form_state) {
$registration->count = $form_state['values']['count']; $registration->count = $form_state['values']['count'];
if (registration_save($registration)) { if (registration_save($registration)) {
drupal_set_message(t('Your registration was saved.')); drupal_set_message(t('Your registration was saved.'));
// Have the user automatically follow the event if Commons Follow (Node) is
// enabled.
if (module_exists('commons_follow_node')) {
commons_follow_node_follow_node($registration->entity_id, 'event', $user->uid); commons_follow_node_follow_node($registration->entity_id, 'event', $user->uid);
} }
}
else { else {
drupal_set_message(t('There was an error saving your registration.')); drupal_set_message(t('There was an error saving your registration.'));
} }

12
modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.info
View File

@ -1,10 +1,12 @@
name = Commons Events Pages name = Commons Events Pages
description = Provides the panelized Event page feature. description = Enhances the appearance of event nodes by listing the event organizers/attendees and allows them to be customized.
core = 7.x core = 7.x
package = Commons - Landing pages package = Commons - Landing pages
dependencies[] = commons_events dependencies[] = commons_events
dependencies[] = panelizer dependencies[] = panelizer
dependencies[] = strongarm dependencies[] = strongarm
features[ctools][] = panelizer:panelizer:1 features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = page_manager:pages_default:1 features[ctools][] = page_manager:pages_default:1
@ -12,12 +14,10 @@ features[features_api][] = api:2
features[page_manager_pages][] = views_events_landing_page features[page_manager_pages][] = views_events_landing_page
features[panelizer_defaults][] = node:event:default features[panelizer_defaults][] = node:event:default
features[variable][] = panelizer_defaults_node_event features[variable][] = panelizer_defaults_node_event
files[] = commons_events_pages.features.inc
files[] = commons_events_pages.strongarm.inc
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

17
modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.pages_default.inc
View File

@ -1,13 +1,13 @@
<?php <?php
/** /**
* @file * @file
* commons_events_pages.pages_default.inc * commons_events.pages_default.inc
*/ */
/** /**
* Implements hook_default_page_manager_pages(). * Implements hook_default_page_manager_pages().
*/ */
function commons_events_pages_default_page_manager_pages() { function commons_events_default_page_manager_pages() {
$page = new stdClass(); $page = new stdClass();
$page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */ $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
$page->api_version = 1; $page->api_version = 1;
@ -20,7 +20,18 @@ function commons_events_pages_default_page_manager_pages() {
'type' => 'none', 'type' => 'none',
'settings' => NULL, 'settings' => NULL,
); );
$page->menu = array(); $page->menu = array(
'type' => 'normal',
'title' => 'Events',
'weight' => '2',
'name' => 'main-menu',
'parent' => array(
'type' => 'none',
'title' => '',
'weight' => 0,
'name' => 'navigation',
),
);
$page->arguments = array(); $page->arguments = array();
$page->conf = array( $page->conf = array(
'admin_paths' => FALSE, 'admin_paths' => FALSE,

14
modules/commons/commons_events/modules/commons_events_solr/commons_events_solr.info
View File

@ -1,7 +1,8 @@
name = Commons Events - Solr name = Commons Search SOLR Event
description = Provides the Solr based faceted search for events description = Adds support for searching events to the Commons Search SOLR module.
core = 7.x
package = Commons - Search package = Commons - Search
core = 7.x
dependencies[] = apachesolr_search dependencies[] = apachesolr_search
dependencies[] = commons_events dependencies[] = commons_events
dependencies[] = ctools dependencies[] = ctools
@ -9,6 +10,7 @@ dependencies[] = facetapi
dependencies[] = page_manager dependencies[] = page_manager
dependencies[] = pm_existing_pages dependencies[] = pm_existing_pages
dependencies[] = strongarm dependencies[] = strongarm
features[apachesolr_search_page][] = solr_events features[apachesolr_search_page][] = solr_events
features[ctools][] = apachesolr_search:apachesolr_search_defaults:3 features[ctools][] = apachesolr_search:apachesolr_search_defaults:3
features[ctools][] = facetapi:facetapi_defaults:1 features[ctools][] = facetapi:facetapi_defaults:1
@ -20,9 +22,9 @@ features[page_manager_existing_pages][] = solr_events_search
features[page_manager_handlers][] = pm_existing_pages_solr_events_search_panel_context features[page_manager_handlers][] = pm_existing_pages_solr_events_search_panel_context
features[variable][] = pm_existing_pages_disabled_solr_events_search features[variable][] = pm_existing_pages_disabled_solr_events_search
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

10
modules/commons/commons_featured/commons_featured.info
View File

@ -1,16 +1,18 @@
name = Commons Featured Content name = Commons Featured Content
description = Allows community managers to display certain pieces of content more prominently on the site. description = Allows community managers to display certain pieces of content more prominently on the site.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = views dependencies[] = views
dependencies[] = views_content dependencies[] = views_content
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
features[views_view][] = commons_featured features[views_view][] = commons_featured
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

24
modules/commons/commons_follow/commons_follow.features.field_base.inc
View File

@ -20,14 +20,6 @@ function commons_follow_field_default_field_bases() {
'field_permissions' => array( 'field_permissions' => array(
'type' => 0, 'type' => 0,
), ),
'foreign keys' => array(
'comment' => array(
'columns' => array(
'target_id' => 'cid',
),
'table' => 'comment',
),
),
'indexes' => array( 'indexes' => array(
'target_id' => array( 'target_id' => array(
0 => 'target_id', 0 => 'target_id',
@ -65,14 +57,6 @@ function commons_follow_field_default_field_bases() {
'field_permissions' => array( 'field_permissions' => array(
'type' => 0, 'type' => 0,
), ),
'foreign keys' => array(
'node' => array(
'columns' => array(
'target_id' => 'nid',
),
'table' => 'node',
),
),
'indexes' => array( 'indexes' => array(
'target_id' => array( 'target_id' => array(
0 => 'target_id', 0 => 'target_id',
@ -110,14 +94,6 @@ function commons_follow_field_default_field_bases() {
'field_permissions' => array( 'field_permissions' => array(
'type' => 0, 'type' => 0,
), ),
'foreign keys' => array(
'users' => array(
'columns' => array(
'target_id' => 'uid',
),
'table' => 'users',
),
),
'indexes' => array( 'indexes' => array(
'target_id' => array( 'target_id' => array(
0 => 'target_id', 0 => 'target_id',

36
modules/commons/commons_follow/commons_follow.features.inc
View File

@ -4,34 +4,6 @@
* commons_follow.features.inc * commons_follow.features.inc
*/ */
/**
* Implements hook_features_pipe_alter().
*
*/
function commons_follow_features_pipe_alter(&$pipe, $data, $export) {
$commons_follow_fields = array(
'field_target_users', 'field_target_nodes', 'field_target_comments',
);
// Prevent Commons Follow fields from being piped in features
// when a content type includes those fields.
if (!empty($pipe['field_instance'])) {
foreach ($pipe['field_instance'] as $delta => $value) {
$args = explode('-', $value);
$field_name = $args[2];
if (in_array($field_name, $commons_follow_fields)) {
unset($pipe['field_instance'][$delta]);
}
}
}
if (!empty($pipe['field_base'])) {
foreach ($pipe['field_base'] as $delta => $value) {
if (in_array($delta, $commons_follow_fields)) {
unset($pipe['field_base'][$delta]);
}
}
}
}
/** /**
* Implements hook_ctools_plugin_api(). * Implements hook_ctools_plugin_api().
*/ */
@ -50,16 +22,8 @@ function commons_follow_image_default_styles() {
// Exported image style: 50x50_avatar. // Exported image style: 50x50_avatar.
$styles['50x50_avatar'] = array( $styles['50x50_avatar'] = array(
'label' => '50x50_avatar', 'label' => '50x50_avatar',
'name' => '50x50_avatar',
'effects' => array( 'effects' => array(
3 => array( 3 => array(
'label' => 'Scale and crop',
'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.',
'effect callback' => 'image_scale_and_crop_effect',
'dimensions callback' => 'image_resize_dimensions',
'form callback' => 'image_resize_form',
'summary theme' => 'image_resize_summary',
'module' => 'image',
'name' => 'image_scale_and_crop', 'name' => 'image_scale_and_crop',
'data' => array( 'data' => array(
'width' => 50, 'width' => 50,

15
modules/commons/commons_follow/commons_follow.info
View File

@ -1,13 +1,15 @@
name = Commons Follow name = Commons Follow
description = Views and Field integration for Commons Following functionality. description = Provides a framework for allowing users to follow entities.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = ctools dependencies[] = ctools
dependencies[] = entityreference dependencies[] = entityreference
dependencies[] = features dependencies[] = features
dependencies[] = field_sql_storage dependencies[] = field_sql_storage
dependencies[] = message_subscribe dependencies[] = message_subscribe
dependencies[] = strongarm dependencies[] = strongarm
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = field_target_comments features[field_base][] = field_target_comments
@ -15,7 +17,9 @@ features[field_base][] = field_target_nodes
features[field_base][] = field_target_users features[field_base][] = field_target_users
features[image][] = 50x50_avatar features[image][] = 50x50_avatar
features[variable][] = message_subscribe_flag_prefix features[variable][] = message_subscribe_flag_prefix
features_exclude[dependencies][image] = image features_exclude[dependencies][image] = image
files[] = includes/views/commons_follow.views.inc files[] = includes/views/commons_follow.views.inc
files[] = includes/views/handlers/commons_follow_handler_filter_follow.inc files[] = includes/views/handlers/commons_follow_handler_filter_follow.inc
files[] = includes/views/handlers/commons_follow_plugin_argument_default_node.inc files[] = includes/views/handlers/commons_follow_plugin_argument_default_node.inc
@ -23,9 +27,10 @@ files[] = includes/views/handlers/commons_follow_plugin_argument_default_message
files[] = includes/views/handlers/commons_follow_user_follow_filter.inc files[] = includes/views/handlers/commons_follow_user_follow_filter.inc
files[] = includes/views/handlers/commons_follow_user_follow_filter_message.inc files[] = includes/views/handlers/commons_follow_user_follow_filter_message.inc
files[] = includes/views/handlers/commons_follow_handler_field_ops.inc files[] = includes/views/handlers/commons_follow_handler_field_ops.inc
; Information added by Drupal.org packaging script on 2014-06-25
version = "7.x-3.15" ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

67
modules/commons/commons_follow/commons_follow.module
View File

@ -25,6 +25,73 @@ function commons_follow_theme() {
* Adding the "Following" filter to the group-browsing-widget views. * Adding the "Following" filter to the group-browsing-widget views.
*/ */
function commons_follow_views_default_views_alter(&$views) { function commons_follow_views_default_views_alter(&$views) {
// Add a new views pane for events the user follows.
if (isset($views['commons_events_user_upcoming_events'])) {
$view = $views['commons_events_user_upcoming_events'];
/* Display: You follow - pane */
$handler = $view->new_display('panel_pane', 'You follow - pane', 'panel_pane_3');
$handler->display->display_options['defaults']['title'] = FALSE;
$handler->display->display_options['title'] = 'You follow';
$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'default';
$handler->display->display_options['defaults']['style_options'] = FALSE;
$handler->display->display_options['defaults']['row_plugin'] = FALSE;
$handler->display->display_options['row_plugin'] = 'fields';
$handler->display->display_options['row_options']['inline'] = array(
'capacity_used' => 'capacity_used',
'comment_count' => 'comment_count',
);
$handler->display->display_options['defaults']['row_options'] = FALSE;
$handler->display->display_options['defaults']['empty'] = FALSE;
$handler->display->display_options['defaults']['relationships'] = FALSE;
/* Relationship: Flags: commons_follow_node */
$handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
$handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
$handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
$handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'commons_follow_node';
$handler->display->display_options['defaults']['fields'] = FALSE;
/* Field: Content: Title */
$handler->display->display_options['fields']['title_field']['id'] = 'title_field';
$handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
$handler->display->display_options['fields']['title_field']['field'] = 'title_field';
$handler->display->display_options['fields']['title_field']['label'] = '';
$handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
/* Field: Content: Address */
$handler->display->display_options['fields']['field_address']['id'] = 'field_address';
$handler->display->display_options['fields']['field_address']['table'] = 'field_data_field_address';
$handler->display->display_options['fields']['field_address']['field'] = 'field_address';
$handler->display->display_options['fields']['field_address']['label'] = '';
$handler->display->display_options['fields']['field_address']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_address']['click_sort_column'] = 'country';
$handler->display->display_options['fields']['field_address']['settings'] = array(
'use_widget_handlers' => 1,
'format_handlers' => array(
'address' => 'address',
),
);
/* Field: Registration Settings: Spaces used */
$handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used';
$handler->display->display_options['fields']['capacity_used']['table'] = 'node';
$handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used';
$handler->display->display_options['fields']['capacity_used']['label'] = '';
$handler->display->display_options['fields']['capacity_used']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['capacity_used']['alter']['text'] = '<strong>[capacity_used]</strong> attendees,';
$handler->display->display_options['fields']['capacity_used']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['capacity_used']['separator'] = '';
/* Field: Content: Comment count */
$handler->display->display_options['fields']['comment_count']['id'] = 'comment_count';
$handler->display->display_options['fields']['comment_count']['table'] = 'node_comment_statistics';
$handler->display->display_options['fields']['comment_count']['field'] = 'comment_count';
$handler->display->display_options['fields']['comment_count']['label'] = '';
$handler->display->display_options['fields']['comment_count']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['comment_count']['alter']['text'] = '<strong>[comment_count]</strong> comments';
$handler->display->display_options['fields']['comment_count']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['comment_count']['separator'] = '';
$handler->display->display_options['defaults']['arguments'] = FALSE;
}
// Add a "most active" exposed sort to Commons BW views. // Add a "most active" exposed sort to Commons BW views.
foreach ($views as $view_id => $view) { foreach ($views as $view_id => $view) {
if (strpos($view_id, 'commons_bw_') !== 0) { if (strpos($view_id, 'commons_bw_') !== 0) {

12
modules/commons/commons_follow/commons_follow_group/commons_follow_group.info
View File

@ -1,20 +1,22 @@
name = Commons Follow (Groups) name = Commons Follow (Groups)
description = Lets users follow individual organic groups. description = Provides Organic Groups integration for Commons Follow, allowing users to follow individual groups.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = ctools dependencies[] = ctools
dependencies[] = flag dependencies[] = flag
dependencies[] = og dependencies[] = og
dependencies[] = strongarm dependencies[] = strongarm
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[flag][] = commons_follow_group features[flag][] = commons_follow_group
features[flag][] = email_group features[flag][] = email_group
features[variable][] = message_subscribe_og features[variable][] = message_subscribe_og
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

15
modules/commons/commons_follow/commons_follow_node/commons_follow_node.info
View File

@ -1,19 +1,22 @@
name = Commons Follow (Individual nodes) name = Commons Follow (Nodes)
description = Lets users follow individual nodes. description = Provides Node integration for Commons Follow, allowing users to follow individual nodes.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = ctools dependencies[] = ctools
dependencies[] = flag dependencies[] = flag
dependencies[] = views_litepager dependencies[] = views_litepager
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
features[flag][] = commons_follow_node features[flag][] = commons_follow_node
features[views_view][] = commons_follow_node features[views_view][] = commons_follow_node
features_exclude[dependencies][views] = views features_exclude[dependencies][views] = views
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

15
modules/commons/commons_follow/commons_follow_term/commons_follow_term.info
View File

@ -1,19 +1,22 @@
name = Commons Follow (Taxonomy terms) name = Commons Follow (Terms)
description = Lets users follow individual taxonomy terms description = Provides Taxonomy integration for Commons Follow, allowing users to follow individual taxonomy terms.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = flag dependencies[] = flag
dependencies[] = views dependencies[] = views
dependencies[] = views_litepager dependencies[] = views_litepager
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
features[flag][] = commons_follow_term features[flag][] = commons_follow_term
features[views_view][] = commons_follow_taxonomy_term features[views_view][] = commons_follow_taxonomy_term
features_exclude[dependencies][ctools] = ctools features_exclude[dependencies][ctools] = ctools
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

12
modules/commons/commons_follow/commons_follow_term/commons_follow_term.install
View File

@ -27,3 +27,15 @@ function commons_follow_term_update_3501() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Add a distinct field to the notification view to remove duplicates when
* multiple users have send email clicked.
*/
function commons_follow_term_update_3502() {
$revert = array(
'commons_follow_term' => array('views_view'),
);
features_revert($revert);
return array();
}

1
modules/commons/commons_follow/commons_follow_term/commons_follow_term.views_default.inc
View File

@ -27,6 +27,7 @@ function commons_follow_term_views_default_views() {
$handler->display->display_options['access']['type'] = 'perm'; $handler->display->display_options['access']['type'] = 'perm';
$handler->display->display_options['cache']['type'] = 'none'; $handler->display->display_options['cache']['type'] = 'none';
$handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['query']['type'] = 'views_query';
$handler->display->display_options['query']['options']['distinct'] = TRUE;
$handler->display->display_options['exposed_form']['type'] = 'basic'; $handler->display->display_options['exposed_form']['type'] = 'basic';
$handler->display->display_options['pager']['type'] = 'lite'; $handler->display->display_options['pager']['type'] = 'lite';
$handler->display->display_options['pager']['options']['items_per_page'] = '20'; $handler->display->display_options['pager']['options']['items_per_page'] = '20';

13
modules/commons/commons_follow/commons_follow_ui/commons_follow_ui.info
View File

@ -1,14 +1,15 @@
name = "Commons Follow UI" name = Commons Follow User Interface
description = "User interface for the Commons Follow functionality" description = Integrates with Message Subscribe UI to provide users with a user interface for managing the entities they follow and associated notification settings.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_follow dependencies[] = commons_follow
dependencies[] = message_subscribe_ui dependencies[] = message_subscribe_ui
dependencies[] = quicktabs dependencies[] = quicktabs
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

6
modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.inc
View File

@ -91,11 +91,7 @@ function commons_follow_user_default_message_type() {
"language" : "", "language" : "",
"arguments" : null, "arguments" : null,
"message_text" : { "und" : [ "message_text" : { "und" : [
{ { "value" : "[message:user:picture]", "format" : "filtered_html" },
"value" : "[message:user:picture]",
"format" : "filtered_html",
"safe_value" : "[message:user:picture]"
},
{ {
"value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E is now following \\u003Ca href=\\u0022[message:field-target-users:0:url]\\u0022\\u003E[message:field-target-users:0:name]\\u003C\\/a\\u003E", "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E is now following \\u003Ca href=\\u0022[message:field-target-users:0:url]\\u0022\\u003E[message:field-target-users:0:name]\\u003C\\/a\\u003E",
"format" : "full_html", "format" : "full_html",

18
modules/commons/commons_follow/commons_follow_user/commons_follow_user.info
View File

@ -1,27 +1,35 @@
name = Commons Follow (Users) name = Commons Follow (Users)
description = Lets users follow other users. description = Provides User integration for Commons Follow, allowing users to follow other users.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_follow dependencies[] = commons_follow
dependencies[] = ctools
dependencies[] = entity
dependencies[] = entityreference dependencies[] = entityreference
dependencies[] = features
dependencies[] = flag dependencies[] = flag
dependencies[] = message dependencies[] = message
dependencies[] = strongarm
dependencies[] = views dependencies[] = views
dependencies[] = views_content dependencies[] = views_content
dependencies[] = views_litepager dependencies[] = views_litepager
dependencies[] = views_load_more dependencies[] = views_load_more
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
features[field_instance][] = message-commons_follow_user_user_followed-field_target_users features[field_instance][] = message-commons_follow_user_user_followed-field_target_users
features[flag][] = commons_follow_user features[flag][] = commons_follow_user
features[message_type][] = commons_follow_user_user_followed features[message_type][] = commons_follow_user_user_followed
features[variable][] = field_bundle_settings_message__commons_follow_user_user_followed
features[views_view][] = commons_follow_user features[views_view][] = commons_follow_user
features[views_view][] = commons_follow_user_followers features[views_view][] = commons_follow_user_followers
features[views_view][] = commons_follow_user_following features[views_view][] = commons_follow_user_following
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

11
modules/commons/commons_follow/commons_follow_user/commons_follow_user.install
View File

@ -38,3 +38,14 @@ function commons_follow_user_update_3502() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Accommodate changes to message definitions.
*/
function commons_follow_user_update_3503() {
$revert = array(
'commons_follow_user' => array('message_type'),
);
features_revert($revert);
return array();
}

26
modules/commons/commons_follow/commons_follow_user/commons_follow_user.module
View File

@ -6,8 +6,6 @@
include_once 'commons_follow_user.features.inc'; include_once 'commons_follow_user.features.inc';
/** /**
* Implements hook_commons_follow_get_nids(). * Implements hook_commons_follow_get_nids().
*/ */
@ -61,22 +59,9 @@ function commons_follow_user_commons_follow_get_nids($account, $options) {
} }
} }
return $nids; return $nids;
} }
/**
* Implements hook_system_info_alter().
*/
function commons_follow_user_system_info_alter(&$info, $file, $type) {
// If Message.module is enabled, we'll define our "User follows another user"
// message type and will need to add to it an instance of field_target_users.
if ($file->name == 'commons_follow_user' && module_exists('message')) {
$info['features']['field_instance'][] = 'message-commons_follow_user_user_followed-field_target_users';
$info['features']['message_type'][] = 'commons_follow_user_user_followed';
}
}
/** /**
* Implements hook_flag(). * Implements hook_flag().
*/ */
@ -101,9 +86,9 @@ function commons_follow_user_flag($op, $flag, $content_id, $account, $fcid) {
} }
/** /**
* Indicate whether there is an existing message about a given user following * Indicate whether there is an existing message about a given user following
* a target user. * a target user.
*/ */
function commons_follow_user_existing_follow_message($acting_uid, $target_uids) { function commons_follow_user_existing_follow_message($acting_uid, $target_uids) {
$query = new EntityFieldQuery(); $query = new EntityFieldQuery();
$query->entityCondition('entity_type', 'message', '=') $query->entityCondition('entity_type', 'message', '=')
@ -115,10 +100,9 @@ function commons_follow_user_existing_follow_message($acting_uid, $target_uids)
return !empty($query->ordered_results); return !empty($query->ordered_results);
} }
/** /**
* Implements hook_commons_follow_get_message_ids(). * Implements hook_commons_follow_get_message_ids().
*/ */
function commons_follow_user_commons_follow_get_message_ids(&$followed_mids, $followed_content = array()) { function commons_follow_user_commons_follow_get_message_ids(&$followed_mids, $followed_content = array()) {
// If the user isn't following any other users, we've nothing to do here. // If the user isn't following any other users, we've nothing to do here.
if (empty($followed_content['commons_follow_user'])) { if (empty($followed_content['commons_follow_user'])) {

48
modules/commons/commons_follow/commons_follow_user/commons_follow_user.strongarm.inc Normal file
View File

@ -0,0 +1,48 @@
<?php
/**
* @file
* commons_follow_user.strongarm.inc
*/
/**
* Implements hook_strongarm().
*/
function commons_follow_user_strongarm() {
$export = array();
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'field_bundle_settings_message__commons_follow_user_user_followed';
$strongarm->value = array(
'view_modes' => array(),
'extra_fields' => array(
'form' => array(),
'display' => array(
'message__message_text__0' => array(
'message_notify_email_subject' => array(
'visible' => TRUE,
'weight' => 0,
),
'message_notify_email_body' => array(
'visible' => FALSE,
'weight' => 0,
),
),
'message__message_text__1' => array(
'message_notify_email_subject' => array(
'visible' => FALSE,
'weight' => 0,
),
'message_notify_email_body' => array(
'visible' => TRUE,
'weight' => 0,
),
),
),
),
);
$export['field_bundle_settings_message__commons_follow_user_user_followed'] = $strongarm;
return $export;
}

30
modules/commons/commons_groups/commons_groups.features.field_base.inc
View File

@ -17,7 +17,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'group_access', 'field_name' => 'group_access',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',
@ -44,7 +43,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'group_content_access', 'field_name' => 'group_content_access',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',
@ -72,7 +70,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_og_access_default_value', 'field_name' => 'field_og_access_default_value',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',
@ -98,7 +95,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_og_subscribe_settings', 'field_name' => 'field_og_subscribe_settings',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',
@ -130,7 +126,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'group_group', 'field_name' => 'group_group',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',
@ -157,14 +152,6 @@ function commons_groups_field_default_field_bases() {
'entity_types' => array(), 'entity_types' => array(),
'description' => 'Separate group names with commas', 'description' => 'Separate group names with commas',
'field_name' => 'og_group_ref', 'field_name' => 'og_group_ref',
'foreign keys' => array(
'node' => array(
'columns' => array(
'target_id' => 'nid',
),
'table' => 'node',
),
),
'indexes' => array( 'indexes' => array(
'target_id' => array( 'target_id' => array(
0 => 'target_id', 0 => 'target_id',
@ -207,14 +194,6 @@ function commons_groups_field_default_field_bases() {
0 => 'og_membership', 0 => 'og_membership',
), ),
'field_name' => 'og_membership_request', 'field_name' => 'og_membership_request',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',
@ -234,14 +213,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_group_logo', 'field_name' => 'field_group_logo',
'foreign keys' => array(
'fid' => array(
'columns' => array(
'fid' => 'fid',
),
'table' => 'file_managed',
),
),
'indexes' => array( 'indexes' => array(
'fid' => array( 'fid' => array(
0 => 'fid', 0 => 'fid',
@ -264,7 +235,6 @@ function commons_groups_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'og_roles_permissions', 'field_name' => 'og_roles_permissions',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',

16
modules/commons/commons_groups/commons_groups.features.inc
View File

@ -55,16 +55,8 @@ function commons_groups_image_default_styles() {
// Exported image style: 35x35. // Exported image style: 35x35.
$styles['35x35'] = array( $styles['35x35'] = array(
'label' => '35x35', 'label' => '35x35',
'name' => '35x35',
'effects' => array( 'effects' => array(
1 => array( 1 => array(
'label' => 'Scale and crop',
'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.',
'effect callback' => 'image_scale_and_crop_effect',
'dimensions callback' => 'image_resize_dimensions',
'form callback' => 'image_resize_form',
'summary theme' => 'image_resize_summary',
'module' => 'image',
'name' => 'image_scale_and_crop', 'name' => 'image_scale_and_crop',
'data' => array( 'data' => array(
'width' => 35, 'width' => 35,
@ -78,16 +70,8 @@ function commons_groups_image_default_styles() {
// Exported image style: 50x50. // Exported image style: 50x50.
$styles['50x50'] = array( $styles['50x50'] = array(
'label' => '50x50', 'label' => '50x50',
'name' => '50x50',
'effects' => array( 'effects' => array(
2 => array( 2 => array(
'label' => 'Scale and crop',
'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.',
'effect callback' => 'image_scale_and_crop_effect',
'dimensions callback' => 'image_resize_dimensions',
'form callback' => 'image_resize_form',
'summary theme' => 'image_resize_summary',
'module' => 'image',
'name' => 'image_scale_and_crop', 'name' => 'image_scale_and_crop',
'data' => array( 'data' => array(
'width' => 50, 'width' => 50,

29
modules/commons/commons_groups/commons_groups.info
View File

@ -1,9 +1,9 @@
name = Commons Groups name = Commons Groups
description = Commons Organic Groups Functionality description = Allows content to be organized into groups.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = commons_bw
dependencies[] = commons_topics dependencies[] = commons_topics
dependencies[] = ctools dependencies[] = ctools
dependencies[] = date dependencies[] = date
@ -27,6 +27,7 @@ dependencies[] = views
dependencies[] = views_content dependencies[] = views_content
dependencies[] = views_litepager dependencies[] = views_litepager
dependencies[] = views_load_more dependencies[] = views_load_more
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -39,8 +40,6 @@ features[field_base][] = group_group
features[field_base][] = og_group_ref features[field_base][] = og_group_ref
features[field_base][] = og_membership_request features[field_base][] = og_membership_request
features[field_base][] = og_roles_permissions features[field_base][] = og_roles_permissions
features[field_instance][] = node-group-body
features[field_instance][] = node-group-group_group
features[field_instance][] = og_membership-og_membership_type_default-og_membership_request features[field_instance][] = og_membership-og_membership_type_default-og_membership_request
features[image][] = 35x35 features[image][] = 35x35
features[image][] = 50x50 features[image][] = 50x50
@ -49,20 +48,8 @@ features[og_features_permission][] = user:user:subscribe
features[og_features_permission][] = user:user:subscribe without approval features[og_features_permission][] = user:user:subscribe without approval
features[user_permission][] = create group content features[user_permission][] = create group content
features[user_permission][] = edit own group content features[user_permission][] = edit own group content
features[variable][] = comment_anonymous_group
features[variable][] = comment_default_mode_group
features[variable][] = comment_default_per_page_group
features[variable][] = comment_form_location_group
features[variable][] = comment_group
features[variable][] = comment_preview_group
features[variable][] = comment_subject_field_group
features[variable][] = field_bundle_settings_node__group
features[variable][] = menu_options_group features[variable][] = menu_options_group
features[variable][] = menu_parent_group features[variable][] = menu_parent_group
features[variable][] = node_options_group
features[variable][] = node_preview_group
features[variable][] = node_submitted_group
features[variable][] = og_group_manager_default_rids_node_group
features[variable][] = pathauto_node_group_pattern features[variable][] = pathauto_node_group_pattern
features[variable][] = pathauto_node_pattern features[variable][] = pathauto_node_pattern
features[views_view][] = commons_bw_all features[views_view][] = commons_bw_all
@ -72,12 +59,10 @@ features[views_view][] = commons_groups_contributors
features[views_view][] = commons_groups_directory features[views_view][] = commons_groups_directory
features[views_view][] = commons_groups_recent_content features[views_view][] = commons_groups_recent_content
features[views_view][] = commons_groups_user_groups features[views_view][] = commons_groups_user_groups
features_exclude[field][node-group-group_group] = node-group-group_group
features_exclude[field][node-group-group_access] = node-group-group_access
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

33
modules/commons/commons_groups/commons_groups.install
View File

@ -254,3 +254,36 @@ function commons_groups_update_3120() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Fix URL aliases for group references
*/
function commons_groups_update_3121() {
$revert = array(
'commons_groups' => array('variable'),
);
features_revert($revert);
return array();
}
/**
* Revert the contributors view to hide 'more' link and show a pager.
*/
function commons_groups_update_3122() {
$revert = array(
'commons_groups' => array('views_view'),
);
features_revert($revert);
return array();
}
/**
* Revert the group view to display a link to the groups a user contributes to.
*/
function commons_groups_update_3170() {
$revert = array(
'commons_groups' => array('views_view'),
);
features_revert($revert);
return array();
}

58
modules/commons/commons_groups/commons_groups.module
View File

@ -444,6 +444,29 @@ function commons_groups_system_info_alter(&$info, $file, $type) {
} }
} }
} }
// Dynamically adding a field instance to an entity type results in features
// automatically detecting Commons Groups as a dependency.
// We manually exclude the dependency in order to prevent entity type provider
// modules from appearing overridden and to allow them to be used
// independently of Commons Groups.
$commons_entity_integrations = &drupal_static(__FUNCTION__);
if (!isset($commons_entity_integrations)) {
foreach (module_implements('commons_entity_integration') as $module) {
$commons_entity_integrations[$module] = call_user_func($module . '_commons_entity_integration');
}
}
if (isset($commons_entity_integrations[$file->name])) {
foreach ($commons_entity_integrations[$file->name] as $entity_type => $integration) {
foreach ($integration as $bundle => $options) {
if (commons_groups_is_group_content($entity_type, $bundle)) {
$info['features_exclude']['dependencies']['commons_groups'] = 'commons_groups';
}
}
}
}
} }
/** /**
@ -506,7 +529,7 @@ function commons_groups_token_info() {
); );
$tokens['commons-groups']['in-groups-text'] = array( $tokens['commons-groups']['in-groups-text'] = array(
'name' => t('"In groups" text'), 'name' => t('"In groups" text'),
'description' => t('The text (starting with "in the groups") indicating which groups a peice of content belongs to.'), 'description' => t('The text (starting with "in the groups") indicating which groups a piece of content belongs to.'),
); );
$tokens['node']['commons-groups-first-group'] = array( $tokens['node']['commons-groups-first-group'] = array(
'name' => t('First Group'), 'name' => t('First Group'),
@ -522,7 +545,6 @@ function commons_groups_token_info() {
); );
} }
/** /**
* Implements hook_tokens(). * Implements hook_tokens().
*/ */
@ -566,7 +588,7 @@ function commons_groups_tokens($type, $tokens, $data = array(), $options = array
} }
} }
} }
// If no groups are associated with any of the targett nodes, // If no groups are associated with any of the target nodes,
// then we have no "in the groups" text. // then we have no "in the groups" text.
if (empty($related_gids)) { if (empty($related_gids)) {
$replacements['[commons-groups:in-groups-text]'] = ''; $replacements['[commons-groups:in-groups-text]'] = '';
@ -832,6 +854,24 @@ function commons_groups_set_group_permissions($node) {
} }
} }
/**
* Helper function to determine whether an entity bundle is considered group
* content.
*
* @param $entity_type
* The entity type to check group content settings for.
* @param $bundle
* The entity bundle to check group content settings for.
*
* @return boolean
* The value of the group content setting if available, FALSE otherwise.
*/
function commons_groups_is_group_content($entity_type, $bundle) {
$commons_groups_entity_types = commons_groups_get_group_content_entity_types();
return isset($commons_groups_entity_types[$entity_type][$bundle]['is_group_content']) ? $commons_groups_entity_types[$entity_type][$bundle]['is_group_content'] : FALSE;
}
/** /**
* Returns an array of entity types that are enabled via Commons Groups. * Returns an array of entity types that are enabled via Commons Groups.
*/ */
@ -1046,7 +1086,11 @@ function commons_groups_field_formatter_view($entity_type, $entity, $field, $ins
return; return;
} }
if (og_is_member($entity_type, $id, 'user', $account)) { if (og_is_member($entity_type, $id, 'user', $account)) {
// The user has an active membership. She can leave the group. // The user has an active membership.
if (og_user_access($entity_type, $id, 'unsubscribe', $account)) {
// The user has the permission to unsubscribe himself,
// otherwise don't display a "Leave" link since the user can't leave
// anyways.
// For groups where anyone can contribute without joining, don't display // For groups where anyone can contribute without joining, don't display
// a "Leave" link since users never went through // a "Leave" link since users never went through
// the separate step of joining. // the separate step of joining.
@ -1055,6 +1099,7 @@ function commons_groups_field_formatter_view($entity_type, $entity, $field, $ins
$links['href'] = "group/$entity_type/$id/unsubscribe"; $links['href'] = "group/$entity_type/$id/unsubscribe";
} }
} }
}
else { else {
// Check if user can subscribe to the field. // Check if user can subscribe to the field.
if (empty($settings['field_name']) && $audience_field_name = og_get_best_group_audience_field('user', $account, $entity_type, $bundle)) { if (empty($settings['field_name']) && $audience_field_name = og_get_best_group_audience_field('user', $account, $entity_type, $bundle)) {
@ -1160,6 +1205,11 @@ function commons_groups_features_permission_rebuild($module, $gid) {
module_load_include('features.inc', 'og', '/includes/og_features_role'); module_load_include('features.inc', 'og', '/includes/og_features_role');
if ($defaults = features_get_default('og_features_permission', $module)) { if ($defaults = features_get_default('og_features_permission', $module)) {
// Make sure the list of available group types is up to date, especially
// when installing multiple features at once, for example from an install
// profile or via drush.
drupal_static_reset();
$grant = array(); $grant = array();
$revoke = array(); $revoke = array();

18
modules/commons/commons_groups/commons_groups.views_default.inc
View File

@ -170,7 +170,7 @@ function commons_groups_views_default_views() {
/* Display: Master */ /* Display: Master */
$handler = $view->new_display('default', 'Master', 'default'); $handler = $view->new_display('default', 'Master', 'default');
$handler->display->display_options['title'] = 'Group members'; $handler->display->display_options['title'] = 'Group contributors';
$handler->display->display_options['use_more'] = TRUE; $handler->display->display_options['use_more'] = TRUE;
$handler->display->display_options['use_more_always'] = FALSE; $handler->display->display_options['use_more_always'] = FALSE;
$handler->display->display_options['access']['type'] = 'perm'; $handler->display->display_options['access']['type'] = 'perm';
@ -363,6 +363,16 @@ function commons_groups_views_default_views() {
$handler->display->display_options['defaults']['title'] = FALSE; $handler->display->display_options['defaults']['title'] = FALSE;
$handler->display->display_options['title'] = 'Contributors to %1'; $handler->display->display_options['title'] = 'Contributors to %1';
$handler->display->display_options['defaults']['hide_admin_links'] = FALSE; $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['defaults']['use_more'] = FALSE;
$handler->display->display_options['defaults']['use_more_always'] = FALSE;
$handler->display->display_options['use_more_always'] = FALSE;
$handler->display->display_options['defaults']['use_more_text'] = FALSE;
$handler->display->display_options['defaults']['pager'] = FALSE;
$handler->display->display_options['pager']['type'] = 'full';
$handler->display->display_options['pager']['options']['items_per_page'] = '16';
$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['defaults']['style_plugin'] = FALSE; $handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'list'; $handler->display->display_options['style_plugin'] = 'list';
$handler->display->display_options['style_options']['row_class'] = 'profile-badge'; $handler->display->display_options['style_options']['row_class'] = 'profile-badge';
@ -1391,6 +1401,12 @@ function commons_groups_views_default_views() {
$handler->display->display_options['fields']['title_field']['label'] = ''; $handler->display->display_options['fields']['title_field']['label'] = '';
$handler->display->display_options['fields']['title_field']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['title_field']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['title_field']['link_to_entity'] = 1; $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
$handler->display->display_options['fields']['title_field']['type'] = 'title_linked';
$handler->display->display_options['fields']['title_field']['settings'] = array(
'title_style' => '_none',
'title_link' => 'content',
'title_class' => '',
);
/* Field: Field: Group */ /* Field: Field: Group */
$handler->display->display_options['fields']['group_group']['id'] = 'group_group'; $handler->display->display_options['fields']['group_group']['id'] = 'group_group';
$handler->display->display_options['fields']['group_group']['table'] = 'field_data_group_group'; $handler->display->display_options['fields']['group_group']['table'] = 'field_data_group_group';

12
modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.info
View File

@ -1,19 +1,21 @@
name = Commons Groups Directory name = Commons Groups Directory
description = The site-wide directory of groups description = Provides a listing of all of the current groups.
core = 7.x
package = Commons - Landing pages package = Commons - Landing pages
core = 7.x
dependencies[] = commons_activity_streams_groups dependencies[] = commons_activity_streams_groups
dependencies[] = ctools dependencies[] = ctools
dependencies[] = page_manager dependencies[] = page_manager
dependencies[] = views_content dependencies[] = views_content
features[ctools][] = page_manager:pages_default:1 features[ctools][] = page_manager:pages_default:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
features[page_manager_pages][] = groups_directory features[page_manager_pages][] = groups_directory
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

17
modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.info
View File

@ -1,23 +1,22 @@
name = Commons Group Homepages name = Commons Group Pages
description = Provides a default home page for groups description = Enhances the appearance of group landing pages and allows them to be customized.
core = 7.x
package = Commons - Landing pages package = Commons - Landing pages
core = 7.x
dependencies[] = commons_activity_streams dependencies[] = commons_activity_streams
dependencies[] = commons_bw dependencies[] = commons_bw
dependencies[] = commons_follow_group dependencies[] = commons_follow_group
dependencies[] = ctools dependencies[] = ctools
dependencies[] = panelizer dependencies[] = panelizer
dependencies[] = strongarm dependencies[] = strongarm
features[ctools][] = panelizer:panelizer:1 features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[panelizer_defaults][] = node:group:default
features[panelizer_defaults][] = node:group:default:teaser
features[variable][] = panelizer_defaults_node_group
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

30
modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.panelizer.inc
View File

@ -151,6 +151,36 @@ function commons_groups_pages_panelizer_defaults() {
$pane->uuid = 'a7009535-0e2a-2c94-edd2-4ecc953c4ca2'; $pane->uuid = 'a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
$display->content['new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2'] = $pane; $display->content['new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2'] = $pane;
$display->panels['two_66_33_second'][1] = 'new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2'; $display->panels['two_66_33_second'][1] = 'new-a7009535-0e2a-2c94-edd2-4ecc953c4ca2';
if (module_exists('commons_radioactivity_groups')) {
$pane = new stdClass();
$pane->pid = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
$pane->panel = 'two_66_33_second';
$pane->type = 'views_panes';
$pane->subtype = 'commons_radioactivity_groups_active_in_group-panel_pane_1';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'arguments' => array(
'gid' => '%node:nid',
),
'context' => array(
0 => 'panelizer',
),
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 2;
$pane->locks = array();
$pane->uuid = 'ba735f2b-4734-7724-098d-1925c6a4bb47';
$display->content['new-ba735f2b-4734-7724-098d-1925c6a4bb47'] = $pane;
$display->panels['two_66_33_second'][2] = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
}
$pane = new stdClass(); $pane = new stdClass();
$pane->pid = 'new-52796f83-93dd-2cf4-41aa-33520dc31e5f'; $pane->pid = 'new-52796f83-93dd-2cf4-41aa-33520dc31e5f';
$pane->panel = 'two_66_33_second'; $pane->panel = 'two_66_33_second';

13
modules/commons/commons_images/commons_images.info
View File

@ -1,14 +1,15 @@
name = Commons Images name = Commons Images
description = Image styles used in the Commons distribution description = Enhances the display of images by making them responsive and intelligently cropping them where necessary.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
project = commons_images core = 7.x
dependencies[] = breakpoints dependencies[] = breakpoints
dependencies[] = ctools dependencies[] = ctools
dependencies[] = file_entity dependencies[] = file_entity
dependencies[] = image dependencies[] = image
dependencies[] = picture dependencies[] = picture
dependencies[] = smartcrop dependencies[] = smartcrop
features[breakpoint_group][] = commons_default features[breakpoint_group][] = commons_default
features[breakpoint_group][] = commons_full features[breakpoint_group][] = commons_full
features[breakpoint_group][] = commons_origins features[breakpoint_group][] = commons_origins
@ -44,9 +45,9 @@ features[picture_mapping][] = commons_default
features[picture_mapping][] = commons_full features[picture_mapping][] = commons_full
features[picture_mapping][] = commons_teaser features[picture_mapping][] = commons_teaser
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

10
modules/commons/commons_kissmetrics/commons_kissmetrics.info
View File

@ -1,7 +1,8 @@
name = Commons KISSmetrics name = Commons KISSmetrics
description = Integrates with KISSmetrics to tracks Commons-specific user metrics and actions. description = Integrates with KISSmetrics to tracks Commons-specific user metrics and actions.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = comment dependencies[] = comment
dependencies[] = entity dependencies[] = entity
dependencies[] = flag dependencies[] = flag
@ -10,6 +11,7 @@ dependencies[] = og
dependencies[] = privatemsg_rules dependencies[] = privatemsg_rules
dependencies[] = rules dependencies[] = rules
dependencies[] = voting_rules dependencies[] = voting_rules
features[features_api][] = api:2 features[features_api][] = api:2
features[rules_config][] = rules_commons_kissmetrics_collect_referenced_groups features[rules_config][] = rules_commons_kissmetrics_collect_referenced_groups
features[rules_config][] = rules_commons_kissmetrics_user_adds_a_trusted_contact features[rules_config][] = rules_commons_kissmetrics_user_adds_a_trusted_contact
@ -30,9 +32,9 @@ features[rules_config][] = rules_commons_kissmetrics_user_registers
features[rules_config][] = rules_commons_kissmetrics_user_replies_to_private_message_thread features[rules_config][] = rules_commons_kissmetrics_user_replies_to_private_message_thread
features[rules_config][] = rules_commons_kissmetrics_user_starts_new_private_message_thread features[rules_config][] = rules_commons_kissmetrics_user_starts_new_private_message_thread
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

10
modules/commons/commons_like/commons_like.features.inc
View File

@ -4,16 +4,6 @@
* commons_like.features.inc * commons_like.features.inc
*/ */
/**
* Implements hook_features_export_alter().
*/
function commons_like_features_export_alter(&$export, $module_name) {
/* don't export strongarm anymore */
if($module_name == 'commons_like' && isset($export['features']['variable'])) {
unset($export['features']['variable']);
}
}
/** /**
* Implements hook_ctools_plugin_api(). * Implements hook_ctools_plugin_api().
*/ */

14
modules/commons/commons_like/commons_like.info
View File

@ -1,21 +1,25 @@
name = Commons Like name = Commons Like
description = Community members can indicate that they like content and comments. description = Allows users to indicate that they like certain content and comments.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = entityreference dependencies[] = entityreference
dependencies[] = features dependencies[] = features
dependencies[] = message dependencies[] = message
dependencies[] = rate dependencies[] = rate
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = votingapi dependencies[] = votingapi
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[field_instance][] = message-commons_like_user_likes_node-field_target_nodes features[field_instance][] = message-commons_like_user_likes_node-field_target_nodes
features[message_type][] = commons_like_user_likes_node features[message_type][] = commons_like_user_likes_node
features[variable][] = field_bundle_settings_message__commons_like_user_likes_node
features[variable][] = rate_widgets features[variable][] = rate_widgets
; Information added by Drupal.org packaging script on 2014-06-25
version = "7.x-3.15" ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

34
modules/commons/commons_like/commons_like.strongarm.inc
View File

@ -10,6 +10,40 @@
function commons_like_strongarm() { function commons_like_strongarm() {
$export = array(); $export = array();
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'field_bundle_settings_message__commons_like_user_likes_node';
$strongarm->value = array(
'view_modes' => array(),
'extra_fields' => array(
'form' => array(),
'display' => array(
'message__message_text__0' => array(
'message_notify_email_subject' => array(
'visible' => TRUE,
'weight' => 0,
),
'message_notify_email_body' => array(
'visible' => FALSE,
'weight' => 0,
),
),
'message__message_text__1' => array(
'message_notify_email_subject' => array(
'visible' => FALSE,
'weight' => 0,
),
'message_notify_email_body' => array(
'visible' => TRUE,
'weight' => 0,
),
),
),
),
);
$export['field_bundle_settings_message__commons_like_user_likes_node'] = $strongarm;
$strongarm = new stdClass(); $strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1; $strongarm->api_version = 1;

1
modules/commons/commons_location/commons_location.features.field_base.inc
View File

@ -17,7 +17,6 @@ function commons_location_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_address', 'field_name' => 'field_address',
'foreign keys' => array(),
'indexes' => array(), 'indexes' => array(),
'locked' => 0, 'locked' => 0,
'module' => 'addressfield', 'module' => 'addressfield',

12
modules/commons/commons_location/commons_location.info
View File

@ -1,16 +1,18 @@
name = Commons Location name = Commons Location
description = Provide a field definition for locations. description = Provides a simple address field for re-use by various Commons content types.
package = Commons - Building blocks
core = 7.x core = 7.x
package = Commons - Building Blocks
dependencies[] = addressfield dependencies[] = addressfield
dependencies[] = features dependencies[] = features
dependencies[] = field_sql_storage dependencies[] = field_sql_storage
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = field_address features[field_base][] = field_address
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

25
modules/commons/commons_media/commons_media.default_entity_embed_configurations.inc Normal file
View File

@ -0,0 +1,25 @@
<?php
/**
* @file
* Custom buttons for embedding entities.
*/
/**
* Implements hook_default_entity_embed_configuration().
*/
function commons_media_default_entity_embed_configuration() {
$configurations = array();
$configuration = new stdClass();
$configuration->disabled = FALSE; /* Edit this to true to make a default configuration disabled initially */
$configuration->api_version = 1;
$configuration->admin_title = 'File';
$configuration->name = 'file';
$configuration->button_label = 'File';
$configuration->entity_type = 'file';
$configuration->button_icon_fid = 0;
$configurations['file'] = $configuration;
return $configurations;
}

8
modules/commons/commons_media/commons_media.features.field_base.inc
View File

@ -17,14 +17,6 @@ function commons_media_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_media', 'field_name' => 'field_media',
'foreign keys' => array(
'fid' => array(
'columns' => array(
'fid' => 'fid',
),
'table' => 'file_managed',
),
),
'indexes' => array( 'indexes' => array(
'fid' => array( 'fid' => array(
0 => 'fid', 0 => 'fid',

13
modules/commons/commons_media/commons_media.features.field_instance.inc
View File

@ -10,16 +10,15 @@
function commons_media_field_default_field_instances() { function commons_media_field_default_field_instances() {
$field_instances = array(); $field_instances = array();
$commons_groups_entity_types = commons_groups_get_group_content_entity_types(); $commons_groups_entity_types = commons_entity_integration_info();
if (!empty($commons_groups_entity_types)) {
foreach ($commons_groups_entity_types as $entity_type => $bundles) { foreach ($commons_groups_entity_types as $entity_type => $bundles) {
foreach ($bundles as $bundle => $integrations) { foreach ($bundles as $bundle => $integrations) {
if (!empty($integrations['media'])) { if (isset($integrations['media']) && $integrations['media'] == TRUE
&& isset($integrations['is_group_content']) && $integrations['is_group_content'] == TRUE) {
commons_media_field_definition($field_instances, $entity_type, $bundle); commons_media_field_definition($field_instances, $entity_type, $bundle);
} }
} }
} }
}
return $field_instances; return $field_instances;
} }
@ -38,7 +37,7 @@ function commons_media_field_definition(&$field_instances, $entity_type, $bundle
'file_view_mode' => 'default', 'file_view_mode' => 'default',
), ),
'type' => 'file_rendered', 'type' => 'file_rendered',
'weight' => 0, 'weight' => -48,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -47,7 +46,7 @@ function commons_media_field_definition(&$field_instances, $entity_type, $bundle
'file_view_mode' => 'teaser', 'file_view_mode' => 'teaser',
), ),
'type' => 'file_rendered', 'type' => 'file_rendered',
'weight' => 0, 'weight' => -48,
), ),
), ),
'display_in_partial_form' => 1, 'display_in_partial_form' => 1,
@ -85,7 +84,7 @@ function commons_media_field_definition(&$field_instances, $entity_type, $bundle
'progress_indicator' => 'throbber', 'progress_indicator' => 'throbber',
), ),
'type' => 'media_generic', 'type' => 'media_generic',
'weight' => 2, 'weight' => -48,
), ),
); );

3
modules/commons/commons_media/commons_media.features.inc
View File

@ -8,6 +8,9 @@
* Implements hook_ctools_plugin_api(). * Implements hook_ctools_plugin_api().
*/ */
function commons_media_ctools_plugin_api($module = NULL, $api = NULL) { function commons_media_ctools_plugin_api($module = NULL, $api = NULL) {
if ($module == 'entity_embed' && $api == 'default_entity_embed_configurations') {
return array('version' => 1);
}
if ($module == "strongarm" && $api == "strongarm") { if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1"); return array("version" => "1");
} }

10
modules/commons/commons_media/commons_media.info
View File

@ -1,7 +1,8 @@
name = Commons Media name = Commons Media
description = Provides media handling capabilities. description = Provides media handling capabilities.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = ctools dependencies[] = ctools
dependencies[] = features dependencies[] = features
dependencies[] = file dependencies[] = file
@ -10,6 +11,7 @@ dependencies[] = media
dependencies[] = media_internet dependencies[] = media_internet
dependencies[] = media_oembed dependencies[] = media_oembed
dependencies[] = strongarm dependencies[] = strongarm
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = field_media features[field_base][] = field_media
@ -23,9 +25,9 @@ features[variable][] = file_entity_file_upload_wizard_skip_file_type
features[variable][] = file_entity_file_upload_wizard_skip_scheme features[variable][] = file_entity_file_upload_wizard_skip_scheme
features[variable][] = media_dialog_theme features[variable][] = media_dialog_theme
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

11
modules/commons/commons_media/commons_media.install
View File

@ -26,3 +26,14 @@ function commons_media_update_7301() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Standardize browsing widget field weights.
*/
function commons_media_update_7302() {
$revert = array(
'commons_media' => array('field_instance'),
);
features_revert($revert);
return array();
}

105
modules/commons/commons_media/commons_media.module
View File

@ -26,6 +26,46 @@ function commons_media_system_info_alter(&$info, $file, $type) {
} }
} }
} }
// Dynamically adding a field instance to an entity type results in features
// automatically detecting Commons Media as a dependency.
// We manually exclude the dependency in order to prevent entity type provider
// modules from appearing overridden and to allow them to be used
// independently of Commons Media.
$commons_entity_integrations = &drupal_static(__FUNCTION__);
if (!isset($commons_entity_integrations)) {
foreach (module_implements('commons_entity_integration') as $module) {
$commons_entity_integrations[$module] = call_user_func($module . '_commons_entity_integration');
}
}
if (isset($commons_entity_integrations[$file->name])) {
foreach ($commons_entity_integrations[$file->name] as $entity_type => $integration) {
foreach ($integration as $bundle => $options) {
if (commons_media_has_media_integration($entity_type, $bundle)) {
$info['features_exclude']['dependencies']['commons_media'] = 'commons_media';
}
}
}
}
}
/**
* Helper function to determine whether an entity bundle has media integration.
*
* @param $entity_type
* The entity type to check media integration for.
* @param $bundle
* The entity bundle to check media integration for.
*
* @return boolean
* The value of the media integration if available, FALSE otherwise.
*/
function commons_media_has_media_integration($entity_type, $bundle) {
$commons_media_entity_types = commons_entity_integration_info();
return isset($commons_media_entity_types[$entity_type][$bundle]['media']) ? $commons_media_entity_types[$entity_type][$bundle]['media'] : FALSE;
} }
/** /**
@ -140,25 +180,46 @@ function commons_media_page_build(&$page) {
* Implements hook_filter_default_formats_alter(). * Implements hook_filter_default_formats_alter().
*/ */
function commons_media_filter_default_formats_alter(&$formats) { function commons_media_filter_default_formats_alter(&$formats) {
if (module_exists('media_wysiwyg') && !empty($formats['filtered_html'])) { if (!empty($formats['filtered_html'])) {
// Allow markup from remote media. // Enable Entity Embed filters.
$formats['filtered_html']['filters']['filter_html']['settings']['allowed_html'] = '<a> <em> <strong> <u> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h4> <h5> <h6> <p> <br> <img> <strike> <iframe></iframe>'; if (module_exists('entity_embed')) {
$formats['filtered_html']['cache'] = 0;
// Allow markup from embedded entities.
$formats['filtered_html']['filters']['filter_html']['settings']['allowed_html'] = '<a> <em> <strong> <u> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h4> <h5> <h6> <p> <br> <img> <strike> <drupal-entity>';
$formats['filtered_html']['filters'] += array(
'entity_embed' => array(
'weight' => 2,
'status' => 1,
'settings' => array(),
),
'filter_align' => array(
'weight' => 3,
'status' => 1,
'settings' => array(),
),
);
}
// Enable legacy Media: WYSIWYG filter.
if (module_exists('media_wysiwyg')) {
// Enable the media filter. // Enable the media filter.
$formats['filtered_html']['filters'] += array( $formats['filtered_html']['filters'] += array(
'media_filter' => array( 'media_filter' => array(
'status' => 1, 'status' => 1,
'weight' => 2, 'weight' => 4,
), ),
); );
} }
}
} }
/** /**
* Implements hook_ckeditor_profile_defaults(). * Implements hook_ckeditor_profile_defaults().
*/ */
function commons_media_ckeditor_profile_defaults_alter(&$profiles) { function commons_media_ckeditor_profile_defaults_alter(&$profiles) {
if (module_exists('media_wysiwyg') && !empty($profiles['Advanced'])) { if (module_exists('entity_embed') && !empty($profiles['Advanced'])) {
// Disable the advanced content filter. // Disable the advanced content filter.
$profiles['Advanced']['settings']['allowed_content'] = 'f'; $profiles['Advanced']['settings']['allowed_content'] = 'f';
@ -167,16 +228,26 @@ function commons_media_ckeditor_profile_defaults_alter(&$profiles) {
[\'Format\'], [\'Format\'],
[\'Bold\',\'Italic\',\'Strike\'], [\'Bold\',\'Italic\',\'Strike\'],
[\'NumberedList\',\'BulletedList\',\'Indent\',\'Outdent\',\'Blockquote\'], [\'NumberedList\',\'BulletedList\',\'Indent\',\'Outdent\',\'Blockquote\'],
[\'Link\',\'Unlink\',\'Media\'] [\'Link\',\'Unlink\',\'file\']
]'; ]';
// Load the media plugin. // Load the Entity Embed plugin.
$profiles['Advanced']['settings']['loadPlugins'] += array( $profiles['Advanced']['settings']['loadPlugins'] += array(
'media' => array( 'drupalentity' => array(
'name' => 'drupalentity',
'desc' => 'Plugin for embedding entities',
'path' => '/profiles/commons/modules/contrib/entity_embed/js/plugins/drupalentity/',
'default' => 'f', 'default' => 'f',
'desc' => 'Plugin for inserting images from Drupal media module', 'buttons' => array(
'name' => 'media', 'file' => array(
'path' => '%plugin_dir%media/', 'label' => 'File',
'icon' => 'entity.png',
),
'node' => array(
'label' => 'Content',
'icon' => 'entity.png',
),
),
), ),
); );
} }
@ -238,7 +309,7 @@ function commons_media_entity_presave($entity, $type) {
// private group content. // private group content.
foreach ($items as $delta => $item) { foreach ($items as $delta => $item) {
// Move files to the private file system if the content is private. // Move files to the private file system if the content is private.
if ($entity->group_content_access[LANGUAGE_NONE][0]['value'] == 2) { if (isset($entity->group_content_access[LANGUAGE_NONE][0]['value']) && $entity->group_content_access[LANGUAGE_NONE][0]['value'] == 2) {
$source_file = file_load($item['fid']); $source_file = file_load($item['fid']);
// Only move public files. // Only move public files.
@ -291,3 +362,13 @@ function _commons_media_get_file_and_image_fields($entity, $type) {
return $collected_fields; return $collected_fields;
} }
/**
* Implements hook_entity_embed_alter().
*/
function commons_media_entity_embed_alter(&$build, $entity, $context) {
// Remove the contextual links on all entites that provide them.
if (isset($build['#contextual_links'])) {
unset($build['#contextual_links']);
}
}

14
modules/commons/commons_misc/commons_misc.info
View File

@ -1,13 +1,15 @@
name = Commons Miscellaneous Configuration name = Commons Miscellaneous Configuration
description = Various suggested bits of configuration for Commons sites. description = Includes various suggested bits of configuration for Commons sites.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = comment dependencies[] = comment
dependencies[] = ctools dependencies[] = ctools
dependencies[] = features dependencies[] = features
dependencies[] = node dependencies[] = node
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = user dependencies[] = user
features[ctools][] = page_manager:pages_default:1 features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
@ -20,14 +22,14 @@ features[user_permission][] = skip comment approval
features[user_permission][] = view own unpublished content features[user_permission][] = view own unpublished content
features[user_role][] = administrator features[user_role][] = administrator
features[variable][] = navbar_libraries_variants features[variable][] = navbar_libraries_variants
features[variable][] = theme_adaptivetheme_settings
features[variable][] = theme_commons_origins_settings features[variable][] = theme_commons_origins_settings
features[variable][] = user_register features[variable][] = user_register
features_exclude[dependencies][page_manager] = page_manager features_exclude[dependencies][page_manager] = page_manager
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

12
modules/commons/commons_misc/commons_misc.install
View File

@ -65,3 +65,15 @@ function commons_misc_update_7002() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Ensure that the theme settings are up-to-date with the latest version of
* Adaptive Theme and fix Commons Misc appearing overridden.
*/
function commons_misc_update_7003() {
$revert = array(
'commons_misc' => array('variable'),
);
features_revert($revert);
return array();
}

39
modules/commons/commons_misc/commons_misc.module
View File

@ -6,6 +6,18 @@
include_once 'commons_misc.features.inc'; include_once 'commons_misc.features.inc';
/**
* Implements hook_system_info_alter()
*/
function commons_misc_system_info_alter(&$info, $file, $type) {
// Remove the OG Example module from the features page as it displays a
// conflict with Commons Body, which is detected as a false positive when
// using behavioural tests to catch feature conflicts.
if ($type == 'module' && $file->name == 'og_example') {
unset($info['features']);
}
}
/** /**
* Implements hook_mail_alter(); * Implements hook_mail_alter();
*/ */
@ -45,30 +57,3 @@ function commons_misc_form_system_theme_settings_alter(&$form, &$form_state, $fo
commons_origins_palettes_form($form); commons_origins_palettes_form($form);
} }
} }
/**
* Implements hook_navbar().
*/
function commons_misc_navbar() {
$items = array();
// Add a link to the official commons documentation.
$items['documentation'] = array(
'#type' => 'navbar_item',
'tab' => array(
'#type' => 'link',
'#title' => t('Documentation'),
'#href' => 'https://docs.acquia.com/commons',
'#options' => array(
'attributes' => array(
'title' => t('Commons Documentation'),
'class' => array('icon', 'icon-help'),
'target' => '_blank',
),
),
),
'#weight' => 20,
);
return $items;
}

33
modules/commons/commons_misc/commons_misc.navbar.inc Normal file
View File

@ -0,0 +1,33 @@
<?php
/**
* @file
* Navbar hooks implemented by the Commons Miscellaneous module.
*/
/**
* Implements hook_navbar().
*/
function commons_misc_navbar() {
$items = array();
// Add a link to the official commons documentation.
$items['documentation'] = array(
'#type' => 'navbar_item',
'tab' => array(
'#type' => 'link',
'#title' => t('Documentation'),
'#href' => 'https://docs.acquia.com/commons',
'#options' => array(
'attributes' => array(
'title' => t('Commons Documentation'),
'class' => array('navbar-icon', 'navbar-icon-help'),
'target' => '_blank',
),
),
),
'#weight' => 20,
);
return $items;
}

153
modules/commons/commons_misc/commons_misc.strongarm.inc
View File

@ -13,149 +13,11 @@ function commons_misc_strongarm() {
$strongarm = new stdClass(); $strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1; $strongarm->api_version = 1;
$strongarm->name = 'theme_adaptivetheme_settings'; $strongarm->name = 'navbar_libraries_variants';
$strongarm->value = array( $strongarm->value = array(
'toggle_logo' => 1, 'modernizr' => 'source',
'toggle_name' => 1,
'toggle_slogan' => 1,
'toggle_node_user_picture' => 1,
'toggle_comment_user_picture' => 1,
'toggle_comment_user_verification' => 1,
'toggle_favicon' => 1,
'toggle_main_menu' => 1,
'toggle_secondary_menu' => 1,
'default_logo' => 1,
'logo_path' => '',
'logo_upload' => '',
'default_favicon' => 1,
'favicon_path' => '',
'favicon_upload' => '',
'bigscreen_layout' => 'three_col_grail',
'bigscreen_sidebar_unit' => '%',
'bigscreen_sidebar_first' => '25',
'bigscreen_sidebar_second' => '25',
'bigscreen_page_unit' => '%',
'bigscreen_page_width' => '100',
'bigscreen_set_max_width' => '1',
'bigscreen_max_width_unit' => 'px',
'bigscreen_max_width' => '1140',
'bigscreen_media_query' => 'only screen and (min-width:1025px)',
'tablet_landscape_layout' => 'three_col_grail',
'tablet_landscape_sidebar_unit' => '%',
'tablet_landscape_sidebar_first' => '20',
'tablet_landscape_sidebar_second' => '20',
'tablet_landscape_page_unit' => '%',
'tablet_landscape_page_width' => '100',
'tablet_landscape_media_query' => 'only screen and (min-width:769px) and (max-width:1024px)',
'tablet_portrait_layout' => 'one_col_vert',
'tablet_portrait_sidebar_unit' => '%',
'tablet_portrait_sidebar_first' => '50',
'tablet_portrait_sidebar_second' => '50',
'tablet_portrait_page_unit' => '%',
'tablet_portrait_page_width' => '100',
'tablet_portrait_media_query' => 'only screen and (min-width:481px) and (max-width:768px)',
'smartphone_landscape_layout' => 'one_col_vert',
'smartphone_landscape_sidebar_unit' => '%',
'smartphone_landscape_sidebar_first' => '50',
'smartphone_landscape_sidebar_second' => '50',
'smartphone_landscape_media_query' => 'only screen and (min-width:321px) and (max-width:480px)',
'smartphone_landscape_page_width' => '100',
'smartphone_landscape_page_unit' => '%',
'smartphone_portrait_media_query' => 'only screen and (max-width:320px)',
'smartphone_portrait_page_width' => '',
'smartphone_portrait_page_unit' => '',
'smartphone_portrait_sidebar_first' => '',
'smartphone_portrait_sidebar_second' => '',
'smartphone_portrait_sidebar_unit' => '',
'smartphone_portrait_layout' => '',
'bigscreen_two_brick' => 'two-brick',
'bigscreen_two_66_33' => 'two-66-33',
'bigscreen_two_50' => 'two-50',
'bigscreen_two_33_66' => 'two-33-66',
'bigscreen_three_50_25_25' => 'three-50-25-25',
'bigscreen_three_3x33' => 'three-3x33',
'bigscreen_three_25_50_25' => 'three-25-50-25',
'bigscreen_three_25_25_50' => 'three-25-25-50',
'bigscreen_four_4x25' => 'four-4x25',
'bigscreen_five_5x20' => 'five-5x20-2x3-grid',
'bigscreen_six_6x16' => 'six-6x16-3x2-grid',
'bigscreen_three_inset_right' => 'three-inset-right',
'bigscreen_three_inset_left' => 'three-inset-left',
'tablet_landscape_two_brick' => 'two-brick',
'tablet_landscape_two_66_33' => 'two-66-33',
'tablet_landscape_two_50' => 'two-50',
'tablet_landscape_two_33_66' => 'two-33-66',
'tablet_landscape_three_50_25_25' => 'three-50-25-25',
'tablet_landscape_three_3x33' => 'three-3x33',
'tablet_landscape_three_25_50_25' => 'three-25-50-25',
'tablet_landscape_three_25_25_50' => 'three-25-25-50',
'tablet_landscape_four_4x25' => 'four-4x25',
'tablet_landscape_five_5x20' => 'five-5x20-2x3-grid',
'tablet_landscape_six_6x16' => 'six-6x16-3x2-grid',
'tablet_landscape_three_inset_right' => 'three-inset-right',
'tablet_landscape_three_inset_left' => 'three-inset-left',
'tablet_portrait_two_brick' => 'two-brick',
'tablet_portrait_two_66_33' => 'two-66-33',
'tablet_portrait_two_50' => 'two-50',
'tablet_portrait_two_33_66' => 'two-33-66',
'tablet_portrait_three_50_25_25' => 'three-50-25-25-stack-top',
'tablet_portrait_three_3x33' => 'three-3x33-stack-top',
'tablet_portrait_three_25_50_25' => 'three-25-50-25-stack-top',
'tablet_portrait_three_25_25_50' => 'three-25-25-50-stack-top',
'tablet_portrait_four_4x25' => 'four-4x25-2x2-grid',
'tablet_portrait_five_5x20' => 'five-5x20-1x2x2-grid',
'tablet_portrait_six_6x16' => 'six-6x16-2x3-grid',
'tablet_portrait_three_inset_right' => 'three-inset-right-wrap',
'tablet_portrait_three_inset_left' => 'three-inset-left-wrap',
'smartphone_landscape_two_brick' => 'two-brick-stack',
'smartphone_landscape_two_66_33' => 'two-66-33-stack',
'smartphone_landscape_two_50' => 'two-50-stack',
'smartphone_landscape_two_33_66' => 'two-33-66-stack',
'smartphone_landscape_three_50_25_25' => 'three-50-25-25-stack',
'smartphone_landscape_three_3x33' => 'three-3x33-stack',
'smartphone_landscape_three_25_50_25' => 'three-25-50-25-stack',
'smartphone_landscape_three_25_25_50' => 'three-25-25-50-stack',
'smartphone_landscape_four_4x25' => 'four-4x25-stack',
'smartphone_landscape_five_5x20' => 'five-5x20-stack',
'smartphone_landscape_six_6x16' => 'six-6x16-stack',
'smartphone_landscape_three_inset_right' => 'three-inset-right-stack',
'smartphone_landscape_three_inset_left' => 'three-inset-left-stack',
'enable_custom_media_queries' => '1',
'global_default_layout_toggle' => '0',
'global_default_layout' => 'smartphone-portrait',
'global_files_path' => 'public_files',
'custom_files_path' => '',
'disable_responsive_styles' => '0',
'load_html5js' => '1',
'load_onmediaqueryjs' => '0',
'load_ltie8css' => '0',
'load_respondjs' => '0',
'load_scalefixjs' => '0',
'adaptivetheme_meta_viewport' => 'width=device-width, initial-scale=1',
'adaptivetheme_meta_mobileoptimized' => 'width',
'adaptivetheme_meta_handheldfriendly' => 'true',
'adaptivetheme_meta_apple_mobile_web_app_capable' => 'yes',
'chrome_edge' => '0',
'clear_type' => '0',
'expose_regions' => '0',
'show_window_size' => '0',
'atcore_version_test' => 0,
'load_all_panels' => '0',
'load_all_panels_no_sidebars' => '0',
'enable_extensions' => '0',
'enable_font_settings' => '0',
'enable_heading_settings' => '0',
'enable_image_settings' => '0',
'enable_apple_touch_icons' => '0',
'enable_exclude_css' => '0',
'enable_custom_css' => '0',
'enable_context_regions' => '0',
'enable_float_region_blocks' => '0',
'enable_markup_overides' => '0',
'at-settings__active_tab' => '',
'at_core' => '7.x-3.x',
); );
$export['theme_adaptivetheme_settings'] = $strongarm; $export['navbar_libraries_variants'] = $strongarm;
$strongarm = new stdClass(); $strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
@ -304,15 +166,6 @@ function commons_misc_strongarm() {
); );
$export['theme_commons_origins_settings'] = $strongarm; $export['theme_commons_origins_settings'] = $strongarm;
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'navbar_libraries_variants';
$strongarm->value = array(
'modernizr' => 'source',
);
$export['navbar_libraries_variants'] = $strongarm;
$strongarm = new stdClass(); $strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1; $strongarm->api_version = 1;

6
modules/commons/commons_notices/commons_notices.features.field_instance.inc
View File

@ -22,7 +22,7 @@ function commons_notices_field_default_field_instances() {
'module' => 'text', 'module' => 'text',
'settings' => array(), 'settings' => array(),
'type' => 'text_default', 'type' => 'text_default',
'weight' => 0, 'weight' => -49,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -31,7 +31,7 @@ function commons_notices_field_default_field_instances() {
'trim_length' => 600, 'trim_length' => 600,
), ),
'type' => 'text_summary_or_trimmed', 'type' => 'text_summary_or_trimmed',
'weight' => 0, 'weight' => -49,
), ),
), ),
'entity_type' => 'node', 'entity_type' => 'node',
@ -50,7 +50,7 @@ function commons_notices_field_default_field_instances() {
'summary_rows' => 5, 'summary_rows' => 5,
), ),
'type' => 'text_textarea_with_summary', 'type' => 'text_textarea_with_summary',
'weight' => -4, 'weight' => -49,
), ),
); );

14
modules/commons/commons_notices/commons_notices.info
View File

@ -1,7 +1,8 @@
name = Commons Notices name = Commons Notices
core = 7.x description = Provides a Notice content type for displaying administrative alerts to users, such as planned system maintenance.
package = Commons - Content types package = Commons - Content types
php = 5.2.4 core = 7.x
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = ctools dependencies[] = ctools
dependencies[] = features dependencies[] = features
@ -9,9 +10,10 @@ dependencies[] = node
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = text dependencies[] = text
dependencies[] = views dependencies[] = views
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:1 features[features_api][] = api:2
features[field_instance][] = node-notice-body features[field_instance][] = node-notice-body
features[node][] = notice features[node][] = notice
features[variable][] = comment_anonymous_notice features[variable][] = comment_anonymous_notice
@ -28,9 +30,9 @@ features[variable][] = node_preview_notice
features[variable][] = node_submitted_notice features[variable][] = node_submitted_notice
features[views_view][] = commons_notices_latest_notices features[views_view][] = commons_notices_latest_notices
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

17
modules/commons/commons_notify/commons_notify.features.field_base.inc
View File

@ -17,14 +17,6 @@ function commons_notify_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_message_rendered_body', 'field_name' => 'field_message_rendered_body',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',
@ -44,14 +36,6 @@ function commons_notify_field_default_field_bases() {
'deleted' => 0, 'deleted' => 0,
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_message_rendered_subject', 'field_name' => 'field_message_rendered_subject',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',
@ -75,7 +59,6 @@ function commons_notify_field_default_field_bases() {
0 => 'user', 0 => 'user',
), ),
'field_name' => 'message_subscribe_email', 'field_name' => 'message_subscribe_email',
'foreign keys' => array(),
'indexes' => array( 'indexes' => array(
'value' => array( 'value' => array(
0 => 'value', 0 => 'value',

12
modules/commons/commons_notify/commons_notify.info
View File

@ -1,6 +1,8 @@
name = Commons Notify name = Commons Notify
core = 7.x description = Provides a framework for allowing users to be notified when an event is triggered.
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = commons_follow dependencies[] = commons_follow
dependencies[] = ctools dependencies[] = ctools
dependencies[] = entity dependencies[] = entity
@ -14,6 +16,7 @@ dependencies[] = number
dependencies[] = options dependencies[] = options
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = text dependencies[] = text
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = field_message_rendered_body features[field_base][] = field_message_rendered_body
@ -45,13 +48,14 @@ features[variable][] = field_bundle_settings_message__commons_notify_comment_cre
features[variable][] = field_bundle_settings_message__commons_notify_node_created features[variable][] = field_bundle_settings_message__commons_notify_node_created
features[variable][] = field_bundle_settings_message__commons_notify_node_created_no_groups features[variable][] = field_bundle_settings_message__commons_notify_node_created_no_groups
features[variable][] = message_subscribe_default_notifiers features[variable][] = message_subscribe_default_notifiers
features_exclude[field_base][message_text] = message_text features_exclude[field_base][message_text] = message_text
features_exclude[field_base][field_target_nodes] = field_target_nodes features_exclude[field_base][field_target_nodes] = field_target_nodes
features_exclude[field_base][field_target_comments] = field_target_comments features_exclude[field_base][field_target_comments] = field_target_comments
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

4
modules/commons/commons_notify/commons_notify.module
View File

@ -20,8 +20,10 @@ function commons_notify_node_insert($node) {
/** /**
* Send a notification for newly created nodes. * Send a notification for newly created nodes.
*
* This function is registered as a shutdown function * This function is registered as a shutdown function
* in commons_notify_node_insert. * in commons_notify_node_insert.
*
* Note that shutdown functions run after drupal_set_message() messages are * Note that shutdown functions run after drupal_set_message() messages are
* displayed, so you'll need to use another method such as watchdog() logging * displayed, so you'll need to use another method such as watchdog() logging
* if you wish to add debugging messages to this function. * if you wish to add debugging messages to this function.
@ -45,7 +47,7 @@ function commons_notify_send_message_on_shutdown($node) {
if (!isset($node->og_group_ref[LANGUAGE_NONE][0]['target_id'])) { if (!isset($node->og_group_ref[LANGUAGE_NONE][0]['target_id'])) {
$message_type = 'commons_notify_node_created_no_groups'; $message_type = 'commons_notify_node_created_no_groups';
} }
// Allow other modules to specify an alternative messagge type to use. // Allow other modules to specify an alternative message type to use.
$hook = 'node_insert'; $hook = 'node_insert';
drupal_alter('commons_notify_message_selection', $message_type, $hook, $node); drupal_alter('commons_notify_message_selection', $message_type, $hook, $node);
$account = user_load($node->uid); $account = user_load($node->uid);

6
modules/commons/commons_pages/commons_pages.features.field_instance.inc
View File

@ -22,7 +22,7 @@ function commons_pages_field_default_field_instances() {
'module' => 'text', 'module' => 'text',
'settings' => array(), 'settings' => array(),
'type' => 'text_default', 'type' => 'text_default',
'weight' => 0, 'weight' => -49,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -31,7 +31,7 @@ function commons_pages_field_default_field_instances() {
'trim_length' => 600, 'trim_length' => 600,
), ),
'type' => 'text_summary_or_trimmed', 'type' => 'text_summary_or_trimmed',
'weight' => 0, 'weight' => -49,
), ),
), ),
'entity_type' => 'node', 'entity_type' => 'node',
@ -50,7 +50,7 @@ function commons_pages_field_default_field_instances() {
'summary_rows' => 5, 'summary_rows' => 5,
), ),
'type' => 'text_textarea_with_summary', 'type' => 'text_textarea_with_summary',
'weight' => -4, 'weight' => -49,
), ),
); );

12
modules/commons/commons_pages/commons_pages.info
View File

@ -1,13 +1,15 @@
name = Commons Pages name = Commons Pages
core = 7.x description = Provides a Page content type for creating static content.
package = Commons - Content types package = Commons - Content types
core = 7.x
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = commons_bw
dependencies[] = ctools dependencies[] = ctools
dependencies[] = features dependencies[] = features
dependencies[] = node dependencies[] = node
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = text dependencies[] = text
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[field_instance][] = node-page-body features[field_instance][] = node-page-body
@ -26,9 +28,9 @@ features[variable][] = node_preview_page
features[variable][] = node_submitted_page features[variable][] = node_submitted_page
features[variable][] = pathauto_node_page_pattern features[variable][] = pathauto_node_page_pattern
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

14
modules/commons/commons_pages/commons_pages.module
View File

@ -10,20 +10,6 @@ include_once 'commons_pages.features.inc';
* Implements hook_strongarm_alter(). * Implements hook_strongarm_alter().
*/ */
function commons_pages_strongarm_alter(&$items) { function commons_pages_strongarm_alter(&$items) {
// Expose the Page content type for 'liking' via the Commons_like module
// by altering the configuration for the Rate.module widget that it provides.
if (!empty($items['rate_widgets']->value)) {
foreach($items['rate_widgets']->value as $key => $widget) {
if ($widget->name == 'commons_like') {
if (!in_array('document', $items['rate_widgets']->value[$key]->node_types)) {
$items['rate_widgets']->value[$key]->node_types[] = 'page';
}
if (!in_array('document', $items['rate_widgets']->value[$key]->comment_types)) {
$items['rate_widgets']->value[$key]->comment_types[] = 'page';
}
}
}
}
// Expose the Page content type for integration with Commons Groups. // Expose the Page content type for integration with Commons Groups.
if (isset($items['commons_groups_entity_types'])) { if (isset($items['commons_groups_entity_types'])) {
$items['commons_groups_entity_types']->value['node']['page'] = 1; $items['commons_groups_entity_types']->value['node']['page'] = 1;

6
modules/commons/commons_polls/commons_polls.features.field_instance.inc
View File

@ -22,7 +22,7 @@ function commons_polls_field_default_field_instances() {
'module' => 'text', 'module' => 'text',
'settings' => array(), 'settings' => array(),
'type' => 'text_default', 'type' => 'text_default',
'weight' => 2, 'weight' => -49,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -31,7 +31,7 @@ function commons_polls_field_default_field_instances() {
'trim_length' => 600, 'trim_length' => 600,
), ),
'type' => 'text_summary_or_trimmed', 'type' => 'text_summary_or_trimmed',
'weight' => 1, 'weight' => -49,
), ),
), ),
'display_in_partial_form' => 1, 'display_in_partial_form' => 1,
@ -52,7 +52,7 @@ function commons_polls_field_default_field_instances() {
'summary_rows' => 5, 'summary_rows' => 5,
), ),
'type' => 'text_textarea_with_summary', 'type' => 'text_textarea_with_summary',
'weight' => 2, 'weight' => -49,
), ),
); );

12
modules/commons/commons_polls/commons_polls.info
View File

@ -1,7 +1,8 @@
name = Commons Polls name = Commons Polls
description = Commons poll content type description = Provides a Poll content type for conducting polls.
core = 7.x
package = Commons - Content types package = Commons - Content types
core = 7.x
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = commons_topics dependencies[] = commons_topics
dependencies[] = ctools dependencies[] = ctools
@ -14,6 +15,7 @@ dependencies[] = radioactivity
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = views dependencies[] = views
dependencies[] = views_litepager dependencies[] = views_litepager
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -45,9 +47,9 @@ features[variable][] = node_preview_poll
features[variable][] = node_submitted_poll features[variable][] = node_submitted_poll
features[views_view][] = commons_bw_polls features[views_view][] = commons_bw_polls
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

11
modules/commons/commons_polls/commons_polls.install
View File

@ -92,3 +92,14 @@ function commons_polls_update_7006() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Standardize browsing widget field weights.
*/
function commons_polls_update_7007() {
$revert = array(
'commons_polls' => array('field_instance'),
);
features_revert($revert);
return array();
}

15
modules/commons/commons_polls/commons_polls.module
View File

@ -10,20 +10,6 @@ include_once 'commons_polls.features.inc';
* Implements hook_strongarm_alter(). * Implements hook_strongarm_alter().
*/ */
function commons_polls_strongarm_alter(&$items) { function commons_polls_strongarm_alter(&$items) {
// Expose the poll content type for 'liking' via the Commons_like module
// by altering the configuration for the Rate.module widget that it provides.
if (!empty($items['rate_widgets']->value)) {
foreach($items['rate_widgets']->value as $key => $widget) {
if ($widget->name == 'commons_like') {
if (!in_array('poll', $items['rate_widgets']->value[$key]->node_types)) {
$items['rate_widgets']->value[$key]->node_types[] = 'poll';
}
if (!in_array('poll', $items['rate_widgets']->value[$key]->comment_types)) {
$items['rate_widgets']->value[$key]->comment_types[] = 'poll';
}
}
}
}
// Expose the poll content type for integration with Commons Radioactivity // Expose the poll content type for integration with Commons Radioactivity
// and Commons Groups. // and Commons Groups.
foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) { foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) {
@ -61,7 +47,6 @@ function commons_polls_form_commons_bw_partial_node_form_alter(&$form, &$form_st
$form['body'][$language][0]['#required'] = TRUE; $form['body'][$language][0]['#required'] = TRUE;
$form['body'][$language][0]['#placeholder'] = t('Enter a question, e.g. "What is your favorite color?"'); $form['body'][$language][0]['#placeholder'] = t('Enter a question, e.g. "What is your favorite color?"');
$form['body'][$language][0]['#resizable'] = FALSE; $form['body'][$language][0]['#resizable'] = FALSE;
$form['body']['#weight'] = -10;
// Prepare the form for collapsing. // Prepare the form for collapsing.
$form['body']['#attributes']['class'][] = 'trigger-field'; $form['body']['#attributes']['class'][] = 'trigger-field';

6
modules/commons/commons_posts/commons_posts.features.field_instance.inc
View File

@ -74,7 +74,7 @@ function commons_posts_field_default_field_instances() {
'module' => 'text', 'module' => 'text',
'settings' => array(), 'settings' => array(),
'type' => 'text_default', 'type' => 'text_default',
'weight' => 2, 'weight' => -49,
), ),
'teaser' => array( 'teaser' => array(
'label' => 'hidden', 'label' => 'hidden',
@ -83,7 +83,7 @@ function commons_posts_field_default_field_instances() {
'trim_length' => 600, 'trim_length' => 600,
), ),
'type' => 'text_summary_or_trimmed', 'type' => 'text_summary_or_trimmed',
'weight' => 1, 'weight' => -49,
), ),
), ),
'display_in_partial_form' => 1, 'display_in_partial_form' => 1,
@ -104,7 +104,7 @@ function commons_posts_field_default_field_instances() {
'summary_rows' => 5, 'summary_rows' => 5,
), ),
'type' => 'text_textarea_with_summary', 'type' => 'text_textarea_with_summary',
'weight' => 2, 'weight' => -49,
), ),
); );

9
modules/commons/commons_posts/commons_posts.features.inc
View File

@ -38,11 +38,7 @@ function commons_posts_default_message_type() {
"language" : "", "language" : "",
"arguments" : null, "arguments" : null,
"message_text" : { "und" : [ "message_text" : { "und" : [
{ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
"value" : "[message:user:picture:35x35]",
"format" : "filtered_html",
"safe_value" : "[message:user:picture:35x35]"
},
{ {
"value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E posted \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title_field]\\u003C\\/a\\u003E", "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E posted \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title_field]\\u003C\\/a\\u003E",
"format" : "full_html", "format" : "full_html",
@ -50,8 +46,7 @@ function commons_posts_default_message_type() {
}, },
{ {
"value" : "[commons-groups:in-groups-text]", "value" : "[commons-groups:in-groups-text]",
"format" : "filtered_html", "format" : "filtered_html"
"safe_value" : "[commons-groups:in-groups-text]"
} }
] ]
}, },

16
modules/commons/commons_posts/commons_posts.info
View File

@ -1,14 +1,15 @@
name = Commons Posts name = Commons Posts
description = Commons Post content type description = Provides a Post content type for creating blog, article or general status updates.
core = 7.x
package = Commons - Content types package = Commons - Content types
core = 7.x
dependencies[] = commons_body dependencies[] = commons_body
dependencies[] = commons_bw
dependencies[] = commons_topics dependencies[] = commons_topics
dependencies[] = ctools dependencies[] = ctools
dependencies[] = entity dependencies[] = entity
dependencies[] = entityreference dependencies[] = entityreference
dependencies[] = features dependencies[] = features
dependencies[] = message
dependencies[] = node dependencies[] = node
dependencies[] = og dependencies[] = og
dependencies[] = og_ui dependencies[] = og_ui
@ -18,6 +19,7 @@ dependencies[] = taxonomy
dependencies[] = text dependencies[] = text
dependencies[] = views dependencies[] = views
dependencies[] = views_litepager dependencies[] = views_litepager
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0 features[ctools][] = views:views_default:3.0
features[features_api][] = api:2 features[features_api][] = api:2
@ -51,9 +53,11 @@ features[variable][] = node_preview_post
features[variable][] = node_submitted_post features[variable][] = node_submitted_post
features[views_view][] = commons_bw_posts features[views_view][] = commons_bw_posts
; Information added by Drupal.org packaging script on 2014-06-25 features_exclude[dependencies][commons_trusted_contacts] = commons_trusted_contacts
version = "7.x-3.15"
; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

22
modules/commons/commons_posts/commons_posts.install
View File

@ -103,3 +103,25 @@ function commons_posts_update_7007() {
features_revert($revert); features_revert($revert);
return array(); return array();
} }
/**
* Standardize browsing widget field weights.
*/
function commons_posts_update_7008() {
$revert = array(
'commons_posts' => array('field_instance'),
);
features_revert($revert);
return array();
}
/**
* Accommodate changes to message definitions.
*/
function commons_posts_update_7009() {
$revert = array(
'commons_posts' => array('message_type'),
);
features_revert($revert);
return array();
}

21
modules/commons/commons_posts/commons_posts.module
View File

@ -60,9 +60,8 @@ function commons_posts_form_commons_bw_partial_node_form_after_build($form) {
return $form; return $form;
} }
/** /**
* Implements commons_activity_streams_message_selection_alter(). * Implements hook_commons_activity_streams_message_selection_alter().
*/ */
function commons_posts_commons_activity_streams_message_selection_alter(&$message_type, $hook, $node) { function commons_posts_commons_activity_streams_message_selection_alter(&$message_type, $hook, $node) {
// Use a "User posted [title]" format activity stream message. // Use a "User posted [title]" format activity stream message.
@ -72,23 +71,9 @@ function commons_posts_commons_activity_streams_message_selection_alter(&$messag
} }
/** /**
* Implements hook_strongarm_alter(). * Implements hook_strongarm_alter().
*/ */
function commons_posts_strongarm_alter(&$items) { function commons_posts_strongarm_alter(&$items) {
// Expose the Post content type for 'liking' via the Commons_like module
// by altering the configuration for the Rate.module widget that it provides.
if (!empty($items['rate_widgets']->value)) {
foreach($items['rate_widgets']->value as $key => $widget) {
if ($widget->name == 'commons_like') {
if (!in_array('post', $items['rate_widgets']->value[$key]->node_types)) {
$items['rate_widgets']->value[$key]->node_types[] = 'post';
}
if (!in_array('post', $items['rate_widgets']->value[$key]->comment_types)) {
$items['rate_widgets']->value[$key]->comment_types[] = 'post';
}
}
}
}
// Expose the post content type for integration with Commons Radioactivity // Expose the post content type for integration with Commons Radioactivity
// and Commons Groups. // and Commons Groups.
foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) { foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) {

24
modules/commons/commons_profile_base/commons_profile_base.features.field_base.inc
View File

@ -17,14 +17,6 @@ function commons_profile_base_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_bio', 'field_name' => 'field_bio',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',
@ -44,14 +36,6 @@ function commons_profile_base_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_name_first', 'field_name' => 'field_name_first',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',
@ -73,14 +57,6 @@ function commons_profile_base_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_name_last', 'field_name' => 'field_name_last',
'foreign keys' => array(
'format' => array(
'columns' => array(
'format' => 'format',
),
'table' => 'filter_format',
),
),
'indexes' => array( 'indexes' => array(
'format' => array( 'format' => array(
0 => 'format', 0 => 'format',

12
modules/commons/commons_profile_base/commons_profile_base.info
View File

@ -1,11 +1,13 @@
name = Commons Profile Base name = Commons Profile Base
description = Provides a base set of profile fields for user profiles. description = Provides a base set of general profile fields for user profiles.
core = 7.x
package = Commons - Building blocks package = Commons - Building blocks
core = 7.x
dependencies[] = ctools dependencies[] = ctools
dependencies[] = features dependencies[] = features
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = text dependencies[] = text
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[field_base][] = field_bio features[field_base][] = field_bio
@ -23,9 +25,9 @@ features[variable][] = user_picture_file_size
features[variable][] = user_picture_style features[variable][] = user_picture_style
features[variable][] = user_pictures features[variable][] = user_pictures
; Information added by Drupal.org packaging script on 2014-06-25 ; Information added by Drupal.org packaging script on 2015-03-18
version = "7.x-3.15" version = "7.x-3.23"
core = "7.x" core = "7.x"
project = "commons" project = "commons"
datestamp = "1403672628" datestamp = "1426714630"

3
modules/commons/commons_profile_social/commons_profile_social.features.field_base.inc
View File

@ -17,7 +17,6 @@ function commons_profile_social_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_facebook_url', 'field_name' => 'field_facebook_url',
'foreign keys' => array(),
'indexes' => array(), 'indexes' => array(),
'locked' => '0', 'locked' => '0',
'module' => 'link', 'module' => 'link',
@ -47,7 +46,6 @@ function commons_profile_social_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_linkedin_url', 'field_name' => 'field_linkedin_url',
'foreign keys' => array(),
'indexes' => array(), 'indexes' => array(),
'locked' => '0', 'locked' => '0',
'module' => 'link', 'module' => 'link',
@ -77,7 +75,6 @@ function commons_profile_social_field_default_field_bases() {
'deleted' => '0', 'deleted' => '0',
'entity_types' => array(), 'entity_types' => array(),
'field_name' => 'field_twitter_url', 'field_name' => 'field_twitter_url',
'foreign keys' => array(),
'indexes' => array(), 'indexes' => array(),
'locked' => '0', 'locked' => '0',
'module' => 'link', 'module' => 'link',

Some files were not shown because too many files have changed in this diff Show More