From 873c60079f1301873c5b82c8048c5beda67cae4e Mon Sep 17 00:00:00 2001 From: DRANIK SERVER Date: Tue, 24 Apr 2018 21:40:10 +0300 Subject: [PATCH 1/3] expand gitignore --- .gitignore | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 0cdda235..f00fe56c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,25 +5,4 @@ sites/*/settings*.php sites/*/files sites/*/private -*~ -\#* -.drush -.lesshst -.viminfo -.htaccess -.htpasswd - -sites/default/settings.php -sites/default/files/languages* -sites/default/files/css* -sites/default/files/js* - -.ht.filecache -db -phpmyadmin - -robots.txt -robots-old.txt - -php_info.php -sites/all/themes/landing-integration-gradka/ +sites/default/files/css/ From 0050f820ebac707f40a48e87eebec6f0f298a6a6 Mon Sep 17 00:00:00 2001 From: DRANIK SERVER Date: Tue, 24 Apr 2018 21:42:28 +0300 Subject: [PATCH 2/3] expand gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f00fe56c..addb7386 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ sites/*/files sites/*/private sites/default/files/css/ +sites/default/files/js/ +sites/all/themes/landing-integration-gradka From 45901e13d12d0320c2f20432d308bc1877ea6d56 Mon Sep 17 00:00:00 2001 From: DRANIK SERVER Date: Tue, 24 Apr 2018 21:52:45 +0300 Subject: [PATCH 3/3] expand gitignore --- .gitignore | 22 +- CHANGELOG.txt | 28 + includes/bootstrap.inc | 6 +- includes/common.inc | 7 +- includes/database/pgsql/database.inc | 12 +- includes/database/pgsql/install.inc | 2 +- includes/database/pgsql/select.inc | 4 +- includes/database/query.inc | 6 +- includes/database/schema.inc | 5 +- includes/database/sqlite/query.inc | 13 +- includes/database/sqlite/schema.inc | 2 +- includes/errors.inc | 6 +- includes/file.inc | 29 +- includes/request-sanitizer.inc | 82 + index.php | 7 - misc/drupal.js | 123 +- modules/aggregator/aggregator.info | 6 +- modules/aggregator/aggregator.module | 8 + modules/aggregator/aggregator.test | 38 +- modules/aggregator/tests/aggregator_test.info | 6 +- modules/block/block.info | 6 +- modules/block/block.module | 19 +- modules/block/tests/block_test.info | 6 +- .../block_test_theme/block_test_theme.info | 6 +- modules/blog/blog.info | 6 +- modules/book/book.info | 6 +- modules/color/color.info | 6 +- modules/comment/comment.info | 6 +- modules/contact/contact.info | 6 +- modules/contact/contact.module | 9 +- modules/contact/contact.test | 22 + modules/contextual/contextual.info | 6 +- modules/dashboard/dashboard.info | 6 +- modules/dblog/dblog.info | 6 +- modules/field/field.info | 6 +- .../field_sql_storage/field_sql_storage.info | 6 +- modules/field/modules/list/list.info | 6 +- .../field/modules/list/tests/list_test.info | 6 +- modules/field/modules/number/number.info | 6 +- modules/field/modules/options/options.info | 6 +- modules/field/modules/text/text.info | 6 +- modules/field/tests/field_test.info | 6 +- modules/field/theme/field.tpl.php | 8 +- modules/field_ui/field_ui.info | 6 +- modules/file/file.info | 6 +- modules/file/file.module | 23 +- modules/file/tests/file.test | 147 + modules/file/tests/file_module_test.info | 6 +- modules/file/tests/file_module_test.module | 15 + modules/filter/filter.info | 6 +- modules/forum/forum.info | 6 +- modules/help/help.info | 6 +- modules/image/image.info | 6 +- modules/image/tests/image_module_test.info | 6 +- modules/locale/locale.info | 6 +- modules/locale/locale.test | 6 +- modules/locale/tests/locale_test.info | 6 +- modules/menu/menu.info | 6 +- modules/node/node.info | 6 +- modules/node/tests/node_access_test.info | 6 +- modules/node/tests/node_test.info | 6 +- modules/node/tests/node_test_exception.info | 6 +- modules/openid/openid.info | 6 +- modules/openid/tests/openid_test.info | 6 +- modules/overlay/overlay.info | 6 +- modules/path/path.info | 6 +- modules/php/php.info | 6 +- modules/poll/poll.info | 6 +- modules/profile/profile.info | 6 +- modules/rdf/rdf.info | 6 +- modules/rdf/tests/rdf_test.info | 6 +- modules/search/search.info | 6 +- .../search/tests/search_embedded_form.info | 6 +- modules/search/tests/search_extra_type.info | 6 +- modules/search/tests/search_node_tags.info | 6 +- modules/shortcut/shortcut.info | 6 +- modules/simpletest/drupal_web_test_case.php | 32 +- modules/simpletest/simpletest.info | 6 +- .../simpletest/tests/actions_loop_test.info | 6 +- modules/simpletest/tests/ajax_forms_test.info | 6 +- modules/simpletest/tests/ajax_test.info | 6 +- modules/simpletest/tests/batch_test.info | 6 +- modules/simpletest/tests/boot_test_1.info | 6 +- modules/simpletest/tests/boot_test_2.info | 6 +- modules/simpletest/tests/common.test | 36 +- modules/simpletest/tests/common_test.info | 6 +- modules/simpletest/tests/common_test.module | 3 + .../tests/common_test_cron_helper.info | 6 +- modules/simpletest/tests/database_test.info | 6 +- .../drupal_autoload_test.info | 6 +- ...drupal_system_listing_compatible_test.info | 6 +- ...upal_system_listing_incompatible_test.info | 6 +- .../simpletest/tests/entity_cache_test.info | 6 +- .../tests/entity_cache_test_dependency.info | 6 +- .../tests/entity_crud_hook_test.info | 6 +- .../tests/entity_query_access_test.info | 6 +- modules/simpletest/tests/error_test.info | 6 +- modules/simpletest/tests/file_test.info | 6 +- modules/simpletest/tests/filter_test.info | 6 +- modules/simpletest/tests/form_test.info | 6 +- modules/simpletest/tests/image_test.info | 6 +- modules/simpletest/tests/menu_test.info | 6 +- modules/simpletest/tests/module_test.info | 6 +- modules/simpletest/tests/path_test.info | 6 +- .../tests/psr_0_test/psr_0_test.info | 6 +- .../tests/psr_4_test/psr_4_test.info | 6 +- .../simpletest/tests/requirements1_test.info | 6 +- .../simpletest/tests/requirements2_test.info | 6 +- modules/simpletest/tests/session_test.info | 6 +- .../tests/system_dependencies_test.info | 6 +- ...atible_core_version_dependencies_test.info | 6 +- ...system_incompatible_core_version_test.info | 6 +- ...ible_module_version_dependencies_test.info | 6 +- ...stem_incompatible_module_version_test.info | 6 +- .../tests/system_project_namespace_test.info | 6 +- modules/simpletest/tests/system_test.info | 6 +- modules/simpletest/tests/taxonomy_test.info | 6 +- modules/simpletest/tests/theme_test.info | 6 +- .../themes/test_basetheme/test_basetheme.info | 6 +- .../themes/test_subtheme/test_subtheme.info | 6 +- .../tests/themes/test_theme/test_theme.info | 6 +- .../test_theme_nyan_cat.info | 6 +- .../simpletest/tests/update_script_test.info | 6 +- modules/simpletest/tests/update_test_1.info | 6 +- modules/simpletest/tests/update_test_2.info | 6 +- modules/simpletest/tests/update_test_3.info | 6 +- modules/simpletest/tests/url_alter_test.info | 6 +- modules/simpletest/tests/xmlrpc_test.info | 6 +- modules/statistics/statistics.info | 6 +- modules/statistics/statistics.module | 2 +- modules/syslog/syslog.info | 6 +- modules/system/system.info | 6 +- modules/system/system.install | 2 +- modules/system/tests/cron_queue_test.info | 6 +- modules/system/tests/system_cron_test.info | 6 +- modules/taxonomy/taxonomy.info | 6 +- modules/toolbar/toolbar.info | 6 +- modules/tracker/tracker.info | 6 +- .../translation/tests/translation_test.info | 6 +- modules/translation/translation.info | 6 +- modules/trigger/tests/trigger_test.info | 6 +- modules/trigger/trigger.info | 6 +- modules/update/tests/aaa_update_test.info | 6 +- modules/update/tests/bbb_update_test.info | 6 +- modules/update/tests/ccc_update_test.info | 6 +- .../update_test_admintheme.info | 6 +- .../update_test_basetheme.info | 6 +- .../update_test_subtheme.info | 6 +- modules/update/tests/update_test.info | 6 +- modules/update/update.info | 6 +- modules/user/tests/user_form_test.info | 6 +- modules/user/user.info | 6 +- modules/user/user.module | 9 +- modules/user/user.test | 76 +- profiles/minimal/minimal.info | 6 +- profiles/standard/standard.info | 6 +- ...drupal_system_listing_compatible_test.info | 6 +- ...upal_system_listing_incompatible_test.info | 6 +- profiles/testing/testing.info | 6 +- scripts/drupal.sh | 0 scripts/password-hash.sh | 0 scripts/run-tests.sh | 0 sites/all/libraries/APC/#apc.php.inc# | 1362 +++ sites/all/libraries/ckeditor_old/.htaccess | 24 + .../examples/fileupload.php | 137 - .../examples/idtoken.php | 109 - .../examples/simplefileupload.php | 125 - .../modules/adminimal_admin_menu/CREDITS.txt | 6 + .../modules/adminimal_admin_menu/README.txt | 26 +- .../adminimal_admin_menu.admin.inc | 103 + .../adminimal_admin_menu.css | 101 +- .../adminimal_admin_menu.info | 7 +- .../adminimal_admin_menu.install | 16 +- .../adminimal_admin_menu.module | 230 +- .../adminimal_menu_settings.inc | 101 - .../modules/adminimal_admin_menu/credits.txt | 2 - .../adminimal_admin_menu/images/home.png | Bin 1347 -> 562 bytes .../adminimal_admin_menu/images/shortcut.png | Bin 1478 -> 699 bytes .../adminimal_admin_menu/images/square.png | Bin 964 -> 171 bytes .../js/adminimal_admin_menu.js | 87 +- .../slicknav/jquery-no-conflict.slicknav.js | 850 +- .../js/slicknav/jquery.slicknav.js | 858 +- .../js/slicknav/slicknav.css | 389 +- .../updates/update_7100.php | 18 - sites/all/modules/advanced_help/ASSETS.yml | 32 + .../modules/advanced_help/advanced_help.info | 14 +- .../advanced_help/advanced_help.module | 34 +- .../all/modules/advanced_help/help/.htaccess | 4 + .../modules/advanced_help/help/readme.html | 6 +- .../advanced_help/help/translation.html | 2 +- .../advanced_help/help/why-advanced-help.html | 2 +- .../advanced_help/help_example/ASSETS.yml | 37 + .../advanced_help/help_example/help/.htaccess | 4 + .../help_example/help_example.info | 36 +- .../help/nb/why-advanced-help.html | 4 +- sites/all/modules/apc/README.txt | 62 - sites/all/modules/apc/apc.drush.inc | 11 - sites/all/modules/apc/apc.info | 14 - sites/all/modules/apc/apc.install | 63 - sites/all/modules/apc/apc.module | 171 - sites/all/modules/apc/drupal_apc_cache.inc | 340 - sites/all/modules/apc/tests/apc.test | 386 - sites/all/modules/apc_status/README.txt | 35 - .../modules/apc_status/apc_status.admin.inc | 34 - sites/all/modules/apc_status/apc_status.info | 12 - .../all/modules/apc_status/apc_status.install | 23 - .../all/modules/apc_status/apc_status.module | 33 - sites/all/modules/barcode/LICENSE.txt | 339 - sites/all/modules/barcode/README.txt | 36 - sites/all/modules/barcode/barcode.info | 31 - sites/all/modules/barcode/barcode.install | 92 - sites/all/modules/barcode/barcode.module | 434 - sites/all/modules/barcode/fonts/DroidSans.ttf | Bin 41028 -> 0 bytes .../barcode/includes/barcode.admin.inc | 40 - .../barcode/includes/barcode.plugins.inc | 132 - .../barcode_example/barcode_example.info | 12 - .../barcode_example/barcode_example.module | 45 - sites/all/modules/barcode/plugins/codabar.inc | 146 - sites/all/modules/barcode/plugins/code128.inc | 175 - sites/all/modules/barcode/plugins/code39.inc | 220 - sites/all/modules/barcode/plugins/code93.inc | 202 - sites/all/modules/barcode/plugins/ean.inc | 234 - sites/all/modules/barcode/plugins/ean8.inc | 140 - sites/all/modules/barcode/plugins/i25.inc | 149 - sites/all/modules/barcode/plugins/postnet.inc | 128 - sites/all/modules/barcode/plugins/qrcode.inc | 24 - sites/all/modules/barcode/plugins/s2o5.inc | 135 - sites/all/modules/barcode/plugins/upce.inc | 192 - sites/all/modules/beautytips/README.txt | 12 +- .../modules/beautytips/beautytips.admin.inc | 161 +- sites/all/modules/beautytips/beautytips.info | 11 +- .../all/modules/beautytips/beautytips.install | 10 +- .../all/modules/beautytips/beautytips.module | 196 +- .../beautytips/beautytips_manager.admin.inc | 260 +- .../beautytips/beautytips_manager.info | 7 +- .../beautytips/beautytips_manager.install | 192 +- .../beautytips/beautytips_manager.module | 151 +- .../all/modules/beautytips/beautytips_ui.info | 11 +- .../modules/beautytips/beautytips_ui.module | 50 +- .../all/modules/beautytips/css/beautytips.css | 12 +- .../beautytips/includes/drupal_help.inc | 41 +- .../modules/beautytips/includes/textinput.inc | 63 +- sites/all/modules/beautytips/js/beautytips.js | 84 +- .../modules/beautytips/js/beautytips.min.js | 2 +- .../modules/beautytips/js/bt_admin_page.js | 35 +- .../modules/beautytips/js/bt_custom_styles.js | 46 +- sites/all/modules/beautytips/js/jquery.bt.css | 1 - sites/all/modules/beautytips/js/jquery.bt.js | 1097 ++- .../modules/beautytips/js/jquery.bt.min.js | 6 +- .../colorpicker/css/colorpicker.css | 322 +- .../other_libs/colorpicker/css/layout.css | 436 +- .../other_libs/colorpicker/images/Thumbs.db | Bin .../other_libs/colorpicker/images/blank.gif | Bin .../images/colorpicker_background.png | Bin .../colorpicker/images/colorpicker_hex.png | Bin .../colorpicker/images/colorpicker_hsb_b.png | Bin .../colorpicker/images/colorpicker_hsb_h.png | Bin .../colorpicker/images/colorpicker_hsb_s.png | Bin .../colorpicker/images/colorpicker_indic.gif | Bin .../images/colorpicker_overlay.png | Bin .../colorpicker/images/colorpicker_rgb_b.png | Bin .../colorpicker/images/colorpicker_rgb_g.png | Bin .../colorpicker/images/colorpicker_rgb_r.png | Bin .../colorpicker/images/colorpicker_select.gif | Bin .../colorpicker/images/colorpicker_submit.png | Bin .../colorpicker/images/custom_background.png | Bin .../colorpicker/images/custom_hex.png | Bin .../colorpicker/images/custom_hsb_b.png | Bin .../colorpicker/images/custom_hsb_h.png | Bin .../colorpicker/images/custom_hsb_s.png | Bin .../colorpicker/images/custom_indic.gif | Bin .../colorpicker/images/custom_rgb_b.png | Bin .../colorpicker/images/custom_rgb_g.png | Bin .../colorpicker/images/custom_rgb_r.png | Bin .../colorpicker/images/custom_submit.png | Bin .../other_libs/colorpicker/images/select.png | Bin .../other_libs/colorpicker/images/select2.png | Bin .../other_libs/colorpicker/images/slider.png | Bin .../other_libs/colorpicker/index.html | 368 +- .../other_libs/colorpicker/js/colorpicker.js | 966 +- .../other_libs/colorpicker/js/eye.js | 68 +- .../other_libs/colorpicker/js/jquery.js | 8752 ++++++++--------- .../other_libs/colorpicker/js/layout.js | 132 +- .../other_libs/colorpicker/js/utils.js | 502 +- .../beautytips/other_libs/excanvas_r3/AUTHORS | 10 - .../beautytips/other_libs/excanvas_r3/COPYING | 202 - .../beautytips/other_libs/excanvas_r3/README | 22 - .../excanvas_r3/examples/.svn/all-wcprops | 29 - .../excanvas_r3/examples/.svn/entries | 164 - .../excanvas_r3/examples/.svn/format | 1 - .../examples/.svn/prop-base/ff.jpg.svn-base | 5 - .../.svn/text-base/example1.html.svn-base | 93 - .../.svn/text-base/example2.html.svn-base | 513 - .../.svn/text-base/example3.html.svn-base | 284 - .../examples/.svn/text-base/ff.jpg.svn-base | Bin 25286 -> 0 bytes .../excanvas_r3/examples/example1.html | 93 - .../excanvas_r3/examples/example2.html | 513 - .../excanvas_r3/examples/example3.html | 284 - .../other_libs/excanvas_r3/examples/ff.jpg | Bin 25286 -> 0 bytes .../excanvas_r3/excanvas.compiled.js | 35 - .../other_libs/excanvas_r3/excanvas.js | 924 -- .../excanvas_r3/testcases/.svn/all-wcprops | 77 - .../excanvas_r3/testcases/.svn/entries | 436 - .../excanvas_r3/testcases/.svn/format | 1 - .../.svn/prop-base/overflow.html.svn-base | 9 - .../.svn/text-base/arc.html.svn-base | 49 - .../.svn/text-base/clearpath.html.svn-base | 49 - .../.svn/text-base/drawimage.html.svn-base | 36 - .../.svn/text-base/gradient.html.svn-base | 39 - .../.svn/text-base/gradient2.html.svn-base | 41 - .../.svn/text-base/linewidth.html.svn-base | 47 - .../.svn/text-base/overflow.html.svn-base | 37 - .../text-base/quadraticcurve.html.svn-base | 56 - .../.svn/text-base/resizing.html.svn-base | 65 - .../text-base/saverestorepath.html.svn-base | 48 - .../stroke-scale-rotate.html.svn-base | 80 - ...stroke-should-not-close-path.html.svn-base | 38 - .../other_libs/excanvas_r3/testcases/arc.html | 49 - .../excanvas_r3/testcases/clearpath.html | 49 - .../excanvas_r3/testcases/drawimage.html | 36 - .../excanvas_r3/testcases/gradient.html | 39 - .../excanvas_r3/testcases/gradient2.html | 41 - .../excanvas_r3/testcases/linewidth.html | 47 - .../excanvas_r3/testcases/overflow.html | 37 - .../excanvas_r3/testcases/quadraticcurve.html | 56 - .../excanvas_r3/testcases/resizing.html | 65 - .../testcases/saverestorepath.html | 48 - .../testcases/stroke-scale-rotate.html | 80 - .../stroke-should-not-close-path.html | 38 - .../beautytips/other_libs/jquery-1.3.2.js | 288 +- sites/all/modules/ctools/CHANGELOG.txt | 82 - sites/all/modules/ctools/UPGRADE.txt | 2 +- .../ctools/bulk_export/bulk_export.info | 7 +- .../ctools/bulk_export/bulk_export.module | 5 +- sites/all/modules/ctools/css/button.css | 4 +- .../modules/ctools/css/collapsible-div.css | 5 +- sites/all/modules/ctools/css/ctools.css | 4 +- sites/all/modules/ctools/css/dropbutton.css | 1 - sites/all/modules/ctools/css/dropdown.css | 6 +- sites/all/modules/ctools/css/modal.css | 2 +- sites/all/modules/ctools/css/stylizer.css | 6 +- sites/all/modules/ctools/css/wizard.css | 1 - sites/all/modules/ctools/ctools.api.php | 54 +- sites/all/modules/ctools/ctools.info | 9 +- sites/all/modules/ctools/ctools.install | 78 +- sites/all/modules/ctools/ctools.module | 214 +- .../ctools_access_ruleset.info | 6 +- .../ctools_access_ruleset.install | 4 + .../ctools_access_ruleset.module | 6 +- .../plugins/access/ruleset.inc | 5 +- .../export_ui/ctools_access_ruleset.inc | 5 +- .../ctools_access_ruleset_ui.class.php | 9 +- .../css/ctools-ajax-sample.css | 151 +- .../ctools_ajax_sample.info | 6 +- .../ctools_ajax_sample.install | 6 +- .../ctools_ajax_sample.module | 136 +- .../ctools_custom_content.info | 6 +- .../ctools_custom_content.install | 4 + .../ctools_custom_content.module | 8 +- .../export_ui/ctools_custom_content.inc | 5 +- .../ctools_custom_content_ui.class.php | 20 +- .../ctools/ctools_plugin_example/README.txt | 2 +- .../ctools_plugin_example.info | 6 +- .../ctools_plugin_example.module | 12 +- .../ctools_plugin_example.pages_default.inc | 166 +- .../plugins/access/arg_length.inc | 7 +- .../plugins/access/example_role.inc | 3 +- .../plugins/arguments/simplecontext_arg.inc | 7 +- .../content_types/no_context_content_type.inc | 6 +- .../content_types/relcontext_content_type.inc | 7 +- .../simplecontext_content_type.inc | 5 +- .../plugins/contexts/relcontext.inc | 1 - .../plugins/contexts/simplecontext.inc | 12 +- .../plugins/panels.pages.inc | 137 +- .../relcontext_from_simplecontext.inc | 4 - .../all/modules/ctools/drush/ctools.drush.inc | 77 +- sites/all/modules/ctools/help/export.html | 2 +- sites/all/modules/ctools/help/modal.html | 4 +- .../modules/ctools/help/plugins-creating.html | 3 +- .../ctools/includes/action-links.theme.inc | 3 +- sites/all/modules/ctools/includes/ajax.inc | 21 +- sites/all/modules/ctools/includes/cache.inc | 9 +- .../modules/ctools/includes/cleanstring.inc | 21 +- .../ctools/includes/collapsible.theme.inc | 9 +- sites/all/modules/ctools/includes/content.inc | 48 +- .../modules/ctools/includes/content.menu.inc | 15 +- .../ctools/includes/content.plugin-type.inc | 2 +- .../ctools/includes/context-access-admin.inc | 20 +- .../modules/ctools/includes/context-admin.inc | 8 +- .../ctools/includes/context-task-handler.inc | 55 +- sites/all/modules/ctools/includes/context.inc | 936 +- .../modules/ctools/includes/context.menu.inc | 2 +- .../modules/ctools/includes/context.theme.inc | 44 +- sites/all/modules/ctools/includes/css.inc | 19 +- .../all/modules/ctools/includes/dependent.inc | 9 +- .../ctools/includes/dropbutton.theme.inc | 16 +- .../ctools/includes/dropdown.theme.inc | 42 +- .../modules/ctools/includes/entity-access.inc | 6 +- .../all/modules/ctools/includes/export-ui.inc | 10 +- .../ctools/includes/export-ui.menu.inc | 4 + .../ctools/includes/export-ui.plugin-type.inc | 2 +- sites/all/modules/ctools/includes/export.inc | 40 +- sites/all/modules/ctools/includes/fields.inc | 52 +- .../all/modules/ctools/includes/jump-menu.inc | 3 +- .../all/modules/ctools/includes/language.inc | 7 +- .../all/modules/ctools/includes/math-expr.inc | 5 +- sites/all/modules/ctools/includes/modal.inc | 16 +- .../modules/ctools/includes/object-cache.inc | 29 +- .../modules/ctools/includes/page-wizard.inc | 6 +- .../modules/ctools/includes/plugins-admin.inc | 11 +- sites/all/modules/ctools/includes/plugins.inc | 115 +- .../all/modules/ctools/includes/registry.inc | 1 - .../all/modules/ctools/includes/stylizer.inc | 14 +- .../ctools/includes/stylizer.theme.inc | 1 - sites/all/modules/ctools/includes/utility.inc | 2 +- sites/all/modules/ctools/includes/uuid.inc | 1 + sites/all/modules/ctools/includes/views.inc | 4 + sites/all/modules/ctools/includes/wizard.inc | 42 +- sites/all/modules/ctools/js/modal.js | 17 +- .../ctools/page_manager/css/page-manager.css | 12 +- .../page_manager/page_manager.admin.inc | 6 +- .../ctools/page_manager/page_manager.info | 8 +- .../ctools/page_manager/page_manager.module | 29 +- .../plugins/cache/page_manager_context.inc | 4 +- .../plugins/task_handlers/http_response.inc | 13 +- .../page_manager/plugins/tasks/blog.inc | 9 +- .../page_manager/plugins/tasks/blog_user.inc | 9 +- .../plugins/tasks/comment_reply.inc | 16 +- .../plugins/tasks/contact_site.inc | 9 +- .../plugins/tasks/contact_user.inc | 9 +- .../page_manager/plugins/tasks/node_edit.inc | 9 +- .../page_manager/plugins/tasks/node_view.inc | 24 +- .../page_manager/plugins/tasks/page.admin.inc | 51 +- .../page_manager/plugins/tasks/page.inc | 35 +- .../page_manager/plugins/tasks/poll.inc | 9 +- .../page_manager/plugins/tasks/search.inc | 24 +- .../page_manager/plugins/tasks/term_view.inc | 20 +- .../page_manager/plugins/tasks/user_edit.inc | 14 +- .../page_manager/plugins/tasks/user_view.inc | 8 +- .../ctools/page_manager/tests/head_links.test | 77 + .../theme/page-manager-edit-page.tpl.php | 5 +- .../page_manager/theme/page_manager.theme.inc | 8 +- .../ctools/plugins/access/compare_users.inc | 6 +- .../ctools/plugins/access/context_exists.inc | 10 +- .../ctools/plugins/access/entity_bundle.inc | 3 +- .../plugins/access/entity_field_value.inc | 21 +- .../modules/ctools/plugins/access/front.inc | 2 +- .../ctools/plugins/access/node_access.inc | 3 +- .../ctools/plugins/access/node_comment.inc | 1 + .../ctools/plugins/access/node_language.inc | 3 +- .../ctools/plugins/access/node_status.inc | 1 - .../ctools/plugins/access/node_type.inc | 3 +- .../ctools/plugins/access/path_visibility.inc | 4 +- .../modules/ctools/plugins/access/perm.inc | 5 +- .../all/modules/ctools/plugins/access/php.inc | 4 +- .../plugins/access/query_string_exists.inc | 2 +- .../modules/ctools/plugins/access/role.inc | 3 +- .../ctools/plugins/access/site_language.inc | 3 +- .../ctools/plugins/access/string_equal.inc | 15 +- .../ctools/plugins/access/string_length.inc | 5 + .../modules/ctools/plugins/access/term.inc | 9 +- .../ctools/plugins/access/term_has_parent.inc | 38 +- .../ctools/plugins/access/term_parent.inc | 2 +- .../ctools/plugins/access/term_vocabulary.inc | 10 +- .../modules/ctools/plugins/access/theme.inc | 6 +- .../ctools/plugins/arguments/entity_id.inc | 1 - .../modules/ctools/plugins/arguments/nid.inc | 4 +- .../ctools/plugins/arguments/node_add.inc | 6 +- .../ctools/plugins/arguments/node_edit.inc | 6 +- .../modules/ctools/plugins/arguments/rid.inc | 4 +- .../ctools/plugins/arguments/string.inc | 14 +- .../modules/ctools/plugins/arguments/term.inc | 16 +- .../ctools/plugins/arguments/terms.inc | 8 +- .../modules/ctools/plugins/arguments/uid.inc | 8 +- .../ctools/plugins/arguments/user_edit.inc | 11 +- .../ctools/plugins/arguments/user_name.inc | 8 +- .../modules/ctools/plugins/arguments/vid.inc | 6 +- .../ctools/plugins/cache/export_ui.inc | 2 +- .../modules/ctools/plugins/cache/simple.inc | 2 +- .../plugins/content_types/block/block.inc | 82 +- .../content_types/comment/comment_created.inc | 4 +- .../content_types/comment/comment_links.inc | 4 +- .../comment/comment_reply_form.inc | 14 +- .../plugins/content_types/contact/contact.inc | 17 +- .../content_types/contact/user_contact.inc | 17 +- .../plugins/content_types/custom/custom.inc | 19 +- .../entity_context/entity_field.inc | 30 +- .../entity_context/entity_field_extra.inc | 6 +- .../content_types/form/entity_form_field.inc | 19 +- .../plugins/content_types/form/form.inc | 8 +- .../plugins/content_types/node/node.inc | 9 +- .../node_context/node_attachments.inc | 5 +- .../node_context/node_author.inc | 4 +- .../content_types/node_context/node_body.inc | 4 +- .../node_context/node_book_children.inc | 6 +- .../node_context/node_book_menu.inc | 18 +- .../node_context/node_book_nav.inc | 8 +- .../node_context/node_comment_form.inc | 20 +- .../node_context/node_comment_wrapper.inc | 11 +- .../node_context/node_comments.inc | 23 +- .../node_context/node_content.inc | 11 +- .../node_context/node_created.inc | 6 +- .../content_types/node_context/node_links.inc | 5 +- .../content_types/node_context/node_terms.inc | 14 +- .../content_types/node_context/node_title.inc | 10 +- .../node_context/node_type_desc.inc | 10 +- .../node_context/node_updated.inc | 4 +- .../node_form/node_form_attachments.inc | 6 +- .../node_form/node_form_author.inc | 4 +- .../node_form/node_form_book.inc | 6 +- .../node_form/node_form_buttons.inc | 4 +- .../node_form/node_form_comment.inc | 6 +- .../node_form/node_form_language.inc | 6 +- .../content_types/node_form/node_form_log.inc | 4 +- .../node_form/node_form_menu.inc | 6 +- .../node_form/node_form_path.inc | 6 +- .../node_form/node_form_publishing.inc | 2 +- .../node_form/node_form_title.inc | 4 +- .../plugins/content_types/page/page_help.inc | 1 - .../plugins/content_types/page/page_logo.inc | 2 +- .../content_types/page/page_messages.inc | 1 - .../content_types/page/page_site_name.inc | 2 +- .../plugins/content_types/page/page_tabs.inc | 2 +- .../plugins/content_types/page/page_title.inc | 5 +- .../content_types/search/search_form.inc | 13 +- .../content_types/search/search_result.inc | 13 +- .../term_context/term_description.inc | 4 +- .../content_types/term_context/term_list.inc | 7 +- .../content_types/term_context/term_name.inc | 9 +- .../plugins/content_types/token/token.inc | 15 +- .../user_context/profile_fields.inc | 15 +- .../user_context/profile_fields_pane.tpl.php | 1 + .../content_types/user_context/user_links.inc | 4 +- .../user_context/user_picture.inc | 9 +- .../user_context/user_profile.inc | 3 +- .../user_context/user_signature.inc | 6 +- .../vocabulary_context/vocabulary_terms.inc | 11 +- .../ctools/plugins/contexts/entity.inc | 11 +- .../ctools/plugins/contexts/language.inc | 169 + .../modules/ctools/plugins/contexts/node.inc | 5 +- .../ctools/plugins/contexts/node_add_form.inc | 15 +- .../plugins/contexts/node_edit_form.inc | 11 +- .../ctools/plugins/contexts/query_string.inc | 5 +- .../ctools/plugins/contexts/string.inc | 8 +- .../modules/ctools/plugins/contexts/term.inc | 9 +- .../modules/ctools/plugins/contexts/terms.inc | 11 +- .../modules/ctools/plugins/contexts/token.inc | 30 +- .../modules/ctools/plugins/contexts/user.inc | 5 +- .../plugins/contexts/user_edit_form.inc | 9 +- .../ctools/plugins/contexts/vocabulary.inc | 3 +- .../export_ui/ctools_export_ui.class.php | 115 +- .../plugins/export_ui/ctools_export_ui.inc | 2 + .../relationships/entity_from_field.inc | 2 +- .../entity_from_query_string.inc | 2 +- .../relationships/entity_from_schema.inc | 2 +- .../plugins/relationships/term_parent.inc | 2 +- .../plugins/relationships/terms_from_node.inc | 20 +- .../user_category_edit_form_from_user.inc | 4 +- .../stylizer/plugins/export_ui/stylizer.inc | 5 +- .../plugins/export_ui/stylizer_ui.class.php | 53 +- .../all/modules/ctools/stylizer/stylizer.info | 6 +- .../modules/ctools/stylizer/stylizer.install | 4 + .../modules/ctools/stylizer/stylizer.module | 12 +- .../term_depth/plugins/access/term_depth.inc | 6 +- .../modules/ctools/term_depth/term_depth.info | 6 +- .../ctools/term_depth/term_depth.module | 4 + sites/all/modules/ctools/tests/context.test | 322 +- sites/all/modules/ctools/tests/css.test | 80 +- sites/all/modules/ctools/tests/css_cache.test | 14 +- .../all/modules/ctools/tests/ctools.drush.sh | 0 .../modules/ctools/tests/ctools.plugins.test | 74 +- sites/all/modules/ctools/tests/ctools.test | 239 + .../ctools_export_test/ctools_export.test | 42 +- ...xport_test.default_ctools_export_tests.inc | 4 + .../ctools_export_test.info | 6 +- .../ctools_export_test.install | 12 +- .../ctools_export_test.module | 4 + .../ctools/tests/ctools_plugin_test.info | 12 +- .../ctools/tests/ctools_plugin_test.module | 38 +- .../modules/ctools/tests/math_expression.test | 36 +- .../ctools/tests/math_expression_stack.test | 32 +- .../modules/ctools/tests/object_cache.test | 25 +- .../ctools/tests/object_cache_unit.test | 141 + .../all/modules/ctools/tests/page_tokens.test | 136 + .../cached/ctoolsCachedPluginArray.class.php | 1 + .../cached/ctoolsCachedPluginArray2.class.php | 1 + .../tests/plugins/cached/plugin_array.inc | 4 +- .../tests/plugins/cached/plugin_array2.inc | 4 +- .../tests/plugins/cached/plugin_array_dne.inc | 1 + .../ctoolsNotCachedPluginArray.class.php | 1 + .../ctoolsNotCachedPluginArray2.class.php | 1 + .../tests/plugins/not_cached/plugin_array.inc | 4 +- .../plugins/not_cached/plugin_array2.inc | 4 +- .../plugins/not_cached/plugin_array_dne.inc | 1 + .../plugins/content_types/views.inc | 19 +- .../content_types/views_attachments.inc | 3 +- .../plugins/content_types/views_empty.inc | 2 +- .../plugins/content_types/views_exposed.inc | 2 +- .../plugins/content_types/views_feed.inc | 2 +- .../plugins/content_types/views_footer.inc | 2 +- .../plugins/content_types/views_header.inc | 2 +- .../plugins/content_types/views_pager.inc | 2 +- .../plugins/content_types/views_panes.inc | 149 +- .../plugins/content_types/views_row.inc | 4 +- .../plugins/content_types/views_view.inc | 2 +- .../views_content/plugins/contexts/view.inc | 9 +- .../relationships/view_from_argument.inc | 4 +- .../plugins/views/views_content.views.inc | 2 +- ..._content_plugin_display_ctools_context.inc | 40 +- ...iews_content_plugin_display_panel_pane.inc | 191 +- ...ws_content_plugin_style_ctools_context.inc | 5 +- .../ctools/views_content/views_content.info | 6 +- .../ctools/views_content/views_content.module | 29 +- sites/all/modules/devel/devel-rtl.css | 7 +- sites/all/modules/devel/devel.admin.inc | 105 +- sites/all/modules/devel/devel.css | 5 + sites/all/modules/devel/devel.drush.inc | 15 +- sites/all/modules/devel/devel.info | 7 +- sites/all/modules/devel/devel.install | 35 +- sites/all/modules/devel/devel.js | 23 +- sites/all/modules/devel/devel.mail.inc | 50 +- sites/all/modules/devel/devel.module | 353 +- sites/all/modules/devel/devel.pages.inc | 193 +- sites/all/modules/devel/devel.rules.inc | 5 + sites/all/modules/devel/devel.test | 6 + sites/all/modules/devel/develDrushTest.php | 23 +- .../devel/devel_generate/devel_generate.inc | 39 +- .../devel/devel_generate/devel_generate.info | 7 +- .../devel_generate/devel_generate.module | 17 +- .../devel_generate/devel_generate_batch.inc | 22 +- .../devel_generate/file.devel_generate.inc | 21 +- .../devel_generate/image.devel_generate.inc | 22 +- .../devel_generate/text.devel_generate.inc | 7 +- sites/all/modules/devel/devel_krumo.css | 11 + .../{devel_krumo_path.js => devel_krumo.js} | 35 +- .../modules/devel/devel_node_access.api.php | 16 +- .../all/modules/devel/devel_node_access.info | 7 +- .../modules/devel/devel_node_access.install | 5 + sites/all/modules/devel/devel_node_access.js | 7 +- .../modules/devel/devel_node_access.module | 198 +- sites/all/modules/devel/krumo/INSTALL | 64 +- sites/all/modules/devel/krumo/LICENSE | 1008 +- sites/all/modules/devel/krumo/README | 206 +- sites/all/modules/devel/krumo/TODO | 48 +- sites/all/modules/devel/krumo/class.krumo.php | 76 +- .../krumo/docs/Krumo/_class.krumo.php.html | 535 +- .../modules/devel/krumo/docs/Krumo/krumo.html | 1801 ++-- sites/all/modules/devel/krumo/docs/blank.html | 26 +- .../devel/krumo/docs/classtrees_Krumo.html | 43 +- .../devel/krumo/docs/elementindex.html | 786 +- .../devel/krumo/docs/elementindex_Krumo.html | 780 +- .../all/modules/devel/krumo/docs/errors.html | 31 +- sites/all/modules/devel/krumo/docs/index.html | 48 +- .../modules/devel/krumo/docs/li_Krumo.html | 311 +- .../modules/devel/krumo/docs/media/banner.css | 64 +- .../images/{Interface.PNG => Interface.png} | Bin .../devel/krumo/docs/media/lib/classTree.js | 908 +- .../devel/krumo/docs/media/stylesheet.css | 362 +- .../modules/devel/krumo/docs/packages.html | 80 +- .../modules/devel/krumo/docs/ric_INSTALL.html | 99 +- .../modules/devel/krumo/docs/ric_LICENSE.html | 1045 +- .../modules/devel/krumo/docs/ric_README.html | 243 +- .../modules/devel/krumo/docs/ric_TODO.html | 83 +- .../modules/devel/krumo/docs/ric_VERSION.html | 37 +- sites/all/modules/devel/krumo/krumo.ini | 40 +- sites/all/modules/devel/krumo/krumo.js | 194 +- .../modules/devel/krumo/skins/blue/skin.css | 316 +- .../devel/krumo/skins/default/skin.css | 316 +- .../modules/devel/krumo/skins/green/skin.css | 316 +- .../modules/devel/krumo/skins/orange/skin.css | 316 +- .../modules/devel/krumo/skins/white/skin.css | 330 +- sites/all/modules/devel/runtests.sh | 0 sites/all/modules/ds/ds.info | 7 +- sites/all/modules/ds/ds.install | 3 + sites/all/modules/ds/ds.module | 112 +- .../modules/ds/modules/ds_devel/ds_devel.info | 7 +- .../ds/modules/ds_extras/ds_extras.info | 7 +- .../ds_extras/includes/ds_extras.pages.inc | 5 + .../ds/modules/ds_format/ds_format.info | 7 +- .../modules/ds/modules/ds_forms/ds_forms.info | 7 +- .../ds/modules/ds_search/ds_search.info | 7 +- sites/all/modules/ds/modules/ds_ui/ds_ui.info | 7 +- .../ds/modules/ds_ui/includes/ds.fields.inc | 7 + .../ds_exportables_test.info | 7 +- sites/all/modules/ds/tests/ds_test.info | 7 +- sites/all/modules/entity/entity.info | 6 +- sites/all/modules/entity/entity.module | 7 +- sites/all/modules/entity/entity_token.info | 6 +- .../entity/includes/entity.wrapper.inc | 6 +- .../all/modules/entity/modules/callbacks.inc | 2 +- .../modules/entity/tests/entity_feature.info | 6 +- .../all/modules/entity/tests/entity_test.info | 6 +- .../entity/tests/entity_test_i18n.info | 6 +- .../entity_views_handler_area_entity.inc | 32 +- sites/all/modules/eva/README.txt | 0 .../eva/eva-display-entity-view.tpl.php | 0 sites/all/modules/eva/eva.info | 6 +- sites/all/modules/eva/eva.module | 149 +- sites/all/modules/eva/eva.theme.inc | 3 + sites/all/modules/eva/eva.views.inc | 0 .../modules/eva/eva_plugin_display_entity.inc | 78 +- .../filefield_sources/filefield_sources.info | 6 +- .../filefield_sources/filefield_sources.js | 2 +- .../filefield_sources.module | 24 +- .../filefield_sources/sources/attach.inc | 5 +- .../filefield_sources/sources/clipboard.inc | 4 +- .../filefield_sources/sources/reference.inc | 4 +- .../filefield_sources/sources/remote.inc | 47 +- sites/all/modules/globalredirect/README.txt | 39 + .../globalredirect/globalredirect.admin.inc | 10 +- .../globalredirect/globalredirect.info | 6 +- .../globalredirect/globalredirect.module | 58 +- .../globalredirect/globalredirect.test | 20 - sites/all/modules/honeypot/README.md | 58 + sites/all/modules/honeypot/README.txt | 43 - sites/all/modules/honeypot/docker-compose.yml | 32 + sites/all/modules/honeypot/honeypot.admin.inc | 22 +- sites/all/modules/honeypot/honeypot.info | 6 +- sites/all/modules/honeypot/honeypot.install | 4 +- sites/all/modules/honeypot/honeypot.module | 119 +- sites/all/modules/honeypot/honeypot.test | 21 + sites/all/modules/honeypot/js/honeypot.js | 37 + .../modules/honeypot/tests/honeypot_test.info | 6 +- .../htmlpurifier/plugins/phorum/settings.php | 64 - .../modules/htmlpurifier/smoketests/all.php | 44 - .../htmlpurifier/smoketests/configForm.php | 77 - sites/all/modules/i18n/i18n.info | 7 +- .../modules/i18n/i18n_block/i18n_block.info | 7 +- .../i18n/i18n_contact/i18n_contact.info | 7 +- .../i18n/i18n_field/i18n_field.i18n.inc | 2 +- .../modules/i18n/i18n_field/i18n_field.info | 7 +- .../modules/i18n/i18n_field/i18n_field.module | 3 + .../modules/i18n/i18n_forum/i18n_forum.info | 7 +- .../all/modules/i18n/i18n_menu/i18n_menu.info | 7 +- .../all/modules/i18n/i18n_node/i18n_node.info | 7 +- .../modules/i18n/i18n_node/i18n_node.module | 15 +- .../all/modules/i18n/i18n_path/i18n_path.info | 7 +- .../i18n/i18n_redirect/i18n_redirect.info | 7 +- .../modules/i18n/i18n_select/i18n_select.info | 7 +- .../modules/i18n/i18n_string/i18n_string.info | 7 +- .../i18n/i18n_string/i18n_string.module | 16 +- .../modules/i18n/i18n_string/i18n_string.test | 2 +- .../i18n/i18n_string/i18n_string.variable.inc | 54 +- .../all/modules/i18n/i18n_sync/i18n_sync.info | 7 +- .../modules/i18n/i18n_sync/i18n_sync.module | 30 +- .../i18n/i18n_taxonomy/i18n_taxonomy.info | 7 +- .../i18n/i18n_taxonomy/i18n_taxonomy.module | 24 +- .../i18n_taxonomy/i18n_taxonomy.tokens.inc | 10 + .../i18n_translation/i18n_translation.info | 7 +- .../all/modules/i18n/i18n_user/i18n_user.info | 7 +- .../modules/i18n/i18n_user/i18n_user.module | 7 +- .../i18n/i18n_variable/i18n_variable.info | 7 +- sites/all/modules/i18n/tests/i18n_test.info | 7 +- sites/all/modules/i18n/tests/i18n_test.module | 2 +- .../modules/imagecache_actions/CHANGELOG.txt | 23 + .../autorotate/imagecache_autorotate.info | 6 +- .../autorotate/imagecache_autorotate.module | 18 +- .../canvasactions/canvasactions.inc | 492 +- .../imagecache_canvasactions.info | 6 +- .../imagecache_canvasactions.module | 16 + .../cheap_dropshadow.imagecache_preset.inc | 2 +- .../coloractions/imagecache_coloractions.info | 6 +- .../imagecache_coloractions.module | 246 +- .../customactions/README.txt | 55 +- .../imagecache_customactions.info | 6 +- .../imagecache_customactions.module | 8 +- .../image_effects_text/README.txt | 17 +- .../image_effects_text/image_effects_text.inc | 216 +- .../image_effects_text.info | 6 +- .../image_effects_text_test.info | 6 +- .../image_styles_admin.info | 6 +- .../image_styles_admin.module | 8 +- .../imagecache_actions.info | 6 +- .../tests/imagecache_testsuite.info | 6 +- .../modules/imagecache_actions/utility.inc | 95 +- sites/all/modules/imce/tpl/imce-page.tpl.php | 21 - .../modules/job_scheduler/JobScheduler.inc | 41 +- .../job_scheduler/JobSchedulerCronTab.inc | 162 +- sites/all/modules/job_scheduler/README.txt | 157 +- .../job_scheduler/job_scheduler.api.php | 10 +- .../modules/job_scheduler/job_scheduler.info | 9 +- .../job_scheduler/job_scheduler.install | 29 +- .../job_scheduler/job_scheduler.module | 158 +- .../modules/job_scheduler_trigger/README.md | 61 +- .../job_scheduler_trigger.admin.inc | 37 +- .../job_scheduler_trigger.info | 10 +- .../job_scheduler_trigger.install | 9 +- .../job_scheduler_trigger.module | 33 +- sites/all/modules/media/LICENSE.txt | 339 - sites/all/modules/media/README.txt | 28 - sites/all/modules/media/css/media.css | 156 - .../default/application-octet-stream.png | Bin 1520 -> 0 bytes .../media/images/icons/default/audio-mpeg.png | Bin 1770 -> 0 bytes .../images/icons/default/audio-x-generic.png | Bin 1770 -> 0 bytes .../images/icons/default/file-unknown.png | Bin 1522 -> 0 bytes .../images/icons/default/image-x-generic.png | Bin 1166 -> 0 bytes .../images/icons/default/video-x-generic.png | Bin 1828 -> 0 bytes .../media/includes/MediaBrowserPlugin.inc | 86 - .../includes/MediaBrowserPluginInterface.inc | 44 - .../media/includes/MediaBrowserUpload.inc | 32 - .../media/includes/MediaBrowserView.inc | 56 - .../MediaEntityTranslationHandler.inc | 68 - .../includes/MediaReadOnlyStreamWrapper.inc | 476 - .../modules/media/includes/media.admin.inc | 136 - .../modules/media/includes/media.browser.inc | 254 - .../modules/media/includes/media.fields.inc | 689 -- .../modules/media/includes/media.pages.inc | 56 - .../modules/media/includes/media.theme.inc | 102 - ...dia_views_plugin_display_media_browser.inc | 19 - ...media_views_plugin_style_media_browser.inc | 55 - sites/all/modules/media/js/media.admin.js | 77 - sites/all/modules/media/js/media.browser.js | 149 - sites/all/modules/media/js/media.core.js | 21 - sites/all/modules/media/js/media.js | 156 - sites/all/modules/media/js/media.popups.js | 446 - .../modules/media/js/plugins/media.views.js | 221 - .../all/modules/media/js/util/ba-debug.min.js | 12 - sites/all/modules/media/js/util/json2.js | 481 - .../media-views-view-media-browser.tpl.php | 23 - sites/all/modules/media/media.api.php | 137 - .../media/media.file_default_displays.inc | 69 - sites/all/modules/media/media.info | 32 - sites/all/modules/media/media.install | 1229 --- sites/all/modules/media/media.media.inc | 131 - sites/all/modules/media/media.module | 1450 --- sites/all/modules/media/media.views.inc | 144 - .../includes/MediaBrowserBulkUpload.inc | 30 - .../includes/media_bulk_upload.admin.inc | 165 - .../includes/media_bulk_upload.pages.inc | 95 - .../media_bulk_upload/media_bulk_upload.info | 23 - .../media_bulk_upload.install | 14 - .../media_bulk_upload.module | 259 - .../tests/media_bulk_upload.test | 105 - .../includes/MediaBrowserInternet.inc | 32 - .../includes/MediaInternetBaseHandler.inc | 77 - .../includes/MediaInternetFileHandler.inc | 67 - .../MediaInternetNoHandlerException.inc | 13 - .../MediaInternetValidationException.inc | 13 - .../media_internet/media_internet.api.php | 47 - .../media_internet/media_internet.info | 20 - .../media_internet/media_internet.install | 21 - .../media_internet/media_internet.media.inc | 35 - .../media_internet/media_internet.module | 323 - .../includes/MediaInternetTestHandler.inc | 45 - .../MediaInternetTestStreamWrapper.inc | 24 - .../media_internet/tests/media_internet.test | 394 - .../tests/media_internet_test.info | 15 - .../tests/media_internet_test.module | 67 - .../media_migrate_file_types.pages.inc | 203 - .../media_migrate_file_types.info | 16 - .../media_migrate_file_types.module | 73 - .../media_wysiwyg/css/media_wysiwyg.base.css | 19 - .../media_wysiwyg/css/media_wysiwyg.css | 41 - .../media_wysiwyg/images/wysiwyg-media.gif | Bin 139 -> 0 bytes .../includes/media_wysiwyg.features.inc | 208 - .../includes/media_wysiwyg.file_usage.inc | 181 - .../includes/media_wysiwyg.filter.inc | 564 -- .../includes/media_wysiwyg.pages.inc | 237 - .../includes/media_wysiwyg.uuid.inc | 88 - .../media_wysiwyg/js/media_wysiwyg.filter.js | 498 - .../js/media_wysiwyg.format_form.js | 128 - .../modules/media_wysiwyg/js/wysiwyg-media.js | 199 - .../media_wysiwyg/media_wysiwyg.api.php | 86 - .../modules/media_wysiwyg/media_wysiwyg.info | 24 - .../media_wysiwyg/media_wysiwyg.install | 256 - .../media_wysiwyg/media_wysiwyg.module | 729 -- .../modules/media_wysiwyg/media_wysiwyg.test | 189 - .../media_wysiwyg/media_wysiwyg.variable.inc | 42 - .../tests/media_wysiwyg.file_usage.test | 237 - .../tests/media_wysiwyg.macro.test | 120 - .../media_wysiwyg.paragraph_fix_filter.test | 166 - .../media_wysiwyg/wysiwyg_plugins/media.inc | 31 - .../media_wysiwyg_view_mode.info | 11 - .../media_wysiwyg_view_mode.install | 15 - .../media_wysiwyg_view_mode.module | 12 - .../media/modules/mediafield/mediafield.info | 12 - .../modules/mediafield/mediafield.install | 43 - .../modules/mediafield/mediafield.module | 323 - .../modules/mediafield/mediafield.views.inc | 25 - .../media/templates/media-dialog-page.tpl.php | 91 - .../media/tests/includes/MediaModuleTest.inc | 30 - sites/all/modules/media/tests/media.test | 1275 --- .../media/tests/media_module_test.info | 14 - .../media/tests/media_module_test.module | 106 - .../media/views/media_default.view.inc | 171 - sites/all/modules/metatag/CHANGELOG.txt | 61 + sites/all/modules/metatag/README.txt | 13 +- sites/all/modules/metatag/metatag.admin.inc | 52 +- sites/all/modules/metatag/metatag.admin.js | 64 +- sites/all/modules/metatag/metatag.api.php | 8 +- sites/all/modules/metatag/metatag.drush.inc | 1 + .../all/modules/metatag/metatag.features.inc | 1 + sites/all/modules/metatag/metatag.feeds.inc | 1 + sites/all/modules/metatag/metatag.i18n.inc | 2 +- sites/all/modules/metatag/metatag.inc | 229 +- sites/all/modules/metatag/metatag.info | 7 +- sites/all/modules/metatag/metatag.install | 32 +- sites/all/modules/metatag/metatag.metatag.inc | 28 +- sites/all/modules/metatag/metatag.migrate.inc | 2 + sites/all/modules/metatag/metatag.module | 159 +- .../modules/metatag/metatag.search_api.inc | 7 +- sites/all/modules/metatag/metatag.tokens.inc | 3 +- .../all/modules/metatag/metatag.variable.inc | 25 +- .../modules/metatag/metatag.vertical-tabs.js | 87 +- .../metatag_app_links/metatag_app_links.info | 7 +- .../metatag_app_links.metatag.inc | 1 + .../tests/metatag_app_links.tags.test | 6 +- .../tests/metatag_app_links.test | 5 + .../metatag_context/metatag_context.admin.inc | 6 +- .../metatag_context.context.inc | 5 + .../metatag_context/metatag_context.i18n.inc | 3 +- .../metatag_context/metatag_context.info | 7 +- .../metatag_context/metatag_context.install | 1 + .../metatag_context.metatag.inc | 1 + .../metatag_context/metatag_context.module | 1 + .../tests/metatag_context.i18n.test | 7 +- .../tests/metatag_context.test | 5 + .../tests/metatag_context_tests.context.inc | 1 + .../tests/metatag_context_tests.info | 7 +- .../tests/metatag_context_tests.module | 1 + .../metatag/metatag_dc/metatag_dc.info | 7 +- .../metatag/metatag_dc/metatag_dc.install | 14 +- .../metatag/metatag_dc/metatag_dc.metatag.inc | 3 + .../metatag/metatag_dc/metatag_dc.module | 1 + .../metatag_dc/tests/metatag_dc.tags.test | 5 + .../metatag/metatag_dc/tests/metatag_dc.test | 5 + .../metatag_dc_advanced.info | 7 +- .../metatag_dc_advanced.metatag.inc | 3 + .../metatag_dc_advanced.module | 1 + .../tests/metatag_dc_advanced.tags.test | 5 + .../tests/metatag_dc_advanced.test | 5 + .../metatag/metatag_devel/metatag_devel.info | 7 +- .../metatag_devel/metatag_devel.module | 1 + .../metatag_devel/tests/metatag_devel.test | 5 + .../metatag_facebook/metatag_facebook.info | 7 +- .../metatag_facebook/metatag_facebook.install | 1 + .../metatag_facebook.metatag.inc | 1 + .../metatag_facebook/metatag_facebook.module | 1 + .../tests/metatag_facebook.tags.test | 5 + .../tests/metatag_facebook.test | 5 + .../metatag_favicons/metatag_favicons.info | 7 +- .../metatag_favicons/metatag_favicons.install | 1 + .../metatag_favicons.mask-icon.class.inc | 1 + .../metatag_favicons.metatag.inc | 1 + .../metatag_favicons/metatag_favicons.module | 55 +- .../tests/metatag_favicons.tags.test | 45 +- .../tests/metatag_favicons.test | 37 +- .../metatag_google_cse.info | 7 +- .../metatag_google_cse.install | 1 + .../metatag_google_cse.metatag.inc | 1 + .../metatag_google_cse.module | 1 + .../tests/metatag_google_cse.tags.test | 5 + .../tests/metatag_google_cse.test | 5 + .../metatag_google_plus.inc | 1 + .../metatag_google_plus.info | 7 +- .../metatag_google_plus.install | 9 + .../metatag_google_plus.metatag.inc | 4 +- .../metatag_google_plus.module | 1 + .../tests/metatag_google_plus.tags.test | 5 + .../tests/metatag_google_plus.test | 5 + .../metatag_hreflang/metatag_hreflang.info | 7 +- .../metatag_hreflang/metatag_hreflang.install | 1 + .../metatag_hreflang.metatag.inc | 1 + .../metatag_hreflang/metatag_hreflang.module | 2 +- .../metatag_hreflang/metatag_hreflang.test | 1 + .../metatag_hreflang.tokens.inc | 56 +- .../tests/metatag_hreflang.tags.test | 5 + .../tests/metatag_hreflang.test | 5 + ...atag_hreflang.with_entity_translation.test | 11 +- .../metatag/metatag_importer/README.txt | 30 +- .../metatag_importer.admin.inc | 1 + .../metatag_importer.drush.inc | 44 +- .../metatag_importer/metatag_importer.info | 7 +- .../metatag_importer.metatags_quick.inc | 225 + .../metatag_importer/metatag_importer.module | 1 + .../metatag_importer.nodewords.inc | 116 +- .../metatag_importer.page_title.inc | 13 +- .../tests/metatag_importer.test | 5 + .../metatag_mobile/metatag_mobile.info | 7 +- .../metatag_mobile/metatag_mobile.metatag.inc | 3 +- .../metatag_mobile/metatag_mobile.module | 21 +- .../tests/metatag_mobile.tags.test | 5 + .../metatag_mobile/tests/metatag_mobile.test | 5 + .../metatag_opengraph/metatag_opengraph.info | 7 +- .../metatag_opengraph.install | 10 + .../metatag_opengraph.metatag.inc | 5 +- .../metatag_opengraph.module | 7 +- .../tests/metatag_opengraph.tags.test | 5 + .../tests/metatag_opengraph.test | 5 + .../metatag_opengraph_products.info | 7 +- .../metatag_opengraph_products.metatag.inc | 1 + .../metatag_opengraph_products.module | 1 + .../metatag_opengraph_products.tags.test | 5 + .../tests/metatag_opengraph_products.test | 6 + .../metatag_panels/metatag_panels.i18n.inc | 5 +- .../metatag_panels/metatag_panels.info | 7 +- .../metatag_panels/metatag_panels.metatag.inc | 1 + .../metatag_panels/metatag_panels.module | 9 +- .../tests/metatag_panels.i18n.test | 5 + .../metatag_panels/tests/metatag_panels.test | 5 + .../tests/metatag_panels_tests.info | 7 +- .../tests/metatag_panels_tests.module | 1 + .../metatag_panels_tests.pages_default.inc | 3 +- .../metatag/metatag_twitter_cards/README.txt | 1 + .../metatag_twitter_cards.info | 7 +- .../metatag_twitter_cards.install | 10 + .../metatag_twitter_cards.metatag.inc | 38 +- .../metatag_twitter_cards.module | 1 + .../tests/metatag_twitter_cards.tags.test | 6 + .../tests/metatag_twitter_cards.test | 5 + .../metatag_verification.info | 7 +- .../metatag_verification.install | 1 + .../metatag_verification.metatag.inc | 1 + .../metatag_verification.module | 1 + .../tests/metatag_verification.tags.test | 5 + .../tests/metatag_verification.test | 5 + .../metatag_views/metatag_views.i18n.inc | 5 +- .../metatag/metatag_views/metatag_views.inc | 5 +- .../metatag/metatag_views/metatag_views.info | 7 +- .../metatag_views/metatag_views.metatag.inc | 1 + .../metatag_views/metatag_views.module | 44 +- .../metatag_views/metatag_views.tokens.inc | 1 + .../metatag_views/metatag_views.views.inc | 1 + ...views_plugin_display_extender_metatags.inc | 79 +- .../tests/metatag_views.i18n.test | 5 + .../metatag_views/tests/metatag_views.test | 5 + .../tests/metatag_views_tests.info | 7 +- .../tests/metatag_views_tests.module | 1 + .../metatag_views_tests.views_default.inc | 3 +- .../content_types/node_form_metatags.inc | 1 + .../metatag/tests/metatag.bulk_revert.test | 7 +- .../tests/metatag.core_tag_removal.test | 20 +- .../modules/metatag/tests/metatag.helper.test | 16 +- .../modules/metatag/tests/metatag.image.test | 14 +- .../modules/metatag/tests/metatag.locale.test | 15 +- .../modules/metatag/tests/metatag.node.test | 29 +- .../metatag/tests/metatag.node.with_i18n.test | 5 + .../metatag/tests/metatag.output_caching.test | 20 +- .../tests/metatag.string_handling.test | 5 + .../metatag.string_handling_with_i18n.test | 5 + .../modules/metatag/tests/metatag.tags.test | 8 +- .../metatag/tests/metatag.tags_helper.test | 16 +- .../modules/metatag/tests/metatag.term.test | 9 +- .../metatag/tests/metatag.term.with_i18n.test | 5 + .../modules/metatag/tests/metatag.unit.test | 5 + .../modules/metatag/tests/metatag.user.test | 7 +- .../tests/metatag.with_i18n_config.test | 7 +- .../tests/metatag.with_i18n_disabled.test | 5 + .../tests/metatag.with_i18n_output.test | 5 + .../metatag/tests/metatag.with_me.test | 7 +- .../metatag/tests/metatag.with_media.test | 6 + .../metatag/tests/metatag.with_panels.test | 8 +- .../metatag/tests/metatag.with_profile2.test | 5 + .../tests/metatag.with_search_api.test | 5 + .../metatag/tests/metatag.with_views.test | 10 +- .../metatag.with_workbench_moderation.test | 4 + .../modules/metatag/tests/metatag.xss.test | 21 +- .../metatag/tests/metatag_search_test.info | 7 +- .../metatag/tests/metatag_search_test.module | 1 + .../modules/metatag/tests/metatag_test.info | 7 +- .../metatag/tests/metatag_test.metatag.inc | 5 + .../modules/metatag/tests/metatag_test.module | 5 + sites/all/modules/mollom/LICENSE.txt | 339 - sites/all/modules/mollom/README.txt | 140 - .../mollom/images/powered-by-mollom-1.gif | Bin 1606 -> 0 bytes .../mollom/images/powered-by-mollom-2.gif | Bin 1272 -> 0 bytes sites/all/modules/mollom/images/refresh.png | Bin 800 -> 0 bytes .../all/modules/mollom/includes/CHANGELOG.md | 40 - .../modules/mollom/includes/LICENSE-GPL.txt | 339 - .../modules/mollom/includes/LICENSE-MIT.txt | 20 - sites/all/modules/mollom/includes/README.md | 134 - sites/all/modules/mollom/includes/TODO.md | 9 - .../all/modules/mollom/includes/composer.json | 10 - .../modules/mollom/includes/mollom.class.inc | 1598 --- .../mollom/mollom-captcha-audio.tpl.php | 133 - .../mollom/mollom-captcha-image.tpl.php | 30 - .../modules/mollom/mollom-captcha-player.swf | Bin 5986 -> 0 bytes .../modules/mollom/mollom.admin.blacklist.js | 76 - sites/all/modules/mollom/mollom.admin.css | 12 - sites/all/modules/mollom/mollom.admin.inc | 1077 -- sites/all/modules/mollom/mollom.admin.js | 33 - sites/all/modules/mollom/mollom.api.php | 471 - sites/all/modules/mollom/mollom.css | 32 - sites/all/modules/mollom/mollom.drupal.inc | 463 - sites/all/modules/mollom/mollom.flag.css | 30 - sites/all/modules/mollom/mollom.flag.inc | 704 -- sites/all/modules/mollom/mollom.flag.js | 118 - .../modules/mollom/mollom.flag.position.css | 22 - sites/all/modules/mollom/mollom.info | 20 - sites/all/modules/mollom/mollom.install | 1329 --- sites/all/modules/mollom/mollom.js | 110 - sites/all/modules/mollom/mollom.module | 3870 -------- sites/all/modules/mollom/mollom.pages.inc | 137 - .../modules/mollom/tests/mollom.class.test | 270 - sites/all/modules/mollom/tests/mollom.test | 5553 ----------- .../all/modules/mollom/tests/mollom_test.info | 12 - .../modules/mollom/tests/mollom_test.install | 53 - .../modules/mollom/tests/mollom_test.module | 352 - .../mollom/tests/mollom_test_server.info | 12 - .../mollom/tests/mollom_test_server.install | 16 - .../mollom/tests/mollom_test_server.module | 751 -- .../all/modules/{apc => riddler}/LICENSE.txt | 0 sites/all/modules/riddler/riddler.info | 12 + sites/all/modules/riddler/riddler.install | 53 + sites/all/modules/riddler/riddler.module | 278 + sites/all/modules/security_review/API.txt | 76 + .../all/modules/security_review/IGNOREME.txt | 7 + .../LICENSE.txt | 0 sites/all/modules/security_review/README.txt | 124 + .../security_review/security_review.drush.inc | 343 + .../security_review/security_review.help.inc | 430 + .../security_review/security_review.inc | 918 ++ .../security_review/security_review.info | 12 + .../security_review/security_review.install | 121 + .../security_review/security_review.js | 27 + .../security_review/security_review.module | 278 + .../security_review/security_review.pages.inc | 472 + .../security_review.site_audit.inc | 179 + .../tests/security_review.test | 194 + .../views/css/views-admin.bartik-rtl.css | 2 +- .../modules/views/css/views-admin.bartik.css | 143 +- sites/all/modules/views/css/views-admin.css | 12 +- .../views/css/views-admin.ctools-rtl.css | 2 +- .../modules/views/css/views-admin.ctools.css | 18 +- .../views/css/views-admin.garland-rtl.css | 4 +- .../modules/views/css/views-admin.garland.css | 143 +- .../modules/views/css/views-admin.seven.css | 163 +- .../modules/views/css/views-admin.theme.css | 111 +- sites/all/modules/views/css/views-rtl.css | 1 - sites/all/modules/views/drush/views.drush.inc | 144 +- .../views/handlers/views_handler_area.inc | 84 +- .../handlers/views_handler_area_messages.inc | 2 +- .../handlers/views_handler_area_result.inc | 27 +- .../handlers/views_handler_area_text.inc | 49 +- .../views_handler_area_text_custom.inc | 32 +- .../handlers/views_handler_area_view.inc | 14 +- .../views/handlers/views_handler_argument.inc | 419 +- .../handlers/views_handler_argument_date.inc | 47 +- .../views_handler_argument_formula.inc | 23 +- ...iews_handler_argument_group_by_numeric.inc | 19 +- .../views_handler_argument_many_to_one.inc | 56 +- .../handlers/views_handler_argument_null.inc | 19 +- .../views_handler_argument_numeric.inc | 39 +- .../views_handler_argument_string.inc | 51 +- .../views/handlers/views_handler_field.inc | 372 +- .../handlers/views_handler_field_boolean.inc | 38 +- .../views_handler_field_contextual_links.inc | 14 +- .../handlers/views_handler_field_counter.inc | 31 +- .../views_handler_field_ctools_dropdown.inc | 25 +- .../handlers/views_handler_field_custom.inc | 26 +- .../handlers/views_handler_field_date.inc | 134 +- .../handlers/views_handler_field_entity.inc | 11 +- .../handlers/views_handler_field_links.inc | 20 +- .../views_handler_field_machine_name.inc | 32 +- .../handlers/views_handler_field_markup.inc | 22 +- .../handlers/views_handler_field_math.inc | 27 +- .../handlers/views_handler_field_numeric.inc | 21 +- .../views_handler_field_prerender_list.inc | 54 +- .../views_handler_field_serialized.inc | 22 +- .../views_handler_field_time_interval.inc | 17 +- .../handlers/views_handler_field_url.inc | 16 +- .../views/handlers/views_handler_filter.inc | 312 +- .../views_handler_filter_boolean_operator.inc | 68 +- ...handler_filter_boolean_operator_string.inc | 7 +- .../handlers/views_handler_filter_combine.inc | 70 +- .../handlers/views_handler_filter_date.inc | 55 +- .../views_handler_filter_entity_bundle.inc | 26 +- .../views_handler_filter_equality.inc | 18 +- .../views_handler_filter_fields_compare.inc | 46 +- .../views_handler_filter_group_by_numeric.inc | 35 +- .../views_handler_filter_in_operator.inc | 110 +- .../views_handler_filter_many_to_one.inc | 42 +- .../handlers/views_handler_filter_numeric.inc | 67 +- .../handlers/views_handler_filter_string.inc | 132 +- .../handlers/views_handler_relationship.inc | 79 +- ...ews_handler_relationship_groupwise_max.inc | 125 +- .../views/handlers/views_handler_sort.inc | 99 +- .../handlers/views_handler_sort_date.inc | 21 +- .../views_handler_sort_group_by_numeric.inc | 16 +- .../views_handler_sort_menu_hierarchy.inc | 17 +- .../handlers/views_handler_sort_random.inc | 12 +- .../views/help/alter-exposed-filter.html | 11 +- sites/all/modules/views/help/api-example.html | 2 +- sites/all/modules/views/help/api-tables.html | 7 +- .../all/modules/views/help/api-upgrading.html | 10 +- sites/all/modules/views/help/embed.html | 4 +- sites/all/modules/views/help/ui-crashes.html | 2 +- sites/all/modules/views/includes/admin.inc | 700 +- sites/all/modules/views/includes/ajax.inc | 71 +- sites/all/modules/views/includes/analyze.inc | 14 +- sites/all/modules/views/includes/base.inc | 144 +- sites/all/modules/views/includes/cache.inc | 29 +- sites/all/modules/views/includes/handlers.inc | 636 +- sites/all/modules/views/includes/plugins.inc | 58 +- sites/all/modules/views/includes/view.inc | 658 +- sites/all/modules/views/js/ajax.js | 78 +- sites/all/modules/views/js/ajax_view.js | 263 +- sites/all/modules/views/js/base.js | 174 +- .../views/js/jquery.ui.dialog.patch.js | 10 +- sites/all/modules/views/js/views-admin.js | 35 +- .../all/modules/views/js/views-contextual.js | 16 +- sites/all/modules/views/js/views-list.js | 24 +- .../views/modules/aggregator.views.inc | 199 +- ...ndler_argument_aggregator_category_cid.inc | 4 +- .../views_handler_argument_aggregator_fid.inc | 4 +- .../views_handler_argument_aggregator_iid.inc | 4 +- ...iews_handler_field_aggregator_category.inc | 18 +- ...ws_handler_field_aggregator_title_link.inc | 28 +- .../views_handler_field_aggregator_xss.inc | 7 +- ...handler_filter_aggregator_category_cid.inc | 7 +- .../views_plugin_row_aggregator_rss.inc | 30 +- .../all/modules/views/modules/book.views.inc | 27 +- ...iews_plugin_argument_default_book_root.inc | 10 +- .../modules/views/modules/comment.views.inc | 96 +- .../views/modules/comment.views_default.inc | 6 +- ...iews_handler_argument_comment_user_uid.inc | 22 +- .../comment/views_handler_field_comment.inc | 25 +- .../views_handler_field_comment_depth.inc | 6 +- .../views_handler_field_comment_link.inc | 31 +- ...ews_handler_field_comment_link_approve.inc | 12 +- ...iews_handler_field_comment_link_delete.inc | 14 +- .../views_handler_field_comment_link_edit.inc | 19 +- ...views_handler_field_comment_link_reply.inc | 14 +- .../views_handler_field_comment_node_link.inc | 40 +- .../views_handler_field_comment_username.inc | 24 +- ...s_handler_field_last_comment_timestamp.inc | 14 +- ...ws_handler_field_ncs_last_comment_name.inc | 28 +- .../views_handler_field_ncs_last_updated.inc | 8 +- .../views_handler_field_node_comment.inc | 7 +- .../views_handler_field_node_new_comments.inc | 44 +- .../views_handler_filter_comment_user_uid.inc | 7 +- .../views_handler_filter_ncs_last_updated.inc | 7 +- .../views_handler_filter_node_comment.inc | 7 +- .../views_handler_sort_comment_thread.inc | 13 +- ...ews_handler_sort_ncs_last_comment_name.inc | 19 +- .../views_handler_sort_ncs_last_updated.inc | 7 +- .../comment/views_plugin_row_comment_rss.inc | 43 +- .../comment/views_plugin_row_comment_view.inc | 42 +- .../views_handler_field_contact_link.inc | 22 +- .../all/modules/views/modules/field.views.inc | 58 +- .../views_handler_argument_field_list.inc | 27 +- ...ews_handler_argument_field_list_string.inc | 29 +- .../field/views_handler_field_field.inc | 130 +- .../field/views_handler_filter_field_list.inc | 15 +- ...iews_handler_filter_field_list_boolean.inc | 6 +- ...ws_handler_relationship_entity_reverse.inc | 13 +- .../modules/views/modules/filter.views.inc | 7 +- ...views_handler_field_filter_format_name.inc | 19 +- .../modules/views/modules/locale.views.inc | 30 +- .../views_handler_argument_locale_group.inc | 18 +- ...views_handler_argument_locale_language.inc | 18 +- .../views_handler_field_locale_group.inc | 7 +- .../views_handler_field_locale_language.inc | 19 +- .../views_handler_field_locale_link_edit.inc | 39 +- .../views_handler_field_node_language.inc | 19 +- .../views_handler_filter_locale_group.inc | 9 +- .../views_handler_filter_locale_language.inc | 9 +- .../views_handler_filter_locale_version.inc | 9 +- .../views_handler_filter_node_language.inc | 9 +- .../views_handler_sort_node_language.inc | 22 +- .../all/modules/views/modules/node.views.inc | 195 +- .../views/modules/node.views_default.inc | 8 +- .../views/modules/node.views_template.inc | 10 +- .../views_handler_argument_dates_various.inc | 91 +- .../views_handler_argument_node_language.inc | 16 +- .../node/views_handler_argument_node_nid.inc | 6 +- .../node/views_handler_argument_node_type.inc | 22 +- ...ews_handler_argument_node_uid_revision.inc | 13 +- .../node/views_handler_argument_node_vid.inc | 6 +- ...s_handler_field_history_user_timestamp.inc | 29 +- .../modules/node/views_handler_field_node.inc | 30 +- .../node/views_handler_field_node_link.inc | 21 +- .../views_handler_field_node_link_delete.inc | 3 +- .../views_handler_field_node_link_edit.inc | 3 +- .../node/views_handler_field_node_path.inc | 28 +- .../views_handler_field_node_revision.inc | 21 +- ...views_handler_field_node_revision_link.inc | 18 +- ...andler_field_node_revision_link_delete.inc | 11 +- ...andler_field_node_revision_link_revert.inc | 11 +- .../node/views_handler_field_node_type.inc | 20 +- ...views_handler_field_node_version_count.inc | 8 +- ..._handler_filter_history_user_timestamp.inc | 29 +- .../node/views_handler_filter_node_access.inc | 23 +- .../node/views_handler_filter_node_status.inc | 28 +- .../node/views_handler_filter_node_type.inc | 7 +- ...views_handler_filter_node_uid_revision.inc | 7 +- ...iews_handler_filter_node_version_count.inc | 27 +- .../views_handler_sort_node_version_count.inc | 7 +- .../views_plugin_argument_default_node.inc | 11 +- .../views_plugin_argument_validate_node.inc | 37 +- .../node/views_plugin_row_node_rss.inc | 59 +- .../node/views_plugin_row_node_view.inc | 58 +- .../all/modules/views/modules/poll.views.inc | 5 +- .../modules/views/modules/profile.views.inc | 31 +- .../views_handler_field_profile_date.inc | 25 +- .../views_handler_field_profile_list.inc | 19 +- ...views_handler_filter_profile_selection.inc | 7 +- .../modules/views/modules/search.views.inc | 50 +- .../views/modules/search.views_default.inc | 4 +- .../search/views_handler_argument_search.inc | 16 +- .../views_handler_field_search_score.inc | 25 +- .../search/views_handler_filter_search.inc | 74 +- .../views_handler_sort_search_score.inc | 17 +- .../search/views_plugin_row_search_view.inc | 16 +- .../views/modules/statistics.views.inc | 100 +- .../modules/statistics.views_default.inc | 4 +- .../views_handler_field_accesslog_path.inc | 23 +- ...s_handler_field_node_counter_timestamp.inc | 2 + ...views_handler_field_statistics_numeric.inc | 2 + .../modules/views/modules/system.views.inc | 160 +- .../views_handler_argument_file_fid.inc | 4 +- .../system/views_handler_field_file.inc | 20 +- .../views_handler_field_file_extension.inc | 14 +- .../views_handler_field_file_filemime.inc | 19 +- .../views_handler_field_file_status.inc | 7 +- .../system/views_handler_field_file_uri.inc | 20 +- .../views_handler_filter_file_status.inc | 7 +- .../views_handler_filter_system_type.inc | 7 +- .../modules/views/modules/taxonomy.views.inc | 73 +- .../views/modules/taxonomy.views_default.inc | 4 +- .../views_handler_argument_taxonomy.inc | 5 +- .../views_handler_argument_term_node_tid.inc | 22 +- ...s_handler_argument_term_node_tid_depth.inc | 31 +- ...dler_argument_term_node_tid_depth_join.inc | 31 +- ..._argument_term_node_tid_depth_modifier.inc | 27 +- ...ndler_argument_vocabulary_machine_name.inc | 4 +- .../views_handler_argument_vocabulary_vid.inc | 4 +- .../taxonomy/views_handler_field_taxonomy.inc | 22 +- .../views_handler_field_term_link_edit.inc | 33 +- .../views_handler_field_term_node_tid.inc | 46 +- .../views_handler_filter_term_node_tid.inc | 85 +- ...ews_handler_filter_term_node_tid_depth.inc | 27 +- ...andler_filter_term_node_tid_depth_join.inc | 31 +- ...handler_filter_vocabulary_machine_name.inc | 7 +- .../views_handler_filter_vocabulary_vid.inc | 7 +- ...ws_handler_relationship_node_term_data.inc | 25 +- ...s_plugin_argument_default_taxonomy_tid.inc | 27 +- ...plugin_argument_validate_taxonomy_term.inc | 45 +- .../modules/views/modules/tracker.views.inc | 9 +- ...dler_argument_tracker_comment_user_uid.inc | 6 +- ...andler_filter_tracker_boolean_operator.inc | 12 +- ...andler_filter_tracker_comment_user_uid.inc | 7 +- .../views/modules/translation.views.inc | 11 +- .../views_handler_argument_node_tnid.inc | 8 +- ...iews_handler_field_node_link_translate.inc | 10 +- ...ws_handler_field_node_translation_link.inc | 22 +- .../views_handler_filter_node_tnid.inc | 39 +- .../views_handler_filter_node_tnid_child.inc | 28 +- ...views_handler_relationship_translation.inc | 16 +- .../all/modules/views/modules/user.views.inc | 132 +- .../user/views_handler_argument_user_uid.inc | 6 +- ...views_handler_argument_users_roles_rid.inc | 7 +- .../modules/user/views_handler_field_user.inc | 23 +- .../views_handler_field_user_language.inc | 11 +- .../user/views_handler_field_user_link.inc | 37 +- .../views_handler_field_user_link_cancel.inc | 6 +- .../views_handler_field_user_link_edit.inc | 7 +- .../user/views_handler_field_user_mail.inc | 17 +- .../user/views_handler_field_user_name.inc | 21 +- .../views_handler_field_user_permissions.inc | 50 +- .../user/views_handler_field_user_picture.inc | 42 +- .../user/views_handler_field_user_roles.inc | 32 +- .../views_handler_filter_user_current.inc | 12 +- .../user/views_handler_filter_user_name.inc | 63 +- .../views_handler_filter_user_permissions.inc | 13 +- .../user/views_handler_filter_user_roles.inc | 9 +- ...s_plugin_argument_default_current_user.inc | 11 +- .../views_plugin_argument_default_user.inc | 27 +- .../views_plugin_argument_validate_user.inc | 37 +- .../user/views_plugin_row_user_view.inc | 85 +- .../all/modules/views/modules/views.views.inc | 6 +- .../plugins/export_ui/views_ui.class.php | 116 +- .../views/plugins/views_plugin_access.inc | 51 +- .../plugins/views_plugin_access_none.inc | 9 +- .../plugins/views_plugin_access_perm.inc | 29 +- .../plugins/views_plugin_access_role.inc | 38 +- .../plugins/views_plugin_argument_default.inc | 45 +- .../views_plugin_argument_default_fixed.inc | 21 +- .../views_plugin_argument_default_php.inc | 28 +- .../views_plugin_argument_default_raw.inc | 19 +- .../views_plugin_argument_validate.inc | 47 +- ...views_plugin_argument_validate_numeric.inc | 9 +- .../views_plugin_argument_validate_php.inc | 26 +- .../views/plugins/views_plugin_cache.inc | 100 +- .../views/plugins/views_plugin_cache_none.inc | 25 +- .../views/plugins/views_plugin_cache_time.inc | 49 +- .../views/plugins/views_plugin_display.inc | 430 +- .../views_plugin_display_attachment.inc | 69 +- .../plugins/views_plugin_display_block.inc | 64 +- .../plugins/views_plugin_display_default.inc | 37 +- .../plugins/views_plugin_display_embed.inc | 3 +- .../plugins/views_plugin_display_extender.inc | 32 +- .../plugins/views_plugin_display_feed.inc | 69 +- .../plugins/views_plugin_display_page.inc | 95 +- .../plugins/views_plugin_exposed_form.inc | 81 +- .../views_plugin_exposed_form_basic.inc | 4 +- ...ews_plugin_exposed_form_input_required.inc | 30 +- .../plugins/views_plugin_localization.inc | 81 +- .../views_plugin_localization_core.inc | 36 +- .../views_plugin_localization_none.inc | 15 +- .../views/plugins/views_plugin_pager.inc | 112 +- .../views/plugins/views_plugin_pager_full.inc | 93 +- .../views/plugins/views_plugin_pager_mini.inc | 34 +- .../views/plugins/views_plugin_pager_none.inc | 51 +- .../views/plugins/views_plugin_pager_some.inc | 31 +- .../views/plugins/views_plugin_query.inc | 75 +- .../plugins/views_plugin_query_default.inc | 653 +- .../views/plugins/views_plugin_row.inc | 43 +- .../views/plugins/views_plugin_row_fields.inc | 15 +- .../plugins/views_plugin_row_rss_fields.inc | 32 +- .../views/plugins/views_plugin_style.inc | 146 +- .../plugins/views_plugin_style_default.inc | 13 +- .../views/plugins/views_plugin_style_grid.inc | 10 +- .../plugins/views_plugin_style_jump_menu.inc | 26 +- .../views/plugins/views_plugin_style_list.inc | 10 +- .../plugins/views_plugin_style_mapping.inc | 15 +- .../views/plugins/views_plugin_style_rss.inc | 34 +- .../plugins/views_plugin_style_summary.inc | 30 +- .../views_plugin_style_summary_jump_menu.inc | 24 +- ...views_plugin_style_summary_unformatted.inc | 14 +- .../plugins/views_plugin_style_table.inc | 26 +- .../plugins/views_wizard/file_managed.inc | 3 +- .../views/plugins/views_wizard/node.inc | 2 +- .../plugins/views_wizard/node_revision.inc | 3 +- .../plugins/views_wizard/taxonomy_term.inc | 3 +- .../views_ui_base_views_wizard.class.php | 80 +- .../views_ui_comment_views_wizard.class.php | 1 + ...ews_ui_file_managed_views_wizard.class.php | 2 + ...ws_ui_node_revision_views_wizard.class.php | 1 + .../views_ui_node_views_wizard.class.php | 4 + ...ws_ui_taxonomy_term_views_wizard.class.php | 1 + .../views_ui_users_views_wizard.class.php | 2 + .../views-view--frontpage.tpl.php | 2 +- sites/all/modules/views/tests/README.txt | 29 + ...ews_handler_argument_comment_user_uid.test | 14 +- ...views_handler_filter_comment_user_uid.test | 1 + .../views/tests/field/views_fieldapi.test | 72 +- .../handlers/views_handler_area_text.test | 2 +- .../handlers/views_handler_argument_null.test | 2 +- .../views_handler_argument_string.test | 2 + .../tests/handlers/views_handler_field.test | 23 +- .../handlers/views_handler_field_boolean.test | 3 +- .../handlers/views_handler_field_counter.test | 5 +- .../handlers/views_handler_field_custom.test | 1 + .../handlers/views_handler_field_date.test | 24 +- .../views_handler_field_file_extension.test | 1 + .../views_handler_field_file_size.test | 1 + .../handlers/views_handler_field_math.test | 1 + .../handlers/views_handler_field_url.test | 1 + .../handlers/views_handler_field_xss.test | 3 +- .../views_handler_filter_combine.test | 1 + .../handlers/views_handler_filter_date.test | 5 +- .../views_handler_filter_equality.test | 8 +- .../views_handler_filter_numeric.test | 30 +- .../handlers/views_handler_filter_string.test | 62 +- .../tests/handlers/views_handler_sort.test | 9 +- .../handlers/views_handler_sort_date.test | 125 +- .../handlers/views_handler_sort_random.test | 8 +- .../views/tests/handlers/views_handlers.test | 6 +- .../node/views_node_revision_relations.test | 1 + .../tests/plugins/views_plugin_display.test | 9 +- .../tests/styles/views_plugin_style.test | 3 +- .../styles/views_plugin_style_jump_menu.test | 17 +- .../styles/views_plugin_style_mapping.test | 2 +- .../views_plugin_style_unformatted.test | 2 +- ...s_handler_relationship_node_term_data.test | 8 +- .../test_handlers/views_test_area_access.inc | 11 +- .../views_test_plugin_access_test_dynamic.inc | 17 +- .../views_test_plugin_access_test_static.inc | 17 +- .../views_test_plugin_style_test_mapping.inc | 3 +- .../user/views_handler_field_user_name.test | 8 +- .../modules/views/tests/user/views_user.test | 23 +- .../user/views_user_argument_default.test | 16 +- .../user/views_user_argument_validate.test | 16 +- .../all/modules/views/tests/views_access.test | 3 + .../modules/views/tests/views_analyze.test | 3 +- .../views/tests/views_argument_default.test | 7 +- .../views/tests/views_argument_validator.test | 7 +- .../all/modules/views/tests/views_basic.test | 11 +- .../all/modules/views/tests/views_cache.test | 12 +- .../modules/views/tests/views_cache.test.js | 1 + .../views/tests/views_exposed_form.test | 35 +- .../modules/views/tests/views_glossary.test | 5 +- .../modules/views/tests/views_groupby.test | 153 +- .../modules/views/tests/views_handlers.test | 13 +- .../all/modules/views/tests/views_module.test | 8 +- .../all/modules/views/tests/views_pager.test | 83 +- .../tests/views_plugin_localization_test.inc | 11 +- .../all/modules/views/tests/views_query.test | 93 +- sites/all/modules/views/tests/views_test.info | 7 +- .../all/modules/views/tests/views_test.module | 2 +- .../views/tests/views_test.views_default.inc | 10 +- .../views/tests/views_translatable.test | 6 +- sites/all/modules/views/tests/views_ui.test | 95 +- .../modules/views/tests/views_upgrade.test | 53 +- sites/all/modules/views/tests/views_view.test | 47 +- sites/all/modules/views/theme/theme.inc | 146 +- .../modules/views/theme/views-more.tpl.php | 3 +- .../theme/views-ui-display-tab-bucket.tpl.php | 2 +- .../views/theme/views-ui-edit-view.tpl.php | 8 +- .../views/theme/views-view-grid.tpl.php | 4 +- .../views/theme/views-view-list.tpl.php | 1 + .../theme/views-view-row-comment.tpl.php | 2 +- .../views-view-summary-unformatted.tpl.php | 2 +- .../views/theme/views-view-summary.tpl.php | 2 +- .../views/theme/views-view-table.tpl.php | 11 +- .../theme/views-view-unformatted.tpl.php | 2 +- .../modules/views/theme/views-view.tpl.php | 2 +- sites/all/modules/views/views.api.php | 322 +- sites/all/modules/views/views.info | 7 +- sites/all/modules/views/views.install | 69 +- sites/all/modules/views/views.module | 626 +- sites/all/modules/views/views_ui.info | 7 +- sites/all/modules/views/views_ui.module | 12 +- .../modules/votingapi/tests/votingapi.test | 80 +- .../votingapi/views/votingapi.views.inc | 116 +- .../views/votingapi.views_default.inc | 836 +- .../votingapi_views_handler_field_value.inc | 1 + .../votingapi_views_handler_relationship.inc | 14 +- .../votingapi_views_handler_sort_nullable.inc | 1 + .../all/modules/votingapi/votingapi.admin.inc | 174 +- sites/all/modules/votingapi/votingapi.api.php | 42 +- .../all/modules/votingapi/votingapi.devel.inc | 1 - .../all/modules/votingapi/votingapi.drush.inc | 13 +- sites/all/modules/votingapi/votingapi.info | 8 +- sites/all/modules/votingapi/votingapi.install | 205 +- .../modules/votingapi/votingapi.migrate.inc | 208 + sites/all/modules/votingapi/votingapi.module | 137 +- sites/all/modules/yandex_metrics/API.txt | 8 + .../all/modules/yandex_metrics/CHANGELOG.txt | 34 +- .../all/modules/yandex_metrics/README.RU.txt | 203 - sites/all/modules/yandex_metrics/README.txt | 204 +- .../translations/yandex_metrics.pot | 131 - .../translations/yandex_metrics.ru.po | 446 - .../translations/yandex_metrics.uk.po | 446 - .../translations/yandex_metrics_reports.pot | 359 - .../translations/yandex_metrics_reports.ru.po | 635 -- .../translations/yandex_metrics_reports.uk.po | 631 -- .../yandex_metrics/yandex_metrics.info | 6 +- .../yandex_metrics/yandex_metrics.install | 26 +- .../yandex_metrics/yandex_metrics.module | 59 +- .../yandex_metrics/yandex_metrics.test | 37 +- .../yandex_metrics.variable.inc | 87 + .../yandex_metrics_reports/API.txt | 18 - .../images/progress-indicator.gif | Bin 2608 -> 0 bytes .../js/yandex_metrics_reports.js | 43 - .../handlers/views_handler_field_ym_title.inc | 67 - .../views/yandex_metrics_reports.views.inc | 167 - .../yandex_metrics_reports.api.txt | 55 - .../yandex_metrics_reports.info | 16 +- .../yandex_metrics_reports.install | 70 +- .../yandex_metrics_reports.module | 645 +- .../yandex_metrics_reports.reports.inc | 470 +- .../yandex_metrics_reports.test | 88 - sites/all/themes/landing-integration-gradka | 2 +- ...t2y-2uHUfTHUh0RPmLEt4YHFOOAweEtMxiDQA0.css | 7 - ...-2uHUfTHUh0RPmLEt4YHFOOAweEtMxiDQA0.css.gz | Bin 6149 -> 0 bytes ...yAx9df4tRKovKjnVDsGvZwVuYAKO-m17AAJ1Dk.css | 2 - ...9df4tRKovKjnVDsGvZwVuYAKO-m17AAJ1Dk.css.gz | Bin 2476 -> 0 bytes ...6AFQ7En08yF_Uq8qPReBJQiQDgQEmYrjgcos8k.css | 10 - ...Q7En08yF_Uq8qPReBJQiQDgQEmYrjgcos8k.css.gz | Bin 5231 -> 0 bytes ...EODTO5gDyEbdpAfYzMKbjG3ottD1s5np0BNI8U.css | 1 - ...TO5gDyEbdpAfYzMKbjG3ottD1s5np0BNI8U.css.gz | Bin 594 -> 0 bytes ...SN4yWn9UnRCwyZm90LUJUUxf9T6WxvmxJ7yA_U.css | 1 - ...yWn9UnRCwyZm90LUJUUxf9T6WxvmxJ7yA_U.css.gz | Bin 215 -> 0 bytes ...N9lDx7Bg6x1gp6gwEdVu3VFui9QrqCzKv5N45g.css | 4 - ...Dx7Bg6x1gp6gwEdVu3VFui9QrqCzKv5N45g.css.gz | Bin 2946 -> 0 bytes ...JkxfUm7IMhPGCPE-utL2NmS3eDZChNg5Rvr1ZQ.css | 17 - ...fUm7IMhPGCPE-utL2NmS3eDZChNg5Rvr1ZQ.css.gz | Bin 6134 -> 0 bytes ...Du44jQk5NvuY7w2dmXb38cQHhLk3m-t3oAn114.css | 10 - ...4jQk5NvuY7w2dmXb38cQHhLk3m-t3oAn114.css.gz | Bin 5228 -> 0 bytes ...ZJGVELXBawG1Ld3G-0G2d2ooFAIn3zvDOpUG1M.css | 8 - ...VELXBawG1Ld3G-0G2d2ooFAIn3zvDOpUG1M.css.gz | Bin 5017 -> 0 bytes ...nzra2XbX5n7JYA4kPH44jzYSIn1VD_BqYwid-8.css | 3 - ...a2XbX5n7JYA4kPH44jzYSIn1VD_BqYwid-8.css.gz | Bin 1052 -> 0 bytes ...FJUpon8iHfRmFWlEqJYH8Tmbvv81qUfql6I8os.css | 14 - ...pon8iHfRmFWlEqJYH8Tmbvv81qUfql6I8os.css.gz | Bin 5042 -> 0 bytes ...lyf85q9EmEMgRwpvDiT39sU5VwuA4OUeeFbQBc.css | 3 - ...85q9EmEMgRwpvDiT39sU5VwuA4OUeeFbQBc.css.gz | Bin 2887 -> 0 bytes ...85heo6wvq8azFNfaQVCSa5HEPrhZT7frCwNPn8.css | 5 - ...eo6wvq8azFNfaQVCSa5HEPrhZT7frCwNPn8.css.gz | Bin 3576 -> 0 bytes ...xImcyqA41Z5DR2MEdftlNSSpERRTeajdO9Eqm4.css | 4 - ...cyqA41Z5DR2MEdftlNSSpERRTeajdO9Eqm4.css.gz | Bin 6026 -> 0 bytes ...alDR9-d_lCAvF3yUWjNU6yF8ZBm84jEPRvoyuQ.css | 1 - ...R9-d_lCAvF3yUWjNU6yF8ZBm84jEPRvoyuQ.css.gz | Bin 1120 -> 0 bytes ...q62HOKE70JDIdMjjfRn1JIC9YV1VXhRL-j6-RM.css | 2 - ...HOKE70JDIdMjjfRn1JIC9YV1VXhRL-j6-RM.css.gz | Bin 296 -> 0 bytes ...KFNI0kba6Wkc-l2KBQPllY8FwASUx-yN_vezGA.css | 6 - ...I0kba6Wkc-l2KBQPllY8FwASUx-yN_vezGA.css.gz | Bin 5727 -> 0 bytes ...C-VTWy46VCaIZs1_Mxom4t0MSIFbDi1OE3E9-8.css | 1 - ...TWy46VCaIZs1_Mxom4t0MSIFbDi1OE3E9-8.css.gz | Bin 185 -> 0 bytes ...ER5H42dIiPLMJftH8WgccS5WBSqefdAx_Stxjg.css | 2 - ...H42dIiPLMJftH8WgccS5WBSqefdAx_Stxjg.css.gz | Bin 648 -> 0 bytes ...B5pluTeBKDa3mg7UuKKg2cuNGR1Qsr1xr99jbs.css | 1 - ...luTeBKDa3mg7UuKKg2cuNGR1Qsr1xr99jbs.css.gz | Bin 1590 -> 0 bytes ...pLOBVXCGcxJEdAuNq8H2pRyPhxpGkexDBB6Ap8.css | 4 - ...BVXCGcxJEdAuNq8H2pRyPhxpGkexDBB6Ap8.css.gz | Bin 1831 -> 0 bytes ...PH22O7US3GKjh2nCEh2sTiGh8k6rbeVqTMcgro.css | 6 - ...2O7US3GKjh2nCEh2sTiGh8k6rbeVqTMcgro.css.gz | Bin 4580 -> 0 bytes ...AtK4skJALk0LG7i9wQ6eF-fCzbp0XL-jpo9aZw.css | 8 - ...4skJALk0LG7i9wQ6eF-fCzbp0XL-jpo9aZw.css.gz | Bin 4455 -> 0 bytes ...XWSg3wM1HUhXLpdpzHtVJUE8LSbZYTP_s7bkRc.css | 9 - ...g3wM1HUhXLpdpzHtVJUE8LSbZYTP_s7bkRc.css.gz | Bin 4735 -> 0 bytes ...-CIxI00rwsc92h9VyXlToENxIa7ENoPhKzvDnk.css | 6 - ...xI00rwsc92h9VyXlToENxIa7ENoPhKzvDnk.css.gz | Bin 3931 -> 0 bytes ...iGQ3H-eiMk53Zzq4PgC74YyoGtAz7Omf4ts9QI.css | 9 - ...3H-eiMk53Zzq4PgC74YyoGtAz7Omf4ts9QI.css.gz | Bin 6236 -> 0 bytes ...MYr5F2Nwtk0PinEqgNgsVVm7pNQGZd1lvWoMK4.css | 9 - ...5F2Nwtk0PinEqgNgsVVm7pNQGZd1lvWoMK4.css.gz | Bin 4975 -> 0 bytes ...YgzBsFNIRUCfW90d2QRpBJLrRDimGMoqkulTHs.css | 9 - ...BsFNIRUCfW90d2QRpBJLrRDimGMoqkulTHs.css.gz | Bin 4687 -> 0 bytes ...MQ9Og-YPPxa1q4us3N7DsZMJa-14jShHgRoRNo.css | 1 - ...Og-YPPxa1q4us3N7DsZMJa-14jShHgRoRNo.css.gz | Bin 109 -> 0 bytes ...yC2hBHAc41BozsFXhW-fI6J6cAi-n721ZdSliI.css | 3 - ...hBHAc41BozsFXhW-fI6J6cAi-n721ZdSliI.css.gz | Bin 2671 -> 0 bytes ...UIUNMryykk3lcWoV2Ry8v9P2xFjAb-oor60Mhw.css | 9 - ...NMryykk3lcWoV2Ry8v9P2xFjAb-oor60Mhw.css.gz | Bin 5072 -> 0 bytes ...bGjwBnJJGwktMgIkrf59dZ8073w0fMMX8VZTwzQ.js | 38 - ...wBnJJGwktMgIkrf59dZ8073w0fMMX8VZTwzQ.js.gz | Bin 450 -> 0 bytes ...nHI0aN9cUef0DDGmPsESLLMYBuet2-AOuQp7m44.js | 2188 ----- ...0aN9cUef0DDGmPsESLLMYBuet2-AOuQp7m44.js.gz | Bin 56132 -> 0 bytes ...neqy0AR5XJOhEuPNUZBO7mauvEemfESoE5sB6h4.js | 2091 ---- ...y0AR5XJOhEuPNUZBO7mauvEemfESoE5sB6h4.js.gz | Bin 55051 -> 0 bytes ...3ruaLhTiDuCF1ts3yJwKQv_7z0hv62oaqxfe1L0.js | 2336 ----- ...aLhTiDuCF1ts3yJwKQv_7z0hv62oaqxfe1L0.js.gz | Bin 56855 -> 0 bytes ...v8IEgsQbXV68TSOSyiOlsMcg6zcRSUS4mF8t6GQ.js | 860 -- ...EgsQbXV68TSOSyiOlsMcg6zcRSUS4mF8t6GQ.js.gz | Bin 23333 -> 0 bytes ...IE8aTyF1IiBW-7pQqVIlNd7iEctFsNM56paxFjE.js | 503 - ...aTyF1IiBW-7pQqVIlNd7iEctFsNM56paxFjE.js.gz | Bin 37817 -> 0 bytes ...FMiIITfE-d3zMUUax51x2Cu-wVwzf5dXXgLsVes.js | 1957 ---- ...IITfE-d3zMUUax51x2Cu-wVwzf5dXXgLsVes.js.gz | Bin 53590 -> 0 bytes ...iLte2HF8K1jZPSATRfsdF5PhoSV3RkYPkdvn9jI.js | 939 -- ...e2HF8K1jZPSATRfsdF5PhoSV3RkYPkdvn9jI.js.gz | Bin 24080 -> 0 bytes ...1hVfcgVAixhmmB6Go8TUMPOiprA-2vkC-oWXARQ.js | 775 -- ...fcgVAixhmmB6Go8TUMPOiprA-2vkC-oWXARQ.js.gz | Bin 33793 -> 0 bytes ...UvvAPthep_WvHGJdgB7P0yamndZnGgLG-iMmVHQ.js | 2017 ---- ...APthep_WvHGJdgB7P0yamndZnGgLG-iMmVHQ.js.gz | Bin 54227 -> 0 bytes ...dZhlBSR2eg2KcpClWSJ1B3NNIU2A4anObxPOxuw.js | 1957 ---- ...lBSR2eg2KcpClWSJ1B3NNIU2A4anObxPOxuw.js.gz | Bin 53586 -> 0 bytes ...H2S1EQaU85ypMDyQGiUfzPFez1IOZKxHnhGkv3E.js | 104 - ...1EQaU85ypMDyQGiUfzPFez1IOZKxHnhGkv3E.js.gz | Bin 1184 -> 0 bytes ...IhjMuRPOACKj5sYske2-m7G_28ktciHcj7Rlkh8.js | 1397 --- ...MuRPOACKj5sYske2-m7G_28ktciHcj7Rlkh8.js.gz | Bin 45523 -> 0 bytes ...nCyx3qUUhDMFq_ulWKsRIWYDjiPzMZcQub-wnMQ.js | 3751 ------- ...x3qUUhDMFq_ulWKsRIWYDjiPzMZcQub-wnMQ.js.gz | Bin 70313 -> 0 bytes ...htOZHf2ZMCzk3-Dd1GckQrKjDOG_ZhGMAYMzXhY.js | 243 - ...ZHf2ZMCzk3-Dd1GckQrKjDOG_ZhGMAYMzXhY.js.gz | Bin 2531 -> 0 bytes ..._b4ZpXGdzXPX-SnZ9kHwiR42FdmhE8WdlI6FUlw.js | 868 -- ...ZpXGdzXPX-SnZ9kHwiR42FdmhE8WdlI6FUlw.js.gz | Bin 24825 -> 0 bytes ...s7AlQ6rJAI78aEDUjOdrWNl6gKiEvnE-MeWeQtk.js | 515 - ...lQ6rJAI78aEDUjOdrWNl6gKiEvnE-MeWeQtk.js.gz | Bin 37942 -> 0 bytes ...p4-G6_36aSyR0L_wOzMRDYDdJVDpnnC5JsU2pxM.js | 2030 ---- ...G6_36aSyR0L_wOzMRDYDdJVDpnnC5JsU2pxM.js.gz | Bin 47379 -> 0 bytes ...cJqDRqllnqGw9cUCSpLi8jJ_zCvz8eaES44X4xo.js | 384 - ...DRqllnqGw9cUCSpLi8jJ_zCvz8eaES44X4xo.js.gz | Bin 3330 -> 0 bytes ...BHAy-a1qALApe5ak_fgOyvjXwxIE2iwBRdoVUGU.js | 2091 ---- ...y-a1qALApe5ak_fgOyvjXwxIE2iwBRdoVUGU.js.gz | Bin 55062 -> 0 bytes ...VKnRXJK5J6Troq7BssmxcsV7KlguT0aIcNUpzoA.js | 139 - ...RXJK5J6Troq7BssmxcsV7KlguT0aIcNUpzoA.js.gz | Bin 10154 -> 0 bytes ...m1bqBB5D34m5o3LoYb3aJotAx0OVX_2xvxNykEI.js | 1 - ...BdxG50Q_vAZiana-5fras68oSvQy_36MdTYvM_U.js | 1 - .../youtube/WrqAjQdNaEI.jpg | Bin themes/bartik/bartik.info | 6 +- themes/garland/garland.info | 6 +- themes/seven/seven.info | 6 +- themes/stark/stark.info | 6 +- 1666 files changed, 42354 insertions(+), 99899 deletions(-) create mode 100644 includes/request-sanitizer.inc mode change 100644 => 100755 scripts/drupal.sh mode change 100644 => 100755 scripts/password-hash.sh mode change 100644 => 100755 scripts/run-tests.sh create mode 100644 sites/all/libraries/APC/#apc.php.inc# create mode 100644 sites/all/libraries/ckeditor_old/.htaccess delete mode 100644 sites/all/libraries/google-api-php-client/examples/fileupload.php delete mode 100644 sites/all/libraries/google-api-php-client/examples/idtoken.php delete mode 100644 sites/all/libraries/google-api-php-client/examples/simplefileupload.php create mode 100644 sites/all/modules/adminimal_admin_menu/CREDITS.txt create mode 100644 sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.admin.inc delete mode 100644 sites/all/modules/adminimal_admin_menu/adminimal_menu_settings.inc delete mode 100644 sites/all/modules/adminimal_admin_menu/credits.txt delete mode 100644 sites/all/modules/adminimal_admin_menu/updates/update_7100.php create mode 100644 sites/all/modules/advanced_help/ASSETS.yml create mode 100644 sites/all/modules/advanced_help/help/.htaccess create mode 100644 sites/all/modules/advanced_help/help_example/ASSETS.yml create mode 100644 sites/all/modules/advanced_help/help_example/help/.htaccess delete mode 100644 sites/all/modules/apc/README.txt delete mode 100644 sites/all/modules/apc/apc.drush.inc delete mode 100644 sites/all/modules/apc/apc.info delete mode 100644 sites/all/modules/apc/apc.install delete mode 100644 sites/all/modules/apc/apc.module delete mode 100644 sites/all/modules/apc/drupal_apc_cache.inc delete mode 100644 sites/all/modules/apc/tests/apc.test delete mode 100644 sites/all/modules/apc_status/README.txt delete mode 100644 sites/all/modules/apc_status/apc_status.admin.inc delete mode 100644 sites/all/modules/apc_status/apc_status.info delete mode 100644 sites/all/modules/apc_status/apc_status.install delete mode 100644 sites/all/modules/apc_status/apc_status.module delete mode 100644 sites/all/modules/barcode/LICENSE.txt delete mode 100755 sites/all/modules/barcode/README.txt delete mode 100644 sites/all/modules/barcode/barcode.info delete mode 100755 sites/all/modules/barcode/barcode.install delete mode 100755 sites/all/modules/barcode/barcode.module delete mode 100644 sites/all/modules/barcode/fonts/DroidSans.ttf delete mode 100644 sites/all/modules/barcode/includes/barcode.admin.inc delete mode 100644 sites/all/modules/barcode/includes/barcode.plugins.inc delete mode 100644 sites/all/modules/barcode/modules/barcode_example/barcode_example.info delete mode 100644 sites/all/modules/barcode/modules/barcode_example/barcode_example.module delete mode 100644 sites/all/modules/barcode/plugins/codabar.inc delete mode 100644 sites/all/modules/barcode/plugins/code128.inc delete mode 100644 sites/all/modules/barcode/plugins/code39.inc delete mode 100644 sites/all/modules/barcode/plugins/code93.inc delete mode 100644 sites/all/modules/barcode/plugins/ean.inc delete mode 100644 sites/all/modules/barcode/plugins/ean8.inc delete mode 100644 sites/all/modules/barcode/plugins/i25.inc delete mode 100644 sites/all/modules/barcode/plugins/postnet.inc delete mode 100755 sites/all/modules/barcode/plugins/qrcode.inc delete mode 100644 sites/all/modules/barcode/plugins/s2o5.inc delete mode 100644 sites/all/modules/barcode/plugins/upce.inc mode change 100644 => 100755 sites/all/modules/beautytips/beautytips_manager.install mode change 100644 => 100755 sites/all/modules/beautytips/beautytips_manager.module mode change 100644 => 100755 sites/all/modules/beautytips/js/bt_custom_styles.js mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/css/colorpicker.css mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/css/layout.css mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/Thumbs.db mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/blank.gif mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_background.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_hex.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_hsb_b.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_hsb_h.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_hsb_s.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_indic.gif mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_overlay.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_rgb_b.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_rgb_g.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_rgb_r.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_select.gif mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/colorpicker_submit.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_background.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_hex.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_hsb_b.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_hsb_h.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_hsb_s.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_indic.gif mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_rgb_b.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_rgb_g.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_rgb_r.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/custom_submit.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/select.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/select2.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/images/slider.png mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/index.html mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/js/colorpicker.js mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/js/eye.js mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/js/jquery.js mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/js/layout.js mode change 100644 => 100755 sites/all/modules/beautytips/other_libs/colorpicker/js/utils.js delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/AUTHORS delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/COPYING delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/README delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/all-wcprops delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/entries delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/format delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/prop-base/ff.jpg.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/text-base/example1.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/text-base/example2.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/text-base/example3.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/.svn/text-base/ff.jpg.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/example1.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/example2.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/example3.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/examples/ff.jpg delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/excanvas.compiled.js delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/excanvas.js delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/all-wcprops delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/entries delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/format delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/prop-base/overflow.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/arc.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/clearpath.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/drawimage.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/gradient.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/gradient2.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/linewidth.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/overflow.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/quadraticcurve.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/resizing.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/saverestorepath.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/stroke-scale-rotate.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/.svn/text-base/stroke-should-not-close-path.html.svn-base delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/arc.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/clearpath.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/drawimage.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/gradient.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/gradient2.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/linewidth.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/overflow.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/quadraticcurve.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/resizing.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/saverestorepath.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/stroke-scale-rotate.html delete mode 100644 sites/all/modules/beautytips/other_libs/excanvas_r3/testcases/stroke-should-not-close-path.html delete mode 100644 sites/all/modules/ctools/CHANGELOG.txt create mode 100644 sites/all/modules/ctools/page_manager/tests/head_links.test create mode 100644 sites/all/modules/ctools/plugins/contexts/language.inc mode change 100644 => 100755 sites/all/modules/ctools/tests/ctools.drush.sh create mode 100644 sites/all/modules/ctools/tests/ctools.test create mode 100644 sites/all/modules/ctools/tests/object_cache_unit.test create mode 100644 sites/all/modules/ctools/tests/page_tokens.test create mode 100644 sites/all/modules/devel/devel_krumo.css rename sites/all/modules/devel/{devel_krumo_path.js => devel_krumo.js} (70%) rename sites/all/modules/devel/krumo/docs/media/images/{Interface.PNG => Interface.png} (100%) mode change 100644 => 100755 sites/all/modules/devel/runtests.sh mode change 100644 => 100755 sites/all/modules/eva/README.txt mode change 100644 => 100755 sites/all/modules/eva/eva-display-entity-view.tpl.php mode change 100644 => 100755 sites/all/modules/eva/eva.module mode change 100644 => 100755 sites/all/modules/eva/eva.theme.inc mode change 100644 => 100755 sites/all/modules/eva/eva.views.inc mode change 100644 => 100755 sites/all/modules/eva/eva_plugin_display_entity.inc create mode 100644 sites/all/modules/globalredirect/README.txt create mode 100644 sites/all/modules/honeypot/README.md delete mode 100644 sites/all/modules/honeypot/README.txt create mode 100644 sites/all/modules/honeypot/docker-compose.yml create mode 100644 sites/all/modules/honeypot/js/honeypot.js delete mode 100644 sites/all/modules/htmlpurifier/plugins/phorum/settings.php delete mode 100644 sites/all/modules/htmlpurifier/smoketests/all.php delete mode 100644 sites/all/modules/htmlpurifier/smoketests/configForm.php delete mode 100644 sites/all/modules/imce/tpl/imce-page.tpl.php delete mode 100644 sites/all/modules/media/LICENSE.txt delete mode 100644 sites/all/modules/media/README.txt delete mode 100644 sites/all/modules/media/css/media.css delete mode 100644 sites/all/modules/media/images/icons/default/application-octet-stream.png delete mode 100644 sites/all/modules/media/images/icons/default/audio-mpeg.png delete mode 100644 sites/all/modules/media/images/icons/default/audio-x-generic.png delete mode 100644 sites/all/modules/media/images/icons/default/file-unknown.png delete mode 100644 sites/all/modules/media/images/icons/default/image-x-generic.png delete mode 100644 sites/all/modules/media/images/icons/default/video-x-generic.png delete mode 100644 sites/all/modules/media/includes/MediaBrowserPlugin.inc delete mode 100644 sites/all/modules/media/includes/MediaBrowserPluginInterface.inc delete mode 100644 sites/all/modules/media/includes/MediaBrowserUpload.inc delete mode 100644 sites/all/modules/media/includes/MediaBrowserView.inc delete mode 100644 sites/all/modules/media/includes/MediaEntityTranslationHandler.inc delete mode 100644 sites/all/modules/media/includes/MediaReadOnlyStreamWrapper.inc delete mode 100644 sites/all/modules/media/includes/media.admin.inc delete mode 100644 sites/all/modules/media/includes/media.browser.inc delete mode 100644 sites/all/modules/media/includes/media.fields.inc delete mode 100644 sites/all/modules/media/includes/media.pages.inc delete mode 100644 sites/all/modules/media/includes/media.theme.inc delete mode 100644 sites/all/modules/media/includes/media_views_plugin_display_media_browser.inc delete mode 100644 sites/all/modules/media/includes/media_views_plugin_style_media_browser.inc delete mode 100644 sites/all/modules/media/js/media.admin.js delete mode 100644 sites/all/modules/media/js/media.browser.js delete mode 100644 sites/all/modules/media/js/media.core.js delete mode 100644 sites/all/modules/media/js/media.js delete mode 100644 sites/all/modules/media/js/media.popups.js delete mode 100644 sites/all/modules/media/js/plugins/media.views.js delete mode 100644 sites/all/modules/media/js/util/ba-debug.min.js delete mode 100644 sites/all/modules/media/js/util/json2.js delete mode 100644 sites/all/modules/media/media-views-view-media-browser.tpl.php delete mode 100644 sites/all/modules/media/media.api.php delete mode 100644 sites/all/modules/media/media.file_default_displays.inc delete mode 100644 sites/all/modules/media/media.info delete mode 100644 sites/all/modules/media/media.install delete mode 100644 sites/all/modules/media/media.media.inc delete mode 100644 sites/all/modules/media/media.module delete mode 100644 sites/all/modules/media/media.views.inc delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/includes/MediaBrowserBulkUpload.inc delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/includes/media_bulk_upload.admin.inc delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/includes/media_bulk_upload.pages.inc delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/media_bulk_upload.info delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/media_bulk_upload.install delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/media_bulk_upload.module delete mode 100644 sites/all/modules/media/modules/media_bulk_upload/tests/media_bulk_upload.test delete mode 100644 sites/all/modules/media/modules/media_internet/includes/MediaBrowserInternet.inc delete mode 100644 sites/all/modules/media/modules/media_internet/includes/MediaInternetBaseHandler.inc delete mode 100644 sites/all/modules/media/modules/media_internet/includes/MediaInternetFileHandler.inc delete mode 100644 sites/all/modules/media/modules/media_internet/includes/MediaInternetNoHandlerException.inc delete mode 100644 sites/all/modules/media/modules/media_internet/includes/MediaInternetValidationException.inc delete mode 100644 sites/all/modules/media/modules/media_internet/media_internet.api.php delete mode 100644 sites/all/modules/media/modules/media_internet/media_internet.info delete mode 100644 sites/all/modules/media/modules/media_internet/media_internet.install delete mode 100644 sites/all/modules/media/modules/media_internet/media_internet.media.inc delete mode 100644 sites/all/modules/media/modules/media_internet/media_internet.module delete mode 100644 sites/all/modules/media/modules/media_internet/tests/includes/MediaInternetTestHandler.inc delete mode 100644 sites/all/modules/media/modules/media_internet/tests/includes/MediaInternetTestStreamWrapper.inc delete mode 100644 sites/all/modules/media/modules/media_internet/tests/media_internet.test delete mode 100644 sites/all/modules/media/modules/media_internet/tests/media_internet_test.info delete mode 100644 sites/all/modules/media/modules/media_internet/tests/media_internet_test.module delete mode 100644 sites/all/modules/media/modules/media_migrate_file_types/includes/media_migrate_file_types.pages.inc delete mode 100644 sites/all/modules/media/modules/media_migrate_file_types/media_migrate_file_types.info delete mode 100644 sites/all/modules/media/modules/media_migrate_file_types/media_migrate_file_types.module delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/css/media_wysiwyg.base.css delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/css/media_wysiwyg.css delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/images/wysiwyg-media.gif delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.features.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.file_usage.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.filter.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.pages.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.uuid.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/js/media_wysiwyg.filter.js delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/js/media_wysiwyg.format_form.js delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/js/wysiwyg-media.js delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.api.php delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.info delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.install delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.module delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.test delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.variable.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/tests/media_wysiwyg.file_usage.test delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/tests/media_wysiwyg.macro.test delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/tests/media_wysiwyg.paragraph_fix_filter.test delete mode 100644 sites/all/modules/media/modules/media_wysiwyg/wysiwyg_plugins/media.inc delete mode 100644 sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info delete mode 100644 sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.install delete mode 100644 sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.module delete mode 100644 sites/all/modules/media/modules/mediafield/mediafield.info delete mode 100644 sites/all/modules/media/modules/mediafield/mediafield.install delete mode 100644 sites/all/modules/media/modules/mediafield/mediafield.module delete mode 100644 sites/all/modules/media/modules/mediafield/mediafield.views.inc delete mode 100644 sites/all/modules/media/templates/media-dialog-page.tpl.php delete mode 100644 sites/all/modules/media/tests/includes/MediaModuleTest.inc delete mode 100644 sites/all/modules/media/tests/media.test delete mode 100644 sites/all/modules/media/tests/media_module_test.info delete mode 100644 sites/all/modules/media/tests/media_module_test.module delete mode 100644 sites/all/modules/media/views/media_default.view.inc create mode 100644 sites/all/modules/metatag/metatag_importer/metatag_importer.metatags_quick.inc delete mode 100644 sites/all/modules/mollom/LICENSE.txt delete mode 100644 sites/all/modules/mollom/README.txt delete mode 100644 sites/all/modules/mollom/images/powered-by-mollom-1.gif delete mode 100644 sites/all/modules/mollom/images/powered-by-mollom-2.gif delete mode 100644 sites/all/modules/mollom/images/refresh.png delete mode 100644 sites/all/modules/mollom/includes/CHANGELOG.md delete mode 100644 sites/all/modules/mollom/includes/LICENSE-GPL.txt delete mode 100644 sites/all/modules/mollom/includes/LICENSE-MIT.txt delete mode 100644 sites/all/modules/mollom/includes/README.md delete mode 100644 sites/all/modules/mollom/includes/TODO.md delete mode 100644 sites/all/modules/mollom/includes/composer.json delete mode 100644 sites/all/modules/mollom/includes/mollom.class.inc delete mode 100644 sites/all/modules/mollom/mollom-captcha-audio.tpl.php delete mode 100644 sites/all/modules/mollom/mollom-captcha-image.tpl.php delete mode 100644 sites/all/modules/mollom/mollom-captcha-player.swf delete mode 100644 sites/all/modules/mollom/mollom.admin.blacklist.js delete mode 100644 sites/all/modules/mollom/mollom.admin.css delete mode 100644 sites/all/modules/mollom/mollom.admin.inc delete mode 100644 sites/all/modules/mollom/mollom.admin.js delete mode 100644 sites/all/modules/mollom/mollom.api.php delete mode 100644 sites/all/modules/mollom/mollom.css delete mode 100644 sites/all/modules/mollom/mollom.drupal.inc delete mode 100644 sites/all/modules/mollom/mollom.flag.css delete mode 100644 sites/all/modules/mollom/mollom.flag.inc delete mode 100644 sites/all/modules/mollom/mollom.flag.js delete mode 100644 sites/all/modules/mollom/mollom.flag.position.css delete mode 100644 sites/all/modules/mollom/mollom.info delete mode 100644 sites/all/modules/mollom/mollom.install delete mode 100644 sites/all/modules/mollom/mollom.js delete mode 100644 sites/all/modules/mollom/mollom.module delete mode 100644 sites/all/modules/mollom/mollom.pages.inc delete mode 100644 sites/all/modules/mollom/tests/mollom.class.test delete mode 100644 sites/all/modules/mollom/tests/mollom.test delete mode 100644 sites/all/modules/mollom/tests/mollom_test.info delete mode 100644 sites/all/modules/mollom/tests/mollom_test.install delete mode 100644 sites/all/modules/mollom/tests/mollom_test.module delete mode 100644 sites/all/modules/mollom/tests/mollom_test_server.info delete mode 100644 sites/all/modules/mollom/tests/mollom_test_server.install delete mode 100644 sites/all/modules/mollom/tests/mollom_test_server.module rename sites/all/modules/{apc => riddler}/LICENSE.txt (100%) create mode 100644 sites/all/modules/riddler/riddler.info create mode 100644 sites/all/modules/riddler/riddler.install create mode 100644 sites/all/modules/riddler/riddler.module create mode 100644 sites/all/modules/security_review/API.txt create mode 100644 sites/all/modules/security_review/IGNOREME.txt rename sites/all/modules/{apc_status => security_review}/LICENSE.txt (100%) create mode 100644 sites/all/modules/security_review/README.txt create mode 100644 sites/all/modules/security_review/security_review.drush.inc create mode 100644 sites/all/modules/security_review/security_review.help.inc create mode 100644 sites/all/modules/security_review/security_review.inc create mode 100644 sites/all/modules/security_review/security_review.info create mode 100644 sites/all/modules/security_review/security_review.install create mode 100644 sites/all/modules/security_review/security_review.js create mode 100644 sites/all/modules/security_review/security_review.module create mode 100644 sites/all/modules/security_review/security_review.pages.inc create mode 100644 sites/all/modules/security_review/security_review.site_audit.inc create mode 100644 sites/all/modules/security_review/tests/security_review.test create mode 100644 sites/all/modules/views/tests/README.txt create mode 100755 sites/all/modules/votingapi/votingapi.migrate.inc create mode 100644 sites/all/modules/yandex_metrics/API.txt delete mode 100644 sites/all/modules/yandex_metrics/README.RU.txt delete mode 100644 sites/all/modules/yandex_metrics/translations/yandex_metrics.pot delete mode 100644 sites/all/modules/yandex_metrics/translations/yandex_metrics.ru.po delete mode 100644 sites/all/modules/yandex_metrics/translations/yandex_metrics.uk.po delete mode 100644 sites/all/modules/yandex_metrics/translations/yandex_metrics_reports.pot delete mode 100644 sites/all/modules/yandex_metrics/translations/yandex_metrics_reports.ru.po delete mode 100644 sites/all/modules/yandex_metrics/translations/yandex_metrics_reports.uk.po create mode 100644 sites/all/modules/yandex_metrics/yandex_metrics.variable.inc delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/API.txt delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/images/progress-indicator.gif delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/js/yandex_metrics_reports.js delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/views/handlers/views_handler_field_ym_title.inc delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/views/yandex_metrics_reports.views.inc delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/yandex_metrics_reports.api.txt delete mode 100644 sites/all/modules/yandex_metrics/yandex_metrics_reports/yandex_metrics_reports.test delete mode 100644 sites/default/files/css/css_-FJi2t2y-2uHUfTHUh0RPmLEt4YHFOOAweEtMxiDQA0.css delete mode 100644 sites/default/files/css/css_-FJi2t2y-2uHUfTHUh0RPmLEt4YHFOOAweEtMxiDQA0.css.gz delete mode 100644 sites/default/files/css/css_0rdNKyAx9df4tRKovKjnVDsGvZwVuYAKO-m17AAJ1Dk.css delete mode 100644 sites/default/files/css/css_0rdNKyAx9df4tRKovKjnVDsGvZwVuYAKO-m17AAJ1Dk.css.gz delete mode 100644 sites/default/files/css/css_1VQ_L6AFQ7En08yF_Uq8qPReBJQiQDgQEmYrjgcos8k.css delete mode 100644 sites/default/files/css/css_1VQ_L6AFQ7En08yF_Uq8qPReBJQiQDgQEmYrjgcos8k.css.gz delete mode 100644 sites/default/files/css/css_1kF33EODTO5gDyEbdpAfYzMKbjG3ottD1s5np0BNI8U.css delete mode 100644 sites/default/files/css/css_1kF33EODTO5gDyEbdpAfYzMKbjG3ottD1s5np0BNI8U.css.gz delete mode 100644 sites/default/files/css/css_1tnfCSN4yWn9UnRCwyZm90LUJUUxf9T6WxvmxJ7yA_U.css delete mode 100644 sites/default/files/css/css_1tnfCSN4yWn9UnRCwyZm90LUJUUxf9T6WxvmxJ7yA_U.css.gz delete mode 100644 sites/default/files/css/css_55THjN9lDx7Bg6x1gp6gwEdVu3VFui9QrqCzKv5N45g.css delete mode 100644 sites/default/files/css/css_55THjN9lDx7Bg6x1gp6gwEdVu3VFui9QrqCzKv5N45g.css.gz delete mode 100644 sites/default/files/css/css_5rEbwJkxfUm7IMhPGCPE-utL2NmS3eDZChNg5Rvr1ZQ.css delete mode 100644 sites/default/files/css/css_5rEbwJkxfUm7IMhPGCPE-utL2NmS3eDZChNg5Rvr1ZQ.css.gz delete mode 100644 sites/default/files/css/css_6FT1RDu44jQk5NvuY7w2dmXb38cQHhLk3m-t3oAn114.css delete mode 100644 sites/default/files/css/css_6FT1RDu44jQk5NvuY7w2dmXb38cQHhLk3m-t3oAn114.css.gz delete mode 100644 sites/default/files/css/css_8fMkUZJGVELXBawG1Ld3G-0G2d2ooFAIn3zvDOpUG1M.css delete mode 100644 sites/default/files/css/css_8fMkUZJGVELXBawG1Ld3G-0G2d2ooFAIn3zvDOpUG1M.css.gz delete mode 100644 sites/default/files/css/css_BrdSdnzra2XbX5n7JYA4kPH44jzYSIn1VD_BqYwid-8.css delete mode 100644 sites/default/files/css/css_BrdSdnzra2XbX5n7JYA4kPH44jzYSIn1VD_BqYwid-8.css.gz delete mode 100644 sites/default/files/css/css_DgjnOFJUpon8iHfRmFWlEqJYH8Tmbvv81qUfql6I8os.css delete mode 100644 sites/default/files/css/css_DgjnOFJUpon8iHfRmFWlEqJYH8Tmbvv81qUfql6I8os.css.gz delete mode 100644 sites/default/files/css/css_Gne25lyf85q9EmEMgRwpvDiT39sU5VwuA4OUeeFbQBc.css delete mode 100644 sites/default/files/css/css_Gne25lyf85q9EmEMgRwpvDiT39sU5VwuA4OUeeFbQBc.css.gz delete mode 100644 sites/default/files/css/css_HcA4r85heo6wvq8azFNfaQVCSa5HEPrhZT7frCwNPn8.css delete mode 100644 sites/default/files/css/css_HcA4r85heo6wvq8azFNfaQVCSa5HEPrhZT7frCwNPn8.css.gz delete mode 100644 sites/default/files/css/css_L2JMKxImcyqA41Z5DR2MEdftlNSSpERRTeajdO9Eqm4.css delete mode 100644 sites/default/files/css/css_L2JMKxImcyqA41Z5DR2MEdftlNSSpERRTeajdO9Eqm4.css.gz delete mode 100644 sites/default/files/css/css_LS9OUalDR9-d_lCAvF3yUWjNU6yF8ZBm84jEPRvoyuQ.css delete mode 100644 sites/default/files/css/css_LS9OUalDR9-d_lCAvF3yUWjNU6yF8ZBm84jEPRvoyuQ.css.gz delete mode 100644 sites/default/files/css/css_UZKQHq62HOKE70JDIdMjjfRn1JIC9YV1VXhRL-j6-RM.css delete mode 100644 sites/default/files/css/css_UZKQHq62HOKE70JDIdMjjfRn1JIC9YV1VXhRL-j6-RM.css.gz delete mode 100644 sites/default/files/css/css_VQB-8KFNI0kba6Wkc-l2KBQPllY8FwASUx-yN_vezGA.css delete mode 100644 sites/default/files/css/css_VQB-8KFNI0kba6Wkc-l2KBQPllY8FwASUx-yN_vezGA.css.gz delete mode 100644 sites/default/files/css/css_Vs4UVC-VTWy46VCaIZs1_Mxom4t0MSIFbDi1OE3E9-8.css delete mode 100644 sites/default/files/css/css_Vs4UVC-VTWy46VCaIZs1_Mxom4t0MSIFbDi1OE3E9-8.css.gz delete mode 100644 sites/default/files/css/css_XD21zER5H42dIiPLMJftH8WgccS5WBSqefdAx_Stxjg.css delete mode 100644 sites/default/files/css/css_XD21zER5H42dIiPLMJftH8WgccS5WBSqefdAx_Stxjg.css.gz delete mode 100644 sites/default/files/css/css_XR9e7B5pluTeBKDa3mg7UuKKg2cuNGR1Qsr1xr99jbs.css delete mode 100644 sites/default/files/css/css_XR9e7B5pluTeBKDa3mg7UuKKg2cuNGR1Qsr1xr99jbs.css.gz delete mode 100644 sites/default/files/css/css_Z8YkFpLOBVXCGcxJEdAuNq8H2pRyPhxpGkexDBB6Ap8.css delete mode 100644 sites/default/files/css/css_Z8YkFpLOBVXCGcxJEdAuNq8H2pRyPhxpGkexDBB6Ap8.css.gz delete mode 100644 sites/default/files/css/css_jDJhtPH22O7US3GKjh2nCEh2sTiGh8k6rbeVqTMcgro.css delete mode 100644 sites/default/files/css/css_jDJhtPH22O7US3GKjh2nCEh2sTiGh8k6rbeVqTMcgro.css.gz delete mode 100644 sites/default/files/css/css_pjyRVAtK4skJALk0LG7i9wQ6eF-fCzbp0XL-jpo9aZw.css delete mode 100644 sites/default/files/css/css_pjyRVAtK4skJALk0LG7i9wQ6eF-fCzbp0XL-jpo9aZw.css.gz delete mode 100644 sites/default/files/css/css_q-wMpXWSg3wM1HUhXLpdpzHtVJUE8LSbZYTP_s7bkRc.css delete mode 100644 sites/default/files/css/css_q-wMpXWSg3wM1HUhXLpdpzHtVJUE8LSbZYTP_s7bkRc.css.gz delete mode 100644 sites/default/files/css/css_qzlkt-CIxI00rwsc92h9VyXlToENxIa7ENoPhKzvDnk.css delete mode 100644 sites/default/files/css/css_qzlkt-CIxI00rwsc92h9VyXlToENxIa7ENoPhKzvDnk.css.gz delete mode 100644 sites/default/files/css/css_uRoDKiGQ3H-eiMk53Zzq4PgC74YyoGtAz7Omf4ts9QI.css delete mode 100644 sites/default/files/css/css_uRoDKiGQ3H-eiMk53Zzq4PgC74YyoGtAz7Omf4ts9QI.css.gz delete mode 100644 sites/default/files/css/css_uuM53MYr5F2Nwtk0PinEqgNgsVVm7pNQGZd1lvWoMK4.css delete mode 100644 sites/default/files/css/css_uuM53MYr5F2Nwtk0PinEqgNgsVVm7pNQGZd1lvWoMK4.css.gz delete mode 100644 sites/default/files/css/css_vSKSKYgzBsFNIRUCfW90d2QRpBJLrRDimGMoqkulTHs.css delete mode 100644 sites/default/files/css/css_vSKSKYgzBsFNIRUCfW90d2QRpBJLrRDimGMoqkulTHs.css.gz delete mode 100644 sites/default/files/css/css_vZ_wrMQ9Og-YPPxa1q4us3N7DsZMJa-14jShHgRoRNo.css delete mode 100644 sites/default/files/css/css_vZ_wrMQ9Og-YPPxa1q4us3N7DsZMJa-14jShHgRoRNo.css.gz delete mode 100644 sites/default/files/css/css_wYL35yC2hBHAc41BozsFXhW-fI6J6cAi-n721ZdSliI.css delete mode 100644 sites/default/files/css/css_wYL35yC2hBHAc41BozsFXhW-fI6J6cAi-n721ZdSliI.css.gz delete mode 100644 sites/default/files/css/css_yh3KyUIUNMryykk3lcWoV2Ry8v9P2xFjAb-oor60Mhw.css delete mode 100644 sites/default/files/css/css_yh3KyUIUNMryykk3lcWoV2Ry8v9P2xFjAb-oor60Mhw.css.gz delete mode 100644 sites/default/files/js/js_4-FHbGjwBnJJGwktMgIkrf59dZ8073w0fMMX8VZTwzQ.js delete mode 100644 sites/default/files/js/js_4-FHbGjwBnJJGwktMgIkrf59dZ8073w0fMMX8VZTwzQ.js.gz delete mode 100644 sites/default/files/js/js_B0WQnHI0aN9cUef0DDGmPsESLLMYBuet2-AOuQp7m44.js delete mode 100644 sites/default/files/js/js_B0WQnHI0aN9cUef0DDGmPsESLLMYBuet2-AOuQp7m44.js.gz delete mode 100644 sites/default/files/js/js_DaJ6neqy0AR5XJOhEuPNUZBO7mauvEemfESoE5sB6h4.js delete mode 100644 sites/default/files/js/js_DaJ6neqy0AR5XJOhEuPNUZBO7mauvEemfESoE5sB6h4.js.gz delete mode 100644 sites/default/files/js/js_Ltt73ruaLhTiDuCF1ts3yJwKQv_7z0hv62oaqxfe1L0.js delete mode 100644 sites/default/files/js/js_Ltt73ruaLhTiDuCF1ts3yJwKQv_7z0hv62oaqxfe1L0.js.gz delete mode 100644 sites/default/files/js/js_M8F7v8IEgsQbXV68TSOSyiOlsMcg6zcRSUS4mF8t6GQ.js delete mode 100644 sites/default/files/js/js_M8F7v8IEgsQbXV68TSOSyiOlsMcg6zcRSUS4mF8t6GQ.js.gz delete mode 100644 sites/default/files/js/js_RA-KIE8aTyF1IiBW-7pQqVIlNd7iEctFsNM56paxFjE.js delete mode 100644 sites/default/files/js/js_RA-KIE8aTyF1IiBW-7pQqVIlNd7iEctFsNM56paxFjE.js.gz delete mode 100644 sites/default/files/js/js_TrXqFMiIITfE-d3zMUUax51x2Cu-wVwzf5dXXgLsVes.js delete mode 100644 sites/default/files/js/js_TrXqFMiIITfE-d3zMUUax51x2Cu-wVwzf5dXXgLsVes.js.gz delete mode 100644 sites/default/files/js/js_XN__iLte2HF8K1jZPSATRfsdF5PhoSV3RkYPkdvn9jI.js delete mode 100644 sites/default/files/js/js_XN__iLte2HF8K1jZPSATRfsdF5PhoSV3RkYPkdvn9jI.js.gz delete mode 100644 sites/default/files/js/js_Xjzh1hVfcgVAixhmmB6Go8TUMPOiprA-2vkC-oWXARQ.js delete mode 100644 sites/default/files/js/js_Xjzh1hVfcgVAixhmmB6Go8TUMPOiprA-2vkC-oWXARQ.js.gz delete mode 100644 sites/default/files/js/js_YEkEUvvAPthep_WvHGJdgB7P0yamndZnGgLG-iMmVHQ.js delete mode 100644 sites/default/files/js/js_YEkEUvvAPthep_WvHGJdgB7P0yamndZnGgLG-iMmVHQ.js.gz delete mode 100644 sites/default/files/js/js_ZVlMdZhlBSR2eg2KcpClWSJ1B3NNIU2A4anObxPOxuw.js delete mode 100644 sites/default/files/js/js_ZVlMdZhlBSR2eg2KcpClWSJ1B3NNIU2A4anObxPOxuw.js.gz delete mode 100644 sites/default/files/js/js_a_XWH2S1EQaU85ypMDyQGiUfzPFez1IOZKxHnhGkv3E.js delete mode 100644 sites/default/files/js/js_a_XWH2S1EQaU85ypMDyQGiUfzPFez1IOZKxHnhGkv3E.js.gz delete mode 100644 sites/default/files/js/js_bf9dIhjMuRPOACKj5sYske2-m7G_28ktciHcj7Rlkh8.js delete mode 100644 sites/default/files/js/js_bf9dIhjMuRPOACKj5sYske2-m7G_28ktciHcj7Rlkh8.js.gz delete mode 100644 sites/default/files/js/js_m_o6nCyx3qUUhDMFq_ulWKsRIWYDjiPzMZcQub-wnMQ.js delete mode 100644 sites/default/files/js/js_m_o6nCyx3qUUhDMFq_ulWKsRIWYDjiPzMZcQub-wnMQ.js.gz delete mode 100644 sites/default/files/js/js_nV_phtOZHf2ZMCzk3-Dd1GckQrKjDOG_ZhGMAYMzXhY.js delete mode 100644 sites/default/files/js/js_nV_phtOZHf2ZMCzk3-Dd1GckQrKjDOG_ZhGMAYMzXhY.js.gz delete mode 100644 sites/default/files/js/js_pELf_b4ZpXGdzXPX-SnZ9kHwiR42FdmhE8WdlI6FUlw.js delete mode 100644 sites/default/files/js/js_pELf_b4ZpXGdzXPX-SnZ9kHwiR42FdmhE8WdlI6FUlw.js.gz delete mode 100644 sites/default/files/js/js_tF1us7AlQ6rJAI78aEDUjOdrWNl6gKiEvnE-MeWeQtk.js delete mode 100644 sites/default/files/js/js_tF1us7AlQ6rJAI78aEDUjOdrWNl6gKiEvnE-MeWeQtk.js.gz delete mode 100644 sites/default/files/js/js_xAF_p4-G6_36aSyR0L_wOzMRDYDdJVDpnnC5JsU2pxM.js delete mode 100644 sites/default/files/js/js_xAF_p4-G6_36aSyR0L_wOzMRDYDdJVDpnnC5JsU2pxM.js.gz delete mode 100644 sites/default/files/js/js_yBfMcJqDRqllnqGw9cUCSpLi8jJ_zCvz8eaES44X4xo.js delete mode 100644 sites/default/files/js/js_yBfMcJqDRqllnqGw9cUCSpLi8jJ_zCvz8eaES44X4xo.js.gz delete mode 100644 sites/default/files/js/js_yPVQBHAy-a1qALApe5ak_fgOyvjXwxIE2iwBRdoVUGU.js delete mode 100644 sites/default/files/js/js_yPVQBHAy-a1qALApe5ak_fgOyvjXwxIE2iwBRdoVUGU.js.gz delete mode 100644 sites/default/files/js/js_zwU0VKnRXJK5J6Troq7BssmxcsV7KlguT0aIcNUpzoA.js delete mode 100644 sites/default/files/js/js_zwU0VKnRXJK5J6Troq7BssmxcsV7KlguT0aIcNUpzoA.js.gz delete mode 100755 sites/default/files/languages/be_zJsPm1bqBB5D34m5o3LoYb3aJotAx0OVX_2xvxNykEI.js delete mode 100755 sites/default/files/languages/ru_VH95BdxG50Q_vAZiana-5fras68oSvQy_36MdTYvM_U.js mode change 100755 => 100644 sites/default/files/video_embed_field_thumbnails/youtube/WrqAjQdNaEI.jpg diff --git a/.gitignore b/.gitignore index addb7386..11f7f989 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,24 @@ # Ignore configuration files that may contain sensitive information. sites/*/settings*.php - # Ignore paths that contain user-generated content. sites/*/files sites/*/private +*~ -sites/default/files/css/ -sites/default/files/js/ -sites/all/themes/landing-integration-gradka +.drush +.lesshst +.viminfo +.htaccess +.htpasswd +sites/default/settings.php +sites/default/files/languages* +sites/default/files/css* +sites/default/files/js* +.ht.filecache +db +phpmyadmin +robots.txt +robots-old.txt +php_info.php +sites/all/themes/landing-integration-gradka/ +.htaccess_new diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c015fb4f..799b8003 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,32 @@ +Drupal 7.58, 2018-03-28 +----------------------- +- Fixed security issues (multiple vulnerabilities). See SA-CORE-2018-002. + +Drupal 7.57, 2018-02-21 +----------------------- +- Fixed security issues (multiple vulnerabilities). See SA-CORE-2018-001. + +Drupal 7.56, 2017-06-21 +----------------------- +- Fixed security issues (access bypass). See SA-CORE-2017-003. + +Drupal 7.55, 2017-06-07 +----------------------- +- Fixed incompatibility with PHP versions 7.0.19 and 7.1.5 due to duplicate + DATE_RFC7231 definition. +- Made Drupal core pass all automated tests on PHP 7.1. +- Allowed services such as Let's Encrypt to work with Drupal on Apache, by + making Drupal's .htaccess file allow access to the .well-known directory + defined by RFC 5785. +- Made new Drupal sites work correctly on Apache 2.4 when the mod_access_compat + Apache module is disabled. +- Fixed Drupal's URL-generating functions to always encode '[' and ']' so that + the URLs will pass HTML5 validation. +- Various additional bug fixes. +- Various API documentation improvements. +- Additional automated test coverage. + Drupal 7.54, 2017-02-01 ----------------------- - Modules are now able to define theme engines (API addition: diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 456484b9..06acf935 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.54'); +define('VERSION', '7.58'); /** * Core API compatibility. @@ -2632,6 +2632,10 @@ function _drupal_bootstrap_configuration() { timer_start('page'); // Initialize the configuration, including variables from settings.php. drupal_settings_initialize(); + + // Sanitize unsafe keys from the request. + require_once DRUPAL_ROOT . '/includes/request-sanitizer.inc'; + DrupalRequestSanitizer::sanitize(); } /** diff --git a/includes/common.inc b/includes/common.inc index da8996a1..d7dc47f2 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -487,7 +487,7 @@ function drupal_http_build_query(array $query, $parent = '') { $params = array(); foreach ($query as $key => $value) { - $key = ($parent ? $parent . '[' . rawurlencode($key) . ']' : rawurlencode($key)); + $key = $parent ? $parent . rawurlencode('[' . $key . ']') : rawurlencode($key); // Recurse into children. if (is_array($value)) { @@ -2236,8 +2236,11 @@ function url($path = NULL, array $options = array()) { 'prefix' => '' ); + // Determine whether this is an external link, but ensure that the current + // path is always treated as internal by default (to prevent external link + // injection vulnerabilities). if (!isset($options['external'])) { - $options['external'] = url_is_external($path); + $options['external'] = $path === $_GET['q'] ? FALSE : url_is_external($path); } // Preserve the original path before altering or aliasing. diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index 41579659..fb3d0ab5 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -11,7 +11,7 @@ */ /** - * The name by which to obtain a lock for retrive the next insert id. + * The name by which to obtain a lock for retrieving the next insert id. */ define('POSTGRESQL_NEXTID_LOCK', 1000); @@ -55,7 +55,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection { $connection_options['pdo'] += array( // Prepared statements are most effective for performance when queries // are recycled (used several times). However, if they are not re-used, - // prepared statements become ineffecient. Since most of Drupal's + // prepared statements become inefficient. Since most of Drupal's // prepared queries are not re-used, it should be faster to emulate // the preparation than to actually ready statements for re-use. If in // doubt, reset to FALSE and measure performance. @@ -175,14 +175,14 @@ class DatabaseConnection_pgsql extends DatabaseConnection { } /** - * Retrive a the next id in a sequence. + * Retrieve the next id in a sequence. * * PostgreSQL has built in sequences. We'll use these instead of inserting * and updating a sequences table. */ public function nextId($existing = 0) { - // Retrive the name of the sequence. This information cannot be cached + // Retrieve the name of the sequence. This information cannot be cached // because the prefix may change, for example, like it does in simpletests. $sequence_name = $this->makeSequenceName('sequences', 'value'); @@ -194,7 +194,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection { } // PostgreSQL advisory locks are simply locks to be used by an - // application such as Drupal. This will prevent other Drupal proccesses + // application such as Drupal. This will prevent other Drupal processes // from altering the sequence while we are. $this->query("SELECT pg_advisory_lock(" . POSTGRESQL_NEXTID_LOCK . ")"); @@ -209,7 +209,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection { // Reset the sequence to a higher value than the existing id. $this->query("ALTER SEQUENCE " . $sequence_name . " RESTART WITH " . ($existing + 1)); - // Retrive the next id. We know this will be as high as we want it. + // Retrieve the next id. We know this will be as high as we want it. $id = $this->query("SELECT nextval('" . $sequence_name . "')")->fetchField(); $this->query("SELECT pg_advisory_unlock(" . POSTGRESQL_NEXTID_LOCK . ")"); diff --git a/includes/database/pgsql/install.inc b/includes/database/pgsql/install.inc index c77f4ea7..122031ee 100644 --- a/includes/database/pgsql/install.inc +++ b/includes/database/pgsql/install.inc @@ -165,7 +165,7 @@ class DatabaseTasks_pgsql extends DatabaseTasks { LANGUAGE \'sql\'' ); - // Using || to concatenate in Drupal is not recommeneded because there are + // Using || to concatenate in Drupal is not recommended because there are // database drivers for Drupal that do not support the syntax, however // they do support CONCAT(item1, item2) which we can replicate in // PostgreSQL. PostgreSQL requires the function to be defined for each diff --git a/includes/database/pgsql/select.inc b/includes/database/pgsql/select.inc index f6a83db7..5b8736d6 100644 --- a/includes/database/pgsql/select.inc +++ b/includes/database/pgsql/select.inc @@ -80,7 +80,7 @@ class SelectQuery_pgsql extends SelectQuery { } // If a table loads all fields, it can not be added again. It would - // result in an ambigious alias error because that field would be loaded + // result in an ambiguous alias error because that field would be loaded // twice: Once through table_alias.* and once directly. If the field // actually belongs to a different table, it must be added manually. foreach ($this->tables as $table) { @@ -90,7 +90,7 @@ class SelectQuery_pgsql extends SelectQuery { } // If $field contains an characters which are not allowed in a field name - // it is considered an expression, these can't be handeld automatically + // it is considered an expression, these can't be handled automatically // either. if ($this->connection->escapeField($field) != $field) { return $return; diff --git a/includes/database/query.inc b/includes/database/query.inc index c9c5a832..048c8a26 100644 --- a/includes/database/query.inc +++ b/includes/database/query.inc @@ -845,8 +845,8 @@ class DeleteQuery extends Query implements QueryConditionInterface { /** * Executes the DELETE query. * - * @return - * The return value is dependent on the database connection. + * @return int + * The number of rows affected by the delete query. */ public function execute() { $values = array(); @@ -1242,7 +1242,7 @@ class UpdateQuery extends Query implements QueryConditionInterface { * MergeQuery::updateFields() and MergeQuery::insertFields() needs to be called * instead. MergeQuery::fields() can also be called which calls both of these * methods as the common case is to use the same column-value pairs for both - * INSERT and UPDATE. However, this is not mandatory. Another convinient + * INSERT and UPDATE. However, this is not mandatory. Another convenient * wrapper is MergeQuery::key() which adds the same column-value pairs to the * condition and the INSERT query part. * diff --git a/includes/database/schema.inc b/includes/database/schema.inc index d8344c62..31862db3 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -164,6 +164,9 @@ require_once dirname(__FILE__) . '/query.inc'; * @see drupal_install_schema() */ +/** + * Base class for database schema definitions. + */ abstract class DatabaseSchema implements QueryPlaceholderInterface { protected $connection; @@ -291,7 +294,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { protected function buildTableNameCondition($table_name, $operator = '=', $add_prefix = TRUE) { $info = $this->connection->getConnectionOptions(); - // Retrive the table name and schema + // Retrieve the table name and schema $table_info = $this->getPrefixInfo($table_name, $add_prefix); $condition = new DatabaseCondition('AND'); diff --git a/includes/database/sqlite/query.inc b/includes/database/sqlite/query.inc index 1c6289bd..c9c028bb 100644 --- a/includes/database/sqlite/query.inc +++ b/includes/database/sqlite/query.inc @@ -99,16 +99,15 @@ class UpdateQuery_sqlite extends UpdateQuery { /** * SQLite specific implementation of DeleteQuery. - * - * When the WHERE is omitted from a DELETE statement and the table being deleted - * has no triggers, SQLite uses an optimization to erase the entire table content - * without having to visit each row of the table individually. - * - * Prior to SQLite 3.6.5, SQLite does not return the actual number of rows deleted - * by that optimized "truncate" optimization. */ class DeleteQuery_sqlite extends DeleteQuery { public function execute() { + // When the WHERE is omitted from a DELETE statement and the table being + // deleted has no triggers, SQLite uses an optimization to erase the entire + // table content without having to visit each row of the table individually. + // Prior to SQLite 3.6.5, SQLite does not return the actual number of rows + // deleted by that optimized "truncate" optimization. But we want to return + // the number of rows affected, so we calculate it directly. if (!count($this->condition)) { $total_rows = $this->connection->query('SELECT COUNT(*) FROM {' . $this->connection->escapeTable($this->table) . '}')->fetchField(); parent::execute(); diff --git a/includes/database/sqlite/schema.inc b/includes/database/sqlite/schema.inc index df19d2fa..281d8fc6 100644 --- a/includes/database/sqlite/schema.inc +++ b/includes/database/sqlite/schema.inc @@ -244,7 +244,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema { // database. So the syntax '...RENAME TO database.table' would fail. // So we must determine the full table name here rather than surrounding // the table with curly braces incase the db_prefix contains a reference - // to a database outside of our existsing database. + // to a database outside of our existing database. $info = $this->getPrefixInfo($new_name); $this->connection->query('ALTER TABLE {' . $table . '} RENAME TO ' . $info['table']); diff --git a/includes/errors.inc b/includes/errors.inc index 7393148e..3548d1fd 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -66,7 +66,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c _drupal_log_error(array( '%type' => isset($types[$error_level]) ? $severity_msg : 'Unknown error', // The standard PHP error handler considers that the error messages - // are HTML. We mimick this behavior here. + // are HTML. We mimic this behavior here. '!message' => filter_xss_admin($message), '%function' => $caller['function'], '%file' => $caller['file'], @@ -114,7 +114,7 @@ function _drupal_decode_exception($exception) { return array( '%type' => get_class($exception), // The standard PHP exception handler considers that the exception message - // is plain-text. We mimick this behavior here. + // is plain-text. We mimic this behavior here. '!message' => check_plain($message), '%function' => $caller['function'], '%file' => $caller['file'], @@ -233,7 +233,7 @@ function _drupal_log_error($error, $fatal = FALSE) { } else { // Display the message if the current error reporting level allows this type - // of message to be displayed, and unconditionnaly in update.php. + // of message to be displayed, and unconditionally in update.php. if (error_displayable($error)) { $class = 'error'; diff --git a/includes/file.inc b/includes/file.inc index de9d17d6..fa7f5eb5 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -535,7 +535,18 @@ SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 EOF; if ($private) { - $lines = "Deny from all\n\n" . $lines; + $lines = << + Require all denied + + +# Deny all requests from Apache 2.0-2.2. + + Deny from all + +EOF + . "\n\n" . $lines; } return $lines; @@ -889,7 +900,6 @@ function file_valid_uri($uri) { */ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXISTS_RENAME) { $original_source = $source; - $original_destination = $destination; // Assert that the source file actually exists. if (!file_exists($source)) { @@ -1604,6 +1614,20 @@ function file_save_upload($form_field_name, $validators = array(), $destination // If we made it this far it's safe to record this file in the database. if ($file = file_save($file)) { + // Track non-public files in the session if they were uploaded by an + // anonymous user. This allows modules such as the File module to only + // grant view access to the specific anonymous user who uploaded the file. + // See file_file_download(). + // The 'file_public_schema' variable is used to allow other publicly + // accessible file schemes to be treated the same as the public:// scheme + // provided by Drupal core and to avoid adding unnecessary data to the + // session (and the resulting bypass of the page cache) in those cases. For + // security reasons, only schemes that are completely publicly accessible, + // with no download restrictions, should be added to this variable. See + // file_managed_file_value(). + if (!$user->uid && !in_array($destination_scheme, variable_get('file_public_schema', array('public')))) { + $_SESSION['anonymous_allowed_file_ids'][$file->fid] = $file->fid; + } // Add file to the cache. $upload_cache[$form_field_name] = $file; return $file; @@ -2553,7 +2577,6 @@ function file_directory_temp() { * An associative array of headers, as expected by file_transfer(). */ function file_get_content_headers($file) { - $name = mime_header_encode($file->filename); $type = mime_header_encode($file->filemime); return array( diff --git a/includes/request-sanitizer.inc b/includes/request-sanitizer.inc new file mode 100644 index 00000000..1daa6b53 --- /dev/null +++ b/includes/request-sanitizer.inc @@ -0,0 +1,82 @@ + implode(', ', $get_sanitized_keys))), E_USER_NOTICE); + } + + // Process request body parameters. + $post_sanitized_keys = array(); + $_POST = self::stripDangerousValues($_POST, $whitelist, $post_sanitized_keys); + if ($log_sanitized_keys && $post_sanitized_keys) { + _drupal_trigger_error_with_delayed_logging(format_string('Potentially unsafe keys removed from request body parameters (POST): @keys', array('@keys' => implode(', ', $post_sanitized_keys))), E_USER_NOTICE); + } + + // Process cookie parameters. + $cookie_sanitized_keys = array(); + $_COOKIE = self::stripDangerousValues($_COOKIE, $whitelist, $cookie_sanitized_keys); + if ($log_sanitized_keys && $cookie_sanitized_keys) { + _drupal_trigger_error_with_delayed_logging(format_string('Potentially unsafe keys removed from cookie parameters (COOKIE): @keys', array('@keys' => implode(', ', $cookie_sanitized_keys))), E_USER_NOTICE); + } + + $request_sanitized_keys = array(); + $_REQUEST = self::stripDangerousValues($_REQUEST, $whitelist, $request_sanitized_keys); + + self::$sanitized = TRUE; + } + } + + /** + * Strips dangerous keys from the provided input. + * + * @param mixed $input + * The input to sanitize. + * @param string[] $whitelist + * An array of keys to whitelist as safe. + * @param string[] $sanitized_keys + * An array of keys that have been removed. + * + * @return mixed + * The sanitized input. + */ + protected static function stripDangerousValues($input, array $whitelist, array &$sanitized_keys) { + if (is_array($input)) { + foreach ($input as $key => $value) { + if ($key !== '' && $key[0] === '#' && !in_array($key, $whitelist, TRUE)) { + unset($input[$key]); + $sanitized_keys[] = $key; + } + else { + $input[$key] = self::stripDangerousValues($input[$key], $whitelist, $sanitized_keys); + } + } + } + return $input; + } + +} diff --git a/index.php b/index.php index 26f64729..8b831997 100644 --- a/index.php +++ b/index.php @@ -1,12 +1,5 @@ = 0) { + // Default to a safe data type. + type = 'text'; + } + } + return jquery_httpData.call(this, xhr, type, s); + }; + $.httpData.prototype = jquery_httpData.prototype; +} + /** * Attach all registered behaviors to a page element. * @@ -137,7 +173,7 @@ Drupal.detachBehaviors = function (context, settings, trigger) { */ Drupal.checkPlain = function (str) { var character, regex, - replace = { '&': '&', '"': '"', '<': '<', '>': '>' }; + replace = { '&': '&', "'": ''', '"': '"', '<': '<', '>': '>' }; str = String(str); for (character in replace) { if (replace.hasOwnProperty(character)) { @@ -168,23 +204,76 @@ Drupal.checkPlain = function (str) { Drupal.formatString = function(str, args) { // Transform arguments before inserting them. for (var key in args) { - switch (key.charAt(0)) { - // Escaped only. - case '@': - args[key] = Drupal.checkPlain(args[key]); - break; - // Pass-through. - case '!': - break; - // Escaped and placeholder. - case '%': - default: - args[key] = Drupal.theme('placeholder', args[key]); - break; + if (args.hasOwnProperty(key)) { + switch (key.charAt(0)) { + // Escaped only. + case '@': + args[key] = Drupal.checkPlain(args[key]); + break; + // Pass-through. + case '!': + break; + // Escaped and placeholder. + default: + args[key] = Drupal.theme('placeholder', args[key]); + break; + } } - str = str.replace(key, args[key]); } - return str; + + return Drupal.stringReplace(str, args, null); +}; + +/** + * Replace substring. + * + * The longest keys will be tried first. Once a substring has been replaced, + * its new value will not be searched again. + * + * @param {String} str + * A string with placeholders. + * @param {Object} args + * Key-value pairs. + * @param {Array|null} keys + * Array of keys from the "args". Internal use only. + * + * @return {String} + * Returns the replaced string. + */ +Drupal.stringReplace = function (str, args, keys) { + if (str.length === 0) { + return str; + } + + // If the array of keys is not passed then collect the keys from the args. + if (!$.isArray(keys)) { + keys = []; + for (var k in args) { + if (args.hasOwnProperty(k)) { + keys.push(k); + } + } + + // Order the keys by the character length. The shortest one is the first. + keys.sort(function (a, b) { return a.length - b.length; }); + } + + if (keys.length === 0) { + return str; + } + + // Take next longest one from the end. + var key = keys.pop(); + var fragments = str.split(key); + + if (keys.length) { + for (var i = 0; i < fragments.length; i++) { + // Process each fragment with a copy of remaining keys. + fragments[i] = Drupal.stringReplace(fragments[i], args, keys.slice(0)); + } + } + + return fragments.join(args[key]); }; /** @@ -251,7 +340,7 @@ Drupal.t = function (str, args, options) { * A translated string. */ Drupal.formatPlural = function (count, singular, plural, args, options) { - var args = args || {}; + args = args || {}; args['@count'] = count; // Determine the index of the plural form. var index = Drupal.locale.pluralFormula ? Drupal.locale.pluralFormula(args['@count']) : ((args['@count'] == 1) ? 0 : 1); diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info index 67ebdc00..e8645d1f 100644 --- a/modules/aggregator/aggregator.info +++ b/modules/aggregator/aggregator.info @@ -7,8 +7,8 @@ files[] = aggregator.test configure = admin/config/services/aggregator/settings stylesheets[all][] = aggregator.css -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 70f8c5cd..02c9ec46 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -455,6 +455,14 @@ function aggregator_save_category($edit) { db_delete('aggregator_category') ->condition('cid', $edit['cid']) ->execute(); + // Remove category from feeds. + db_delete('aggregator_category_feed') + ->condition('cid', $edit['cid']) + ->execute(); + // Remove category from feed items. + db_delete('aggregator_category_item') + ->condition('cid', $edit['cid']) + ->execute(); // Make sure there is no active block for this category. if (module_exists('block')) { db_delete('block') diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test index d84ee785..afa791d6 100644 --- a/modules/aggregator/aggregator.test +++ b/modules/aggregator/aggregator.test @@ -418,7 +418,7 @@ class CategorizeFeedTestCase extends AggregatorTestCase { } /** - * Creates a feed and makes sure you can add more than one category to it. + * Creates a feed and makes sure you can add/delete categories to it. */ function testCategorizeFeed() { @@ -448,7 +448,31 @@ class CategorizeFeedTestCase extends AggregatorTestCase { // Assert the feed has two categories. $this->getFeedCategories($db_feed); $this->assertEqual(count($db_feed->categories), 2, 'Feed has 2 categories'); + + // Use aggregator_save_feed() to delete a category. + $category = reset($categories); + aggregator_save_category(array('cid' => $category->cid)); + + // Assert that category is deleted. + $db_category = db_query("SELECT COUNT(*) FROM {aggregator_category} WHERE cid = :cid", array(':cid' => $category->cid))->fetchField(); + $this->assertFalse($db_category, format_string('The category %title has been deleted.', array('%title' => $category->title))); + + // Assert that category has been removed from feed. + $categorized_feeds = db_query("SELECT COUNT(*) FROM {aggregator_category_feed} WHERE cid = :cid", array(':cid' => $category->cid))->fetchField(); + $this->assertFalse($categorized_feeds, format_string('The category %title has been removed from feed %feed_title.', array('%title' => $category->title, '%feed_title' => $feed['title']))); + + // Assert that no broken links (associated with the deleted category) + // appear on one of the other category pages. + $this->createSampleNodes(); + $this->drupalGet('admin/config/services/aggregator'); + $this->clickLink('update items'); + $categories = $this->getCategories(); + $category = reset($categories); + $this->drupalGet('aggregator/categories/' . $category->cid); + global $base_path; + $this->assertNoRaw(','); } + } /** @@ -685,9 +709,21 @@ class CategorizeFeedItemTestCase extends AggregatorTestCase { } } + // Delete category from feed items when category is deleted. + $cid = reset($feed->categories); + $categories = $this->getCategories(); + $category_title = $categories[$cid]->title; + + // Delete category. + aggregator_save_category(array('cid' => $cid)); + + // Assert category has been removed from feed items. + $categorized_count = db_query("SELECT COUNT(*) FROM {aggregator_category_item} WHERE cid = :cid", array(':cid' => $cid))->fetchField(); + $this->assertFalse($categorized_count, format_string('The category %title has been removed from feed items.', array('%title' => $category_title))); // Delete feed. $this->deleteFeed($feed); } + } /** diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info index 49838960..e6d5a0a7 100644 --- a/modules/aggregator/tests/aggregator_test.info +++ b/modules/aggregator/tests/aggregator_test.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/block/block.info b/modules/block/block.info index 9e47f1ff..934bfdea 100644 --- a/modules/block/block.info +++ b/modules/block/block.info @@ -6,8 +6,8 @@ core = 7.x files[] = block.test configure = admin/structure/block -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/block/block.module b/modules/block/block.module index 73e11621..d68ea9e7 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -432,23 +432,20 @@ function _block_rehash($theme = NULL) { drupal_alter('block_info', $current_blocks, $theme, $code_blocks); foreach ($current_blocks as $module => $module_blocks) { foreach ($module_blocks as $delta => $block) { - if (!isset($block['pages'])) { - // {block}.pages is type 'text', so it cannot have a - // default value, and not null, so we need to provide - // value if the module did not. - $block['pages'] = ''; - } - // Make sure weight is set. - if (!isset($block['weight'])) { - $block['weight'] = 0; - } + // Make sure certain attributes are set. + $block += array( + 'pages' => '', + 'weight' => 0, + 'status' => 0, + ); + // Check for active blocks in regions that are not available. if (!empty($block['region']) && $block['region'] != BLOCK_REGION_NONE && !isset($regions[$block['region']]) && $block['status'] == 1) { drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block['info'], '%region' => $block['region'])), 'warning'); // Disabled modules are moved into the BLOCK_REGION_NONE later so no // need to move the block to another region. $block['status'] = 0; } - // Set region to none if not enabled and make sure status is set. + // Set region to none if not enabled. if (empty($block['status'])) { $block['status'] = 0; $block['region'] = BLOCK_REGION_NONE; diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info index ef1f7138..d7e22203 100644 --- a/modules/block/tests/block_test.info +++ b/modules/block/tests/block_test.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info index be82747e..31b43824 100644 --- a/modules/block/tests/themes/block_test_theme/block_test_theme.info +++ b/modules/block/tests/themes/block_test_theme/block_test_theme.info @@ -13,8 +13,8 @@ regions[footer] = Footer regions[highlighted] = Highlighted regions[help] = Help -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/blog/blog.info b/modules/blog/blog.info index 0302f22f..84ad946d 100644 --- a/modules/blog/blog.info +++ b/modules/blog/blog.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = blog.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/book/book.info b/modules/book/book.info index 396bd669..53e454bf 100644 --- a/modules/book/book.info +++ b/modules/book/book.info @@ -7,8 +7,8 @@ files[] = book.test configure = admin/content/book/settings stylesheets[all][] = book.css -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/color/color.info b/modules/color/color.info index 2b588106..0d17ce11 100644 --- a/modules/color/color.info +++ b/modules/color/color.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = color.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/comment/comment.info b/modules/comment/comment.info index 69885dbb..5d5abbf4 100644 --- a/modules/comment/comment.info +++ b/modules/comment/comment.info @@ -9,8 +9,8 @@ files[] = comment.test configure = admin/content/comment stylesheets[all][] = comment.css -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/contact/contact.info b/modules/contact/contact.info index 464c2246..b365daf9 100644 --- a/modules/contact/contact.info +++ b/modules/contact/contact.info @@ -6,8 +6,8 @@ core = 7.x files[] = contact.test configure = admin/structure/contact -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 9a48f231..9c6671a9 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -234,7 +234,14 @@ function contact_form_user_profile_form_alter(&$form, &$form_state) { * Implements hook_user_presave(). */ function contact_user_presave(&$edit, $account, $category) { - $edit['data']['contact'] = isset($edit['contact']) ? $edit['contact'] : variable_get('contact_default_status', 1); + if (isset($edit['contact'])) { + // Set new value. + $edit['data']['contact'] = $edit['contact']; + } + elseif (!isset($account->data['contact'])) { + // Use default if none has been set. + $edit['data']['contact'] = variable_get('contact_default_status', 1); + } } /** diff --git a/modules/contact/contact.test b/modules/contact/contact.test index 6693b574..6a1674a0 100644 --- a/modules/contact/contact.test +++ b/modules/contact/contact.test @@ -346,6 +346,28 @@ class ContactPersonalTestCase extends DrupalWebTestCase { $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); $this->assertResponse(200); + // Test that users can disable their contact form. + $this->drupalLogin($this->contact_user); + $edit = array('contact' => FALSE); + $this->drupalPost('user/' . $this->contact_user->uid . '/edit', $edit, 'Save'); + $this->drupalLogout(); + $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); + $this->assertResponse(403); + + // Test that user's contact status stays disabled when saving. + $contact_user_temp = user_load($this->contact_user->uid, TRUE); + user_save($contact_user_temp); + $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); + $this->assertResponse(403); + + // Test that users can enable their contact form. + $this->drupalLogin($this->contact_user); + $edit = array('contact' => TRUE); + $this->drupalPost('user/' . $this->contact_user->uid . '/edit', $edit, 'Save'); + $this->drupalLogout(); + $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); + $this->assertResponse(200); + // Revoke the personal contact permission for the anonymous user. user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms')); $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info index b57e9f67..ba47a4cb 100644 --- a/modules/contextual/contextual.info +++ b/modules/contextual/contextual.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = contextual.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info index d17a9740..d6e98660 100644 --- a/modules/dashboard/dashboard.info +++ b/modules/dashboard/dashboard.info @@ -7,8 +7,8 @@ files[] = dashboard.test dependencies[] = block configure = admin/dashboard/customize -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info index 89b66c11..cb85f811 100644 --- a/modules/dblog/dblog.info +++ b/modules/dblog/dblog.info @@ -5,8 +5,8 @@ version = VERSION core = 7.x files[] = dblog.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/field.info b/modules/field/field.info index d19c29d1..e05108ec 100644 --- a/modules/field/field.info +++ b/modules/field/field.info @@ -11,8 +11,8 @@ dependencies[] = field_sql_storage required = TRUE stylesheets[all][] = theme/field.css -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info index a35372a8..05434613 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.info +++ b/modules/field/modules/field_sql_storage/field_sql_storage.info @@ -7,8 +7,8 @@ dependencies[] = field files[] = field_sql_storage.test required = TRUE -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info index 0cd4939c..bef7e4a2 100644 --- a/modules/field/modules/list/list.info +++ b/modules/field/modules/list/list.info @@ -7,8 +7,8 @@ dependencies[] = field dependencies[] = options files[] = tests/list.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info index 4bd2dae2..2d4d6cce 100644 --- a/modules/field/modules/list/tests/list_test.info +++ b/modules/field/modules/list/tests/list_test.info @@ -5,8 +5,8 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info index d3c995e5..c65d94ae 100644 --- a/modules/field/modules/number/number.info +++ b/modules/field/modules/number/number.info @@ -6,8 +6,8 @@ core = 7.x dependencies[] = field files[] = number.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info index d395377a..632ca24f 100644 --- a/modules/field/modules/options/options.info +++ b/modules/field/modules/options/options.info @@ -6,8 +6,8 @@ core = 7.x dependencies[] = field files[] = options.test -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info index 678bdab3..fe93a35a 100644 --- a/modules/field/modules/text/text.info +++ b/modules/field/modules/text/text.info @@ -7,8 +7,8 @@ dependencies[] = field files[] = text.test required = TRUE -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info index 07eed538..ce3c7251 100644 --- a/modules/field/tests/field_test.info +++ b/modules/field/tests/field_test.info @@ -6,8 +6,8 @@ files[] = field_test.entity.inc version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2017-02-01 -version = "7.54" +; Information added by Drupal.org packaging script on 2018-03-28 +version = "7.58" project = "drupal" -datestamp = "1485986921" +datestamp = "1522264019" diff --git a/modules/field/theme/field.tpl.php b/modules/field/theme/field.tpl.php index f0f9d583..460fd2e2 100644 --- a/modules/field/theme/field.tpl.php +++ b/modules/field/theme/field.tpl.php @@ -4,8 +4,10 @@ * @file field.tpl.php * Default template implementation to display the value of a field. * - * This file is not used and is here as a starting point for customization only. - * @see theme_field() + * This file is not used by Drupal core, which uses theme functions instead for + * performance reasons. The markup is the same, though, so if you want to use + * template files rather than functions to extend field theming, copy this to + * your custom theme. See theme_field() for a discussion of performance. * * Available variables: * - $items: An array of field values. Use render() to output them. @@ -45,7 +47,7 @@ */ ?> + + + +
+

+ +
Opcode Cache
+

+ +
+
+ +
  • Refresh Data
  • +EOB; +echo + menu_entry(1,'View Host Stats'), + menu_entry(2,'System Cache Entries'); +if ($AUTHENTICATED) { + echo menu_entry(4,'Per-Directory Entries'); +} +echo + menu_entry(3,'User Cache Entries'), + menu_entry(9,'Version Check'); + +if ($AUTHENTICATED) { + echo <<Clear $cache_mode Cache +EOB; +} +echo << +EOB; + + +// CONTENT +echo << +EOB; + +// MAIN SWITCH STATEMENT + +switch ($MYREQUEST['OB']) { + + + + + +// ----------------------------------------------- +// Host Stats +// ----------------------------------------------- +case OB_HOST_STATS: + $mem_size = $mem['num_seg']*$mem['seg_size']; + $mem_avail= $mem['avail_mem']; + $mem_used = $mem_size-$mem_avail; + $seg_size = bsize($mem['seg_size']); + $req_rate = sprintf("%.2f",($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time'])); + $hit_rate = sprintf("%.2f",($cache['num_hits'])/($time-$cache['start_time'])); + $miss_rate = sprintf("%.2f",($cache['num_misses'])/($time-$cache['start_time'])); + $insert_rate = sprintf("%.2f",($cache['num_inserts'])/($time-$cache['start_time'])); + $req_rate_user = sprintf("%.2f",($cache_user['num_hits']+$cache_user['num_misses'])/($time-$cache_user['start_time'])); + $hit_rate_user = sprintf("%.2f",($cache_user['num_hits'])/($time-$cache_user['start_time'])); + $miss_rate_user = sprintf("%.2f",($cache_user['num_misses'])/($time-$cache_user['start_time'])); + $insert_rate_user = sprintf("%.2f",($cache_user['num_inserts'])/($time-$cache_user['start_time'])); + $apcversion = phpversion('apc'); + $phpversion = phpversion(); + $number_files = $cache['num_entries']; + $size_files = bsize($cache['mem_size']); + $number_vars = $cache_user['num_entries']; + $size_vars = bsize($cache_user['mem_size']); + $i=0; + echo <<< EOB +

    General Cache Information

    + + + +EOB; + + if(!empty($_SERVER['SERVER_NAME'])) + echo "\n"; + if(!empty($_SERVER['SERVER_SOFTWARE'])) + echo "\n"; + + echo << +EOB; + echo ''; + echo ''; + echo ''; + echo <<
    APC Version$apcversion
    PHP Version$phpversion
    APC Host{$_SERVER['SERVER_NAME']} $host
    Server Software{$_SERVER['SERVER_SOFTWARE']}
    Shared Memory{$mem['num_seg']} Segment(s) with $seg_size +
    ({$cache['memory_type']} memory, {$cache['locking_type']} locking) +
    Start Time',date(DATE_FORMAT,$cache['start_time']),'
    Uptime',duration($cache['start_time']),'
    File Upload Support',$cache['file_upload_progress'],'
    +
    + +

    File Cache Information

    + + + + + + + + + +
    Cached Files$number_files ($size_files)
    Hits{$cache['num_hits']}
    Misses{$cache['num_misses']}
    Request Rate (hits, misses)$req_rate cache requests/second
    Hit Rate$hit_rate cache requests/second
    Miss Rate$miss_rate cache requests/second
    Insert Rate$insert_rate cache requests/second
    Cache full count{$cache['expunges']}
    +
    + +

    User Cache Information

    + + + + + + + + + + +
    Cached Variables$number_vars ($size_vars)
    Hits{$cache_user['num_hits']}
    Misses{$cache_user['num_misses']}
    Request Rate (hits, misses)$req_rate_user cache requests/second
    Hit Rate$hit_rate_user cache requests/second
    Miss Rate$miss_rate_user cache requests/second
    Insert Rate$insert_rate_user cache requests/second
    Cache full count{$cache_user['expunges']}
    +
    + +

    Runtime Settings

    +EOB; + + $j = 0; + foreach (ini_get_all('apc') as $k => $v) { + echo "\n"; + $j = 1 - $j; + } + + if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1) + $mem_note = "Memory Usage
    (multiple slices indicate fragments)"; + else + $mem_note = "Memory Usage"; + + echo <<< EOB +
    ",$k,"",str_replace(',',',
    ',$v['local_value']),"
    +
    + +

    Host Status Diagrams

    + +EOB; + $size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10); + echo << + + + +EOB; + + echo + graphics_avail() ? + ''. + "". + "\n" + : "", + '', + '\n", + '\n", + '', + '', + '\n", + '\n"; + echo <<< EOB + +
    $mem_noteHits & Misses
    \"\"\"\"
     Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size)," Hits: ',$cache['num_hits'].sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"
     Used: ',bsize($mem_used ).sprintf(" (%.1f%%)",$mem_used *100/$mem_size)," Misses: ',$cache['num_misses'].sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"
    + +
    +

    Detailed Memory Usage and Fragmentation

    + + + + +EOB; + if(isset($mem['adist'])) { + foreach($mem['adist'] as $i=>$v) { + $cur = pow(2,$i); $nxt = pow(2,$i+1)-1; + if($i==0) $range = "1"; + else $range = "$cur - $nxt"; + echo "\n"; + } + } + echo <<

    +EOB; + + // Fragementation: (freeseg - 1) / total_seg + $nseg = $freeseg = $fragsize = $freetotal = 0; + for($i=0; $i<$mem['num_seg']; $i++) { + $ptr = 0; + foreach($mem['block_lists'][$i] as $block) { + if ($block['offset'] != $ptr) { + ++$nseg; + } + $ptr = $block['offset'] + $block['size']; + /* Only consider blocks <5M for the fragmentation % */ + if($block['size']<(5*1024*1024)) $fragsize+=$block['size']; + $freetotal+=$block['size']; + } + $freeseg += count($mem['block_lists'][$i]); + } + + if ($freeseg > 1) { + $frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg); + } else { + $frag = "0%"; + } + + if (graphics_avail()) { + $size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10); + echo << +EOB; + } + echo <<Fragmentation: $frag +
    $range$v
    +
    +EOB; + + break; + + +// ----------------------------------------------- +// User Cache Entries +// ----------------------------------------------- +case OB_USER_CACHE: + if (!$AUTHENTICATED) { + echo '
    You need to login to see the user values here!
     
    '; + put_login_link("Login now!"); + echo '
    '; + break; + } + $fieldname='info'; + $fieldheading='User Entry Label'; + $fieldkey='info'; + +// ----------------------------------------------- +// System Cache Entries +// ----------------------------------------------- +case OB_SYS_CACHE: + if (!isset($fieldname)) + { + $fieldname='filename'; + $fieldheading='Script Filename'; + if(ini_get("apc.stat")) $fieldkey='inode'; + else $fieldkey='filename'; + } + if (!empty($MYREQUEST['SH'])) + { + echo <<< EOB +
    + +EOB; + + $m=0; + foreach($scope_list as $j => $list) { + foreach($cache[$list] as $i => $entry) { + if (md5($entry[$fieldkey])!=$MYREQUEST['SH']) continue; + foreach($entry as $k => $value) { + if (!$AUTHENTICATED) { + // hide all path entries if not logged in + $value=preg_replace('/^.*(\\/|\\\\)/','<hidden>/',$value); + } + + if ($k == "num_hits") { + $value=sprintf("%s (%.2f%%)",$value,$value*100/$cache['num_hits']); + } + if ($k == 'deletion_time') { + if(!$entry['deletion_time']) $value = "None"; + } + echo + "", + "", + "", + ""; + $m=1-$m; + } + if($fieldkey=='info') { + echo "\n"; + } + break; + } + } + + echo <<
    AttributeValue
    ",ucwords(preg_replace("/_/"," ",$k)),"",(preg_match("/time/",$k) && $value!='None') ? date(DATE_FORMAT,$value) : htmlspecialchars($value, ENT_QUOTES, 'UTF-8'),"
    Stored Value
    ";
    +																																																													      	   		   		     $output = var_export(apc_fetch($entry[$fieldkey]),true);
    +																																																																		     	         echo htmlspecialchars($output, ENT_QUOTES, 'UTF-8');
    +																																																																				      					     echo "
    +
    +EOB; + break; + } + + $cols=6; + echo <<
    Scope: + + ", + ", Sorting:', + '', + '', + '  Search: ', + ' ', + '
    '; + + if (isset($MYREQUEST['SEARCH'])) { + // Don't use preg_quote because we want the user to be able to specify a + // regular expression subpattern. + $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i'; + if (preg_match($MYREQUEST['SEARCH'], 'test') === false) { + echo '
    Error: enter a valid regular expression as a search query.
    '; + break; + } + } + + echo + '
    ', + '', + '', + '', + '', + '', + '', + ''; + + if($fieldname=='info') { + $cols+=2; + echo ''; + } + echo ''; + + // builds list with alpha numeric sortable keys + // + $list = array(); + foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) { + switch($MYREQUEST['SORT1']) { + case 'A': $k=sprintf('%015d-',$entry['access_time']); break; + case 'H': $k=sprintf('%015d-',$entry['num_hits']); break; + case 'Z': $k=sprintf('%015d-',$entry['mem_size']); break; + case 'M': $k=sprintf('%015d-',$entry['mtime']); break; + case 'C': $k=sprintf('%015d-',$entry['creation_time']); break; + case 'T': $k=sprintf('%015d-',$entry['ttl']); break; + case 'D': $k=sprintf('%015d-',$entry['deletion_time']); break; + case 'S': $k=''; break; + } + if (!$AUTHENTICATED) { + // hide all path entries if not logged in + $list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry); + } else { + $list[$k.$entry[$fieldname]]=$entry; + } + } + + if ($list) { + + // sort list + // + switch ($MYREQUEST['SORT2']) { + case "A": krsort($list); break; + case "D": ksort($list); break; + } + + // output list + $i=0; + foreach($list as $k => $entry) { + if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) { + $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8'); + echo + '', + "', + '', + '', + '', + '', + ''; + + if($fieldname=='info') { + if($entry['ttl']) + echo ''; + else + echo ''; + } + if ($entry['deletion_time']) { + + echo ''; + } else if ($MYREQUEST['OB'] == OB_USER_CACHE) { + + echo ''; + } else { + echo ''; + } + echo ''; + $i++; + if ($i == $MYREQUEST['COUNT']) + break; + } + } + + } else { + echo ''; + } + echo <<< EOB +
    ',sortheader('S',$fieldheading, "&OB=".$MYREQUEST['OB']),'',sortheader('H','Hits', "&OB=".$MYREQUEST['OB']),'',sortheader('Z','Size', "&OB=".$MYREQUEST['OB']),'',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'',sortheader('C','Created at', "&OB=".$MYREQUEST['OB']),'',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'
    ",$field_value,'',$entry['num_hits'],'',$entry['mem_size'],'',date(DATE_FORMAT,$entry['access_time']),'',date(DATE_FORMAT,$entry['mtime']),'',date(DATE_FORMAT,$entry['creation_time']),''.$entry['ttl'].' secondsNone', date(DATE_FORMAT,$entry['deletion_time']), ''; + echo '[Delete Now]'; + echo '  
    No data
    +EOB; + + if ($list && $i < count($list)) { + echo "",count($list)-$i,' more available...'; + } + + echo <<< EOB +
    +EOB; + break; + + +// ----------------------------------------------- +// Per-Directory System Cache Entries +// ----------------------------------------------- +case OB_SYS_CACHE_DIR: + if (!$AUTHENTICATED) { + break; + } + + echo <<
    Scope: + + ", + ", Sorting:', + '', + '', + ", Group By Dir Level:', + ' ', + '
    ', + + '
    ', + '', + '', + '', + '', + '', + '', + '', + ''; + + // builds list with alpha numeric sortable keys + // + $tmp = $list = array(); + foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $entry) { + $n = dirname($entry['filename']); + if ($MYREQUEST['AGGR'] > 0) { + $n = preg_replace("!^(/?(?:[^/\\\\]+[/\\\\]){".($MYREQUEST['AGGR']-1)."}[^/\\\\]*).*!", "$1", $n); + } + if (!isset($tmp[$n])) { + $tmp[$n] = array('hits'=>0,'size'=>0,'ents'=>0); + } + $tmp[$n]['hits'] += $entry['num_hits']; + $tmp[$n]['size'] += $entry['mem_size']; + ++$tmp[$n]['ents']; + } + + foreach ($tmp as $k => $v) { + switch($MYREQUEST['SORT1']) { + case 'A': $kn=sprintf('%015d-',$v['size'] / $v['ents']);break; + case 'T': $kn=sprintf('%015d-',$v['ents']); break; + case 'H': $kn=sprintf('%015d-',$v['hits']); break; + case 'Z': $kn=sprintf('%015d-',$v['size']); break; + case 'C': $kn=sprintf('%015d-',$v['hits'] / $v['ents']);break; + case 'S': $kn = $k; break; + } + $list[$kn.$k] = array($k, $v['ents'], $v['hits'], $v['size']); + } + + if ($list) { + + // sort list + // + switch ($MYREQUEST['SORT2']) { + case "A": krsort($list); break; + case "D": ksort($list); break; + } + + // output list + $i = 0; + foreach($list as $entry) { + echo + '', + "', + '', + '', + '', + '', + '', + ''; + + if (++$i == $MYREQUEST['COUNT']) break; + } + + } else { + echo ''; + } + echo <<< EOB +
    ',sortheader('S','Directory Name', "&OB=".$MYREQUEST['OB']),'',sortheader('T','Number of Files',"&OB=".$MYREQUEST['OB']),'',sortheader('H','Total Hits', "&OB=".$MYREQUEST['OB']),'',sortheader('Z','Total Size', "&OB=".$MYREQUEST['OB']),'',sortheader('C','Avg. Hits', "&OB=".$MYREQUEST['OB']),'',sortheader('A','Avg. Size', "&OB=".$MYREQUEST['OB']),'
    ",$entry[0],'',$entry[1],'',$entry[2],'',$entry[3],'',round($entry[2] / $entry[1]),'',round($entry[3] / $entry[1]),'
    No data
    +EOB; + + if ($list && $i < count($list)) { + echo "",count($list)-$i,' more available...'; + } + + echo <<< EOB +
    +EOB; + break; + +// ----------------------------------------------- +// Version check +// ----------------------------------------------- +case OB_VERSION_CHECK: + echo <<

    APC Version Information

    + + + + +EOB; + if (defined('PROXY')) { + $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) ); + $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apc.rss", False, $ctxt); + } else { + $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apc.rss"); + } + if (!$rss) { + echo ''; + } else { + $apcversion = phpversion('apc'); + + preg_match('!APC ([0-9.]+)!', $rss, $match); + echo ''; + echo ''; + } + echo <<< EOB +
    Unable to fetch version information.
    '; + if (version_compare($apcversion, $match[1], '>=')) { + echo '
    You are running the latest version of APC ('.$apcversion.')
    '; + $i = 3; + } else { + echo '
    You are running an older version of APC ('.$apcversion.'), + newer version '.$match[1].' is available at + http://pecl.php.net/package/APC/'.$match[1].' +
    '; + $i = -1; + } + echo '

    Change Log:


    '; + + preg_match_all('!<(title|description)>([^<]+)!', $rss, $match); + next($match[2]); next($match[2]); + + while (list(,$v) = each($match[2])) { + list(,$ver) = explode(' ', $v, 2); + if ($i < 0 && version_compare($apcversion, $ver, '>=')) { + break; + } else if (!$i--) { + break; + } + echo "".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."
    "; + echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."
    "; + next($match[2]); + } + echo '
    + +EOB; + break; + +} + +echo <<< EOB + +EOB; + +?> + + + + } else { + imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1); + } + } + } \ No newline at end of file diff --git a/sites/all/libraries/ckeditor_old/.htaccess b/sites/all/libraries/ckeditor_old/.htaccess new file mode 100644 index 00000000..1427d97f --- /dev/null +++ b/sites/all/libraries/ckeditor_old/.htaccess @@ -0,0 +1,24 @@ +# +# Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +# For licensing, see LICENSE.html or http://ckeditor.com/license +# + +# +# On some specific Linux installations you could face problems with Firefox. +# It could give you errors when loading the editor saying that some illegal +# characters were found (three strange chars in the beginning of the file). +# This could happen if you map the .js or .css files to PHP, for example. +# +# Those characters are the Byte Order Mask (BOM) of the Unicode encoded files. +# All FCKeditor files are Unicode encoded. +# + +AddType application/x-javascript .js +AddType text/css .css + +# +# If PHP is mapped to handle XML files, you could have some issues. The +# following will disable it. +# + +AddType text/xml .xml diff --git a/sites/all/libraries/google-api-php-client/examples/fileupload.php b/sites/all/libraries/google-api-php-client/examples/fileupload.php deleted file mode 100644 index 0940e1c0..00000000 --- a/sites/all/libraries/google-api-php-client/examples/fileupload.php +++ /dev/null @@ -1,137 +0,0 @@ -'; -$client_secret = ''; -$redirect_uri = ''; - -$client = new Google_Client(); -$client->setClientId($client_id); -$client->setClientSecret($client_secret); -$client->setRedirectUri($redirect_uri); -$client->addScope("https://www.googleapis.com/auth/drive"); -$service = new Google_Service_Drive($client); - -if (isset($_REQUEST['logout'])) { - unset($_SESSION['upload_token ']); -} - -if (isset($_GET['code'])) { - $client->authenticate($_GET['code']); - $_SESSION['upload_token'] = $client->getAccessToken(); - $redirect = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; - header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL)); -} - -if (isset($_SESSION['upload_token']) && $_SESSION['upload_token']) { - $client->setAccessToken($_SESSION['upload_token']); - if ($client->isAccessTokenExpired()) { - unset($_SESSION['upload_token']); - } -} else { - $authUrl = $client->createAuthUrl(); -} - -/************************************************ - If we're signed in then lets try to upload our - file. - ************************************************/ -if ($client->getAccessToken()) { - $file = new Google_Service_Drive_DriveFile(); - $file->title = "Big File"; - $chunkSizeBytes = 1 * 1024 * 1024; - - // Call the API with the media upload, defer so it doesn't immediately return. - $client->setDefer(true); - $request = $service->files->insert($file); - - // Create a media file upload to represent our upload process. - $media = new Google_Http_MediaFileUpload( - $client, - $request, - 'text/plain', - null, - true, - $chunkSizeBytes - ); - $media->setFileSize(filesize(TESTFILE)); - - // Upload the various chunks. $status will be false until the process is - // complete. - $status = false; - $handle = fopen(TESTFILE, "rb"); - while (!$status && !feof($handle)) { - $chunk = fread($handle, $chunkSizeBytes); - $status = $media->nextChunk($chunk); - } - - // The final value of $status will be the data from the API for the object - // that has been uploaded. - $result = false; - if ($status != false) { - $result = $status; - } - - fclose($handle); -} -echo pageHeader("File Upload - Uploading a large file"); -if ( - $client_id == '' - || $client_secret == '' - || $redirect_uri == '') { - echo missingClientSecretsWarning(); -} -?> -
    -
    -Connect Me!"; -} -?> -
    - -
    - -
    -
    -'; -$client_secret = ''; -$redirect_uri = ''; - -$client = new Google_Client(); -$client->setClientId($client_id); -$client->setClientSecret($client_secret); -$client->setRedirectUri($redirect_uri); -$client->setScopes('email'); - -/************************************************ - If we're logging out we just need to clear our - local access token in this case - ************************************************/ -if (isset($_REQUEST['logout'])) { - unset($_SESSION['access_token']); -} - -/************************************************ - If we have a code back from the OAuth 2.0 flow, - we need to exchange that with the authenticate() - function. We store the resultant access token - bundle in the session, and redirect to ourself. - ************************************************/ -if (isset($_GET['code'])) { - $client->authenticate($_GET['code']); - $_SESSION['access_token'] = $client->getAccessToken(); - $redirect = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; - header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL)); -} - -/************************************************ - If we have an access token, we can make - requests, else we generate an authentication URL. - ************************************************/ -if (isset($_SESSION['access_token']) && $_SESSION['access_token']) { - $client->setAccessToken($_SESSION['access_token']); -} else { - $authUrl = $client->createAuthUrl(); -} - -/************************************************ - If we're signed in we can go ahead and retrieve - the ID token, which is part of the bundle of - data that is exchange in the authenticate step - - we only need to do a network call if we have - to retrieve the Google certificate to verify it, - and that can be cached. - ************************************************/ -if ($client->getAccessToken()) { - $_SESSION['access_token'] = $client->getAccessToken(); - $token_data = $client->verifyIdToken()->getAttributes(); -} - -echo pageHeader("User Query - Retrieving An Id Token"); -if ( - $client_id == '' - || $client_secret == '' - || $redirect_uri == '') { - echo missingClientSecretsWarning(); -} -?> -
    -
    -Connect Me!"; -} else { - echo "Logout"; -} -?> -
    - -
    - -
    -
    -'; -$client_secret = ''; -$redirect_uri = ''; - -$client = new Google_Client(); -$client->setClientId($client_id); -$client->setClientSecret($client_secret); -$client->setRedirectUri($redirect_uri); -$client->addScope("https://www.googleapis.com/auth/drive"); -$service = new Google_Service_Drive($client); - -if (isset($_REQUEST['logout'])) { - unset($_SESSION['upload_token']); -} - -if (isset($_GET['code'])) { - $client->authenticate($_GET['code']); - $_SESSION['upload_token'] = $client->getAccessToken(); - $redirect = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; - header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL)); -} - -if (isset($_SESSION['upload_token']) && $_SESSION['upload_token']) { - $client->setAccessToken($_SESSION['upload_token']); - if ($client->isAccessTokenExpired()) { - unset($_SESSION['upload_token']); - } -} else { - $authUrl = $client->createAuthUrl(); -} - -/************************************************ - If we're signed in then lets try to upload our - file. For larger files, see fileupload.php. - ************************************************/ -if ($client->getAccessToken()) { - // This is uploading a file directly, with no metadata associated. - $file = new Google_Service_Drive_DriveFile(); - $result = $service->files->insert( - $file, - array( - 'data' => file_get_contents(TESTFILE), - 'mimeType' => 'application/octet-stream', - 'uploadType' => 'media' - ) - ); - - // Now lets try and send the metadata as well using multipart! - $file = new Google_Service_Drive_DriveFile(); - $file->setTitle("Hello World!"); - $result2 = $service->files->insert( - $file, - array( - 'data' => file_get_contents(TESTFILE), - 'mimeType' => 'application/octet-stream', - 'uploadType' => 'multipart' - ) - ); -} - -echo pageHeader("File Upload - Uploading a small file"); -if ( - $client_id == '' - || $client_secret == '' - || $redirect_uri == '') { - echo missingClientSecretsWarning(); -} -?> -
    -
    -Connect Me!"; -} -?> -
    - -
    -title); - var_dump($result2->title); -} -?> -
    -
    - 'fieldset', + '#title' => t('Shortcut options'), + ); + + if (module_exists('shortcut')) { + // Create the select list. + $form['shortcut']['adminimal_admin_menu_render'] = array( + '#type' => 'radios', + '#title' => t('Rendering method'), + '#default_value' => variable_get('adminimal_admin_menu_render', 'collapsed'), + '#options' => array( + 'hidden' => t('Hidden'), + 'inline' => t('Inline'), + 'collapsed' => t('Collapsed'), + 'newline' => t('Newline'), + 'dropdown' => t('Dropdown'), + 'exclusive' => t('Exclusive'), + ), + '#required' => TRUE, + ); + + $descriptions = &$form['shortcut']['adminimal_admin_menu_render']; + $descriptions['hidden']['#description'] = t('Shortcuts will not be rendered inside the admin menu.'); + $descriptions['inline']['#description'] = t('Shortcuts will be rendered on the same line with the root menu links.'); + $descriptions['collapsed']['#description'] = t('Shortcuts will be collapsed like a normal menu.'); + $descriptions['newline']['#description'] = t('(Default)') . ' ' . t('Shortcuts will be rendered on a new line, below the root menu links.'); + $descriptions['dropdown']['#description'] = t('Shortcuts will be rendered inside a dropdown using the select html tag.'); + $descriptions['exclusive']['#description'] = t('Only the shortcuts will be rendered; the normal menu will be hidden.'); + } + else { + $form['shortcut']['#description'] = t('Module Shortcut is supported, but not required by Adminimal Admin Menu.'); + } + + // Create the advanced settings category. + $form['advanced_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Advanced settings'), + '#description' => t('Do not change any of the advanced setting unless you know what you are doing!'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['advanced_settings']['adminimal_admin_menu_slicknav'] = array( + '#type' => 'checkbox', + '#default_value' => variable_get('adminimal_admin_menu_slicknav', TRUE), + '#title' => t('Enable Responsive Menu.'), + '#description' => t('Enable this option if you want to have responsive menu and mobile device support. While disabling this option could save you few kilobytes (around 3KB), it will completely disable the responsive menu functionality.'), + ); + + $form['advanced_settings']['adminimal_admin_menu_jquery'] = array( + '#type' => 'checkbox', + '#default_value' => variable_get('adminimal_admin_menu_jquery', TRUE), + '#title' => t('Load the required jQuery 1.7 library automagically.'), + '#description' => t('This will load the newer jQuery version 1.7 using the no-conflict method so it won\'t interfere with any existing jQuery or other JavaScript libraries. The only reason to un-check this if you are already using a newer version of jQuery site-wide and its globally accessible by the "$" variable. Un-cheking this option could save you 33KB, but it may also break your JavaScript if not used correctly.'), + '#states' => array( + // Hide the settings when the cancel notify checkbox is disabled. + 'visible' => array( + ':input[name="adminimal_admin_menu_slicknav"]' => array('checked' => TRUE), + ), + ), + ); + + $form['advanced_settings']['adminimal_admin_menu_viewport'] = array( + '#type' => 'checkbox', + '#default_value' => variable_get('adminimal_admin_menu_viewport', TRUE), + '#title' => t('Set the metatag viewport \'width=device-width, initial-scale=1\' for devices.'), + '#description' => t('This is needed for the responsive menu, if no other theme or module sets the viewport.'), + '#states' => array( + // Hide the settings when the cancel notify checkbox is disabled. + 'visible' => array( + ':input[name="adminimal_admin_menu_slicknav"]' => array('checked' => TRUE), + ), + ), + ); + + $form = system_settings_form($form); + + $form['#submit'][] = 'adminimal_admin_menu_settings_submit'; + + return $form; +} + +/** + * Submit callback for adminimal_admin_menu_settings(); + */ +function adminimal_admin_menu_settings_submit($form, &$form_state) { + // Clear the admin menu cache. + admin_menu_flush_caches(); +} diff --git a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.css b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.css index 3edb463a..e8335719 100644 --- a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.css +++ b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.css @@ -6,22 +6,18 @@ font-weight: 300; src: local('Open Sans Light'), local('OpenSans-Light'), url(https://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTRsxEYwM7FgeyaSgU71cLG0.woff) format('woff'); } - @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; src: local('Open Sans'), local('OpenSans'), url(https://themes.googleusercontent.com/static/fonts/opensans/v6/uYKcPVoh6c5R0NpdEY5A-Q.woff) format('woff'); } - @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 600; src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(https://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNShsxEYwM7FgeyaSgU71cLG0.woff) format('woff'); } - - /* Blink Animation */ @keyframes blink { @@ -38,7 +34,6 @@ color: #fff; } } - @-moz-keyframes blink { 0% { background-color: #f69231; @@ -53,7 +48,6 @@ color: #fff; } } - @-webkit-keyframes blink { 0% { background-color: #f69231; @@ -68,7 +62,6 @@ color: #fff; } } - @-o-keyframes blink { 0% { background-color: #f69231; @@ -83,15 +76,12 @@ color: #fff; } } - body.admin-menu.adminimal-menu #admin-menu *::-moz-focus-inner { border: 0; } - body.admin-menu.adminimal-menu { - margin-top: 0px !important; + margin-top: 0 !important; } - body.admin-menu.adminimal-menu:before { content: ""; display: block; @@ -100,18 +90,15 @@ body.admin-menu.adminimal-menu:before { top: 0; left: 0; } - body.adminimal-menu div#admin-menu { background: #333; background: none repeat scroll 0 0 #202020; - border-bottom: 1px solid #111111; + border-bottom: 1px solid #111; font-family: Open Sans, "Segoe UI", "Helvetica", sans-serif; } - body.adminimal-menu div#admin-menu li.admin-menu-toolbar-home-menu { background: transparent; } - body.adminimal-menu div#admin-menu ul.dropdown span.admin-menu-home-icon { background: url("images/home.svg") no-repeat scroll 0 0 transparent; display: block; @@ -119,7 +106,6 @@ body.adminimal-menu div#admin-menu ul.dropdown span.admin-menu-home-icon { padding: 0; width: 15px; } - body.adminimal-menu div#admin-menu a, body.adminimal-menu div#admin-menu span { border: none !important; @@ -127,146 +113,114 @@ body.adminimal-menu div#admin-menu span { font-size: 12px; line-height: 18px; } - body.adminimal-menu div#admin-menu a:hover { background-color: #0074bd; color: #fff; } - body.adminimal-menu #admin-menu .dropdown li li { background-color: #1f1f1f; } - body.adminimal-menu #admin-menu .dropdown li li.expandable ul { margin-top: -28px; } - body.adminimal-menu #admin-menu .dropdown li li > li.admin-menu-toolbar-category { background: #fff !important; } - body.adminimal-menu #admin-menu .dropdown li li li:hover, body.adminimal-menu #admin-menu .dropdown li:hover { background: #0074bd !important; } - body.adminimal-menu #admin-menu .dropdown a { border-right: none; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-toolbar-category a { line-height: 20px; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-toolbar-category a:focus { - background: #0074BD; + background: #0074bd; } - body.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li { opacity: 1; } - body.adminimal-menu #admin-menu .dropdown li li:hover, body.adminimal-menu #admin-menu .dropdown li li.iehover { background-color: #333; } - body.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li a { border: none; } - body.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li.expandable { background: url("images/square.png") no-repeat scroll 145px 11px #1f1f1f; } - body.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li.expandable a { background: transparent; padding-right: 25px; } - body.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li.expandable:hover { background: url("images/square.png") no-repeat scroll 145px -83px #0074bd !important; } - - /* Shortcuts bar */ body.adminimal-menu div.toolbar-shortcuts { float: left; } - body.adminimal-menu div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu { margin: 0; padding: 0; } - body.adminimal-menu div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu li { float: left; list-style: none outside none; padding: 0; margin: 0; } - body.adminimal-menu div.shortcut-toolbar div#toolbar a#edit-shortcuts { float: right; line-height: 18px; padding: 5px 10px; text-decoration: none; } - body.adminimal-menu div.shortcut-toolbar div#toolbar a#edit-shortcuts:hover { text-decoration: none; } - body.adminimal-menu div.shortcut-toolbar div#toolbar a#edit-shortcuts:focus { - background: #0074BD; + background: #0074bd; } - body.adminimal-menu #admin-menu .dropdown li ul { box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); } - body.adminimal-menu #admin-menu .dropdown li ul { - border-top: 3px solid #0074BD; + border-top: 3px solid #0074bd; } - body.adminimal-menu #admin-menu .admin-menu-toolbar-category.expandable .dropdown li ul, body.adminimal-menu #admin-menu .dropdown.admin-menu-search-results li ul { border-top: none; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action a { border: none !important; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action:first-child a { background: #444; padding: 5px 10px; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action:first-child a:hover, body.adminimal-menu #admin-menu .dropdown li.admin-menu-action:first-child a:focus { background: #b73939; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action.admin-menu-users { border-left: 1px solid #000; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action.admin-menu-users a:hover { - background: #0074BD; + background: #0074bd; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action.admin-menu-account a { background: #4d8f46 !important; border: medium none; padding: 5px 10px; } - body.adminimal-menu #admin-menu .dropdown li.admin-menu-action.admin-menu-account a:hover { background: #277d1e !important; } - body.adminimal-menu #admin-menu #admin-menu-wrapper div#toolbar div.toolbar-shortcuts ul li a { background: url("images/shortcut.png") no-repeat scroll 7px 7px transparent; border-radius: 0 0 0 0; @@ -275,17 +229,15 @@ body.adminimal-menu #admin-menu #admin-menu-wrapper div#toolbar div.toolbar-shor padding: 5px 10px; text-indent: 16px; } - body.adminimal-menu #admin-menu #admin-menu-wrapper div#toolbar div.toolbar-shortcuts ul li a:hover { background-color: #0074bd; background-position: 7px -78px; } - body.adminimal-menu #admin-menu .admin-menu-search input { background: none no-repeat scroll right center #444; border: medium none; border-radius: 0 0 0 0; - color: #999999; + color: #999; font-size: 12px; margin: 0 !important; outline: medium none; @@ -293,18 +245,15 @@ body.adminimal-menu #admin-menu .admin-menu-search input { width: 110px; height: 20px; } - body.adminimal-menu #admin-menu .admin-menu-search input:focus, #admin-menu .admin-menu-search input:hover, #admin-menu .admin-menu-search input:active { background: none no-repeat scroll right center #888; color: #eee; } - body.adminimal-menu li.admin-menu-search:hover { background: transparent !important; } - body.adminimal-menu div#admin-menu li.highlight { background-color: #ef6114; animation: blink 1s ease both infinite; @@ -313,7 +262,6 @@ body.adminimal-menu div#admin-menu li.highlight { -o-animation: blink 1s ease both infinite; color: #fff !important; } - body.adminimal-menu #admin-menu li.highlight > a, body.adminimal-menu #admin-menu li.highlight > li { border-color: #ef6114; @@ -323,87 +271,69 @@ body.adminimal-menu #admin-menu li.highlight > li { -webkit-animation: blink 1s ease both infinite; -o-animation: blink 1s ease both infinite; } - - /* Newline render mode */ body.adminimal-menu.admin-menu.menu-render-newline div#admin-menu div#admin-menu-wrapper div.shortcut-toolbar { clear: both; border-top: 1px solid #000; } - -body.adminimal-menu.admin-menu.menu-render-newline { - margin-top: 56px !important; +body.admin-menu.adminimal-menu.menu-render-newline:before { + height: 56px; } - body.adminimal-menu.admin-menu.menu-render-newline #overlay-container, body.adminimal-menu.admin-menu.newline .overlay-modal-background, body.adminimal-menu.admin-menu.newline .overlay-element, body.adminimal-menu.admin-menu.newline #overlay { padding-top: 30px !important; } - - /* Collapsed render mode */ body.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu { position: absolute; } - body.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu li { float: none; display: none; border: none; } - body.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu li.label { display: block; cursor: default; } - body.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu li.label a:hover { background: url("images/shortcut.png") no-repeat scroll 7px 7px #202020 !important; - color: #EEEEEE !important; + color: #eee !important; } - body.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu:hover li { display: block; background: #202020; } - - /* Dropdown render mode */ body.adminimal-menu.admin-menu.menu-render-dropdown .toolbar-shortcuts select#shortcut-menu { -webkit-appearance: none; - background: url("images/shortcut.png") no-repeat scroll 7px 7px #222222; + background: url("images/shortcut.png") no-repeat scroll 7px 7px #222; border: medium none; - color: #EEEEEE; + color: #eee; font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; font-size: 12px; padding: 5px 4px 4px 24px; } - body.adminimal-menu.admin-menu.menu-render-dropdown .toolbar-shortcuts select#shortcut-menu option:hover { cursor: pointer; } - body.adminimal-menu.admin-menu.menu-render-dropdown .toolbar-shortcuts select#shortcut-menu option:first-child { display: none; } - body.adminimal-menu #admin-menu .dropdown .admin-menu-tab { background: #444; padding-bottom: 2px; } - - /* Environment indicator 2.x */ body.adminimal-menu #admin-menu #environment-indicator { text-shadow: none; } - body.adminimal-menu #admin-menu #environment-indicator .environment-indicator-name { background-image: none; border-left: 1px solid #323232; @@ -412,20 +342,18 @@ body.adminimal-menu #admin-menu #environment-indicator .environment-indicator-na line-height: 18px; padding: 5px 10px; } - body.adminimal-menu #admin-menu #admin-menu-wrapper div#toolbar div.toolbar-shortcuts ul, body.adminimal-menu #admin-menu #admin-menu-wrapper div#toolbar div.toolbar-shortcuts ul li { margin: 0; padding: 0; } - body.adminimal-menu #admin-menu .admin-menu-search input { background: none no-repeat scroll right center #444; border: medium none; -webkit-border-radius: 0 0 0 0; -moz-border-radius: 0 0 0 0; border-radius: 0 0 0 0; - color: #999999; + color: #999; font-size: 12px; margin: 0 !important; outline: medium none; @@ -438,3 +366,6 @@ body.adminimal-menu #admin-menu .admin-menu-search input { height: 28px; box-sizing: border-box; } +#admin-menu-search .form-item.form-type-textfield label.control-label { + display: none; +} diff --git a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.info b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.info index 6c31f0cc..deb89679 100644 --- a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.info +++ b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.info @@ -3,10 +3,11 @@ description = Clean and minimal theme for the administration menu module. package = Administration core = 7.x dependencies[] = admin_menu +configure = admin/config/administration/adminimal_menu -; Information added by Drupal.org packaging script on 2015-12-03 -version = "7.x-1.7" +; Information added by Drupal.org packaging script on 2018-02-28 +version = "7.x-1.9" core = "7.x" project = "adminimal_admin_menu" -datestamp = "1449182323" +datestamp = "1519862286" diff --git a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.install b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.install index e998a0e6..09b8cc77 100644 --- a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.install +++ b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.install @@ -84,7 +84,19 @@ function adminimal_admin_menu_uninstall() { */ function adminimal_admin_menu_update_7100() { - // Include the update file. - include 'updates/update_7100.php'; + // Define Adminimal Menu path. + $module_path = drupal_get_path('module', 'adminimal_admin_menu'); + if (file_exists($module_path . '/adminimal_admin_menu.js')) { + // Delete the "adminimal_admin_menu.js" file. + file_unmanaged_delete($module_path . '/adminimal_admin_menu.js'); + } + + if (file_exists($module_path . '/slicknav')) { + // Empty the "slicknav" folder. + file_unmanaged_delete_recursive($module_path . '/slicknav'); + + // Delete the "slicknav" folder. + drupal_rmdir($module_path . '/slicknav'); + } } diff --git a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.module b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.module index 98c10c43..b5d35ffa 100644 --- a/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.module +++ b/sites/all/modules/adminimal_admin_menu/adminimal_admin_menu.module @@ -10,17 +10,34 @@ */ function adminimal_admin_menu_menu() { $items = array(); + $items['admin/config/administration/adminimal_menu'] = array( 'title' => 'Adminimal menu', 'description' => 'Adjust adminimal menu settings.', 'page callback' => 'drupal_get_form', 'page arguments' => array('adminimal_admin_menu_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'adminimal_menu_settings.inc', + 'file' => 'adminimal_admin_menu.admin.inc', ); return $items; +} +/** + * Implements hook_module_implements_alter(). + */ +function adminimal_admin_menu_module_implements_alter(&$implementations, $hook) { + // Put Adminimal Admin Menu's implementation of hook_admin_menu_output_alter() + // to the end of the list of implementors, assuring that it will be executed + // at the very end. Other modules may manipulate the menu items in the + // administration menu (i.e. the excellent Administration Menu Source) and we + // need to make sure those changes are preserved and respected by the output + // of Adminimal Admin Menu. + if ($hook == 'admin_menu_output_alter') { + $group = $implementations['adminimal_admin_menu']; + unset($implementations['adminimal_admin_menu']); + $implementations['adminimal_admin_menu'] = $group; + } } /** @@ -31,46 +48,42 @@ function adminimal_admin_menu_page_build(&$page) { return; } $path = drupal_get_path('module', 'adminimal_admin_menu'); - $load_slicknav = variable_get('adminimal_admin_menu_slicknav', TRUE ); - $load_jQuery = variable_get('adminimal_admin_menu_jquery', TRUE ); + $load_slicknav = variable_get('adminimal_admin_menu_slicknav', TRUE); + $load_jquery = variable_get('adminimal_admin_menu_jquery', TRUE); // Attach the CSS and JavaScript assets. drupal_add_css($path . '/adminimal_admin_menu.css'); - // Support for the Environment Indicator module. - if (module_exists('environment_indicator')) { - $environment_info = environment_indicator_get_active(); - drupal_add_css(' - div.slicknav_menu a.slicknav_btn:after { - content: "' . $environment_info['name']. '"; - margin-left: 1em; - color: ' . $environment_info['text_color'] . '; - font-size: 12px; - background-color: ' . $environment_info['color'] . '; - padding: 2px 5px; - } - #admin-menu-wrapper {background: #222 !important;} - ', - array( - 'group' => CSS_DEFAULT, - 'type' => 'inline', - 'preprocess' => FALSE, - 'weight' => '100', - )); - } - - // Check if both slicknav and custom jQuery must be loaded. - if ($load_slicknav and $load_jQuery) { - drupal_add_js($path . '/js/jquery.min.js', array( 'type' => 'file', 'scope' => 'header', 'weight' => 888 )); - drupal_add_js($path . '/js/slicknav/jquery-no-conflict.slicknav.js', array( 'type' => 'file', 'scope' => 'header', 'weight' => 888 )); - drupal_add_css($path . '/js/slicknav/slicknav.css'); - } - elseif ($load_slicknav and !$load_jQuery) { - drupal_add_js($path . '/js/slicknav/jquery.slicknav.js', array( 'type' => 'file', 'scope' => 'header', 'weight' => 888 )); - drupal_add_css($path . '/js/slicknav/slicknav.css'); - } - - drupal_add_js($path . '/js/adminimal_admin_menu.js', array( 'type' => 'file', 'scope' => 'header', 'weight' => 888 )); + _adminimal_admin_menu_support_environment_indicator(); + + // Check if both slicknav and custom jQuery must be loaded. + if ($load_slicknav and $load_jquery) { + drupal_add_js($path . '/js/jquery.min.js', array( + 'type' => 'file', + 'scope' => 'header', + 'weight' => 888, + )); + drupal_add_js($path . '/js/slicknav/jquery-no-conflict.slicknav.js', array( + 'type' => 'file', + 'scope' => 'header', + 'weight' => 888, + )); + drupal_add_css($path . '/js/slicknav/slicknav.css'); + } + elseif ($load_slicknav and !$load_jquery) { + drupal_add_js($path . '/js/slicknav/jquery.slicknav.js', array( + 'type' => 'file', + 'scope' => 'header', + 'weight' => 888, + )); + drupal_add_css($path . '/js/slicknav/slicknav.css'); + } + + drupal_add_js($path . '/js/adminimal_admin_menu.js', array( + 'type' => 'file', + 'scope' => 'header', + 'weight' => 888, + )); if (!isset($page['page_bottom']['admin_menu'])) { return; @@ -78,8 +91,7 @@ function adminimal_admin_menu_page_build(&$page) { $attached = &$page['page_bottom']['admin_menu']['#attached']; $options = array('every_page' => TRUE); - // @todo Stop-gap fix until cached rendering is resolved. - // @see http://drupal.org/node/1567622 + // @todo Stop-gap fix until cached rendering is resolved (http://drupal.org/node/1567622). if (module_exists('shortcut')) { $attached['css'][drupal_get_path('module', 'shortcut') . '/shortcut.css'] = $options; } @@ -99,7 +111,39 @@ function adminimal_admin_menu_page_build(&$page) { 'data' => array('admin_menu' => array('toolbar' => $settings)), 'type' => 'setting', ); +} + +/** + * Add CSS for module environment_indicator. + */ +function _adminimal_admin_menu_support_environment_indicator() { + if (!module_exists('environment_indicator')) { + return; + } + + $environment_info = environment_indicator_get_active(); + + if (!environment_indicator_check_access($environment_info)) { + return; + } + drupal_add_css(' + div.slicknav_menu a.slicknav_btn:after { + content: "' . $environment_info['name'] . '"; + margin-left: 1em; + color: ' . $environment_info['text_color'] . '; + font-size: 12px; + background-color: ' . $environment_info['color'] . '; + padding: 2px 5px; + } + #admin-menu-wrapper {background: #222 !important;} + ', + array( + 'group' => CSS_DEFAULT, + 'type' => 'inline', + 'preprocess' => FALSE, + 'weight' => '100', + )); } /** @@ -107,7 +151,8 @@ function adminimal_admin_menu_page_build(&$page) { */ function adminimal_admin_menu_admin_menu_output_build(&$content) { - if (variable_get('adminimal_admin_menu_render', 'collapsed') != 'hidden') { + // Shortcut menu. + if (module_exists('shortcut') && variable_get('adminimal_admin_menu_render', 'collapsed') != 'hidden') { // Add shortcuts bar. $content['shortcut'] = array( '#access' => module_exists('shortcut'), @@ -124,7 +169,6 @@ function adminimal_admin_menu_admin_menu_output_build(&$content) { '#pre_render' => array('shortcut_toolbar_pre_render'), ); } - } /** @@ -140,10 +184,11 @@ function adminimal_admin_menu_admin_menu_output_alter(&$content) { unset($content['icon']['icon']['#theme']); $content['icon']['icon']['#title'] = ' '; $content['icon']['icon']['#attributes']['class'][] = 'admin-menu-toolbar-home-menu'; + // @todo Fix this CS-issue. $page['#attributes']['class'][] = 'adminimal-menu'; // Hide the menu. - if (variable_get('adminimal_admin_menu_render', 'collapsed') == 'exclusive') { + if (module_exists('shortcut') && variable_get('adminimal_admin_menu_render', 'collapsed') == 'exclusive') { unset($content['icon']['icon']); unset($content['search']); foreach ($content['menu'] as $key => $link) { @@ -152,30 +197,39 @@ function adminimal_admin_menu_admin_menu_output_alter(&$content) { } } - // Create the responsive menu. - if (variable_get('adminimal_admin_menu_slicknav', 'TRUE')) { - // Prepare the responsive menu and Join the Icon menu with the administration menu. - $responsivemenu = array_merge($content['icon'], $content['menu']); - - // Give it ID to target it later with js and css. - $responsivemenu['#wrapper_attributes']['id'] = 'admin-menu-menu-responsive'; - - // Move the icon menu to the top. - $responsivemenu['icon']['#weight'] = '-100'; - - // Change the link title to Administration. - $responsivemenu['admin/index']['#title'] = t('Administration'); - - // Bind the responsive menu the the content varable so it can be rendered. - $content['responsive-menu'] = $responsivemenu; - - // Create the responsive shortucts. - $content['responsive']['shortcuts'] = array( - '#prefix' => '
    ', - '#suffix' => '
    ', - '#pre_render' => array('shortcut_toolbar_pre_render'), - ); - } + // Create the responsive menu. + if (variable_get('adminimal_admin_menu_slicknav', TRUE)) { + // Join the Icon menu with the administration menu. + $responsivemenu = array_merge($content['icon'], $content['menu']); + + // Give it ID to target it later with js and css. + $responsivemenu['#wrapper_attributes']['id'] = 'admin-menu-menu-responsive'; + + // Move the icon menu to the top. + $responsivemenu['icon']['#weight'] = '-100'; + + // Change the link title for 'admin/index' to Administration if it exists. + if (!empty($responsivemenu['admin/index'])) { + $responsivemenu['admin/index']['#title'] = t('Administration'); + } + + // Add the account menu, and push account and logout links toward bottom. + $responsivemenu = array_merge($content['account'], $responsivemenu); + $responsivemenu['account']['#weight'] = 99; + $responsivemenu['logout']['#weight'] = 100; + + // Bind the responsive menu the the content varable so it can be rendered. + $content['responsive-menu'] = $responsivemenu; + + // Create the responsive shortucts. + if (module_exists('shortcut')) { + $content['responsive']['shortcuts'] = array( + '#prefix' => '
    ', + '#suffix' => '
    ', + '#pre_render' => array('shortcut_toolbar_pre_render'), + ); + } + } } /** @@ -185,6 +239,7 @@ function adminimal_admin_menu_preprocess_html(&$vars) { if (!_adminimal_admin_menu_access()) { return; } + // Add the "adminimal" class to the body for better css selection. $vars['classes_array'][] = 'adminimal-menu'; @@ -197,27 +252,38 @@ function adminimal_admin_menu_preprocess_html(&$vars) { } // Add the shortcut render mode class. - $vars['classes_array'][] = 'menu-render-' . variable_get('adminimal_admin_menu_render', 'collapsed'); - - // Fix the viewport, correcting the mobile device zoom. - /** @todo - Mybre remove this and let the theme manage the view pont. - * But i was suprised that only few "responsive" drupal themes were fixing - * the viewport. - */ - $viewport = array( - '#tag' => 'meta', - '#attributes' => array( - 'name' => 'viewport', - 'content' => 'width=device-width, initial-scale=1, maximum-scale=1', - ), - ); - drupal_add_html_head($viewport, 'viewport'); + if (module_exists('shortcut')) { + $vars['classes_array'][] = 'menu-render-' . variable_get('adminimal_admin_menu_render', 'collapsed'); + } + + _adminimal_admin_menu_viewport(); +} +/** + * Add viewport for scaling on devices. + */ +function _adminimal_admin_menu_viewport() { + $use_slicknav = variable_get('adminimal_admin_menu_slicknav', TRUE); + $use_viewport = variable_get('adminimal_admin_menu_viewport', TRUE); + + // Only needed for slicknav. + if ($use_slicknav && $use_viewport) { + $viewport = array( + '#tag' => 'meta', + '#attributes' => array( + 'name' => 'viewport', + 'content' => 'width=device-width, initial-scale=1', + ), + ); + drupal_add_html_head($viewport, 'viewport'); + } } /** * Check if the user has access to use the admin menu. - * @return boolean Result of access checks. + * + * @return bool + * Result of access checks. */ function _adminimal_admin_menu_access() { if (!user_access('access administration menu') || admin_menu_suppress(FALSE)) { diff --git a/sites/all/modules/adminimal_admin_menu/adminimal_menu_settings.inc b/sites/all/modules/adminimal_admin_menu/adminimal_menu_settings.inc deleted file mode 100644 index e1147f47..00000000 --- a/sites/all/modules/adminimal_admin_menu/adminimal_menu_settings.inc +++ /dev/null @@ -1,101 +0,0 @@ - 'fieldset', - '#title' => t('Shortcuts options'), - ); - - // Create the select list. - $form['shortcuts']['adminimal_admin_menu_render'] = array( - '#type' => 'select', - '#title' => t('Rendering method'), - '#default_value' => variable_get('adminimal_admin_menu_render', 'collapsed'), - '#options' => array( - 'hidden' => t('Hidden'), - 'inline' => t('Inline'), - 'collapsed' => t('Collapsed'), - 'newline' => t('Newline'), - 'dropdown' => t('Dropdown'), - 'exclusive' => t('Exclusive'), - ), - '#description' => t('Select how the shortcuts will be rendered. There are currently 6 options:
    1. Hidden -> The shortcuts will not be rendered inside the admin menu
    2. Inline -> The shortcuts will be rendered on the same line with the root menu links
    3. Collapsed -> The sorctus links will be collapsed like a normal menu. (Default option)
    4. Newline -> The shortcuts will be rendered on a new line. Below the root menu links.
    5. Dropdown -> The shortcuts will be rendered inside a dropdown using the select html tag.
    6. Exclusive -> Only the shortcuts will be rendered, and the normal menu will be hidden.
    '), - '#required' => TRUE, - ); - - // Create the shortcut category. - $form['advanced_settings'] = array( - '#type' => 'fieldset', - '#title' => t('Advanced Settings'), - '#description' => '
    WARNING: Do not change any of the advanced setting unless you know what you are doing!
    ', - ); - - $form['advanced_settings']['adminimal_admin_menu_slicknav'] = array( - '#type' => 'checkbox', - '#default_value' => variable_get('adminimal_admin_menu_slicknav', 'TRUE'), - '#title' => t('Enable Responsive Menu.'), - '#description' => t('Default value => Checked. - Enable this option if you want to have responsive menu and mobile device support. - While disabling this option could save you few kilobytes (around 3KB), i will completely disable the responsive menu functionality.'), - ); - - $form['advanced_settings']['adminimal_admin_menu_jquery'] = array( - '#type' => 'checkbox', - '#default_value' => variable_get('adminimal_admin_menu_jquery', 'TRUE'), - '#title' => t('Load the requred jQuery 1.7 library automagically.'), - '#description' => t('Default value => Checked. This will load the newer jQuery version 1.7 using - the no-conflict method so it wont interfere with any existing jQuery or other java-script libraries. - The only reason to uncheck this if you are already using a newer version of jQuery site-wide and its globally accessible by the "$" variable. - Unchekig this option could save you 33KB, but it may also break your javasctipt if not used correctly.'), - '#states' => array( - // Hide the settings when the cancel notify checkbox is disabled. - 'visible' => array( - ':input[name="adminimal_admin_menu_slicknav"]' => array('checked' => TRUE), - ), - 'unchecked' => array( - variable_get('adminimal_admin_menu_jquery', 'TRUE') => FALSE, - ), - ), - ); - - // Create the submit button. - $form['submit'] = array( - '#type' => 'submit', - '#value' => t('Save configuration'), - ); - - return $form; - -} - -/** - * Submit handler for views_sexy_throbber_settings(). - */ -function adminimal_admin_menu_settings_submit($form, &$form_state) { - - // Exclude unnecessary elements. - form_state_values_clean($form_state); - - foreach ($form_state['values'] as $key => $value) { - if (is_array($value) && isset($form_state['values']['array_filter'])) { - $value = array_keys(array_filter($value)); - } - variable_set($key, $value); - } - - // Clear the admin menu cache. - admin_menu_flush_caches(); - - // Display a message to the user. - drupal_set_message(t('The configuration options have been saved.')); -} diff --git a/sites/all/modules/adminimal_admin_menu/credits.txt b/sites/all/modules/adminimal_admin_menu/credits.txt deleted file mode 100644 index cd21dc49..00000000 --- a/sites/all/modules/adminimal_admin_menu/credits.txt +++ /dev/null @@ -1,2 +0,0 @@ -Designed and developed by: ANDiTKO -> http://anditko.com -Some of the Icons are from the Icons8 set -> http://icons8.com/ and -> http://VisualPharm.com \ No newline at end of file diff --git a/sites/all/modules/adminimal_admin_menu/images/home.png b/sites/all/modules/adminimal_admin_menu/images/home.png index 5705af7f61cff59b201a8cd919ca3e1b7fc1ce10..42247842e04e3c2270f45d5d89dc0719958c61c7 100644 GIT binary patch delta 537 zcmV+!0_Oe03bF){B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rd0vZ++2SOnez z74Q-`2A;?Am)uP&fKA|C08b^YNO}Q03Eh;LZ4IERuIqi^Ht-#IAnC)<8E1hvfPe#F ztrY;k(l7uZX@3uR7}Hz8%@!~h{hx4gbV4&HX}u${AZ1-KXg?}7PPYoEKl7!L<$&-W1HVbV4`T?2Y%b_`4=XwuB4fnI26UWA!_0>-1- z32>S^Xve&kH2udjx@@%gizrZm3RIv16{tW3Do}w6RDYlX6{tY}3aY|W*^YS^SdIKy zxO@I4+h4RVN_R#8863p3EBi*kdI#tOjc*htOye5?jc*j%|K%G+-{*WIV6<-pT*^0! b0{j9eiV|G&*1MF+00000NkvXXu0mjf=RfT8 literal 1347 zcmeAS@N?(olHy`uVBq!ia0vp@K%BzC1|(wzcD(~qk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`ZfWa(sTY;0m; zVr1zI)9aF-T$-DjR|3Q!gkfv4~Pj*wm=R%;iu*SQ+p9GSv&S@Kf}PlxZTsmF{I+w zn;Gl9oeM>d-oMQzW_WVd2N@1-vBZPDiV~)gDa>!PE*o9GVw76=zk!QOP1kMmx{fwe z@q3GoE#y}FZWDgK`rcVit){1O7Q64uKmT0&{dYy`b>5}}7cXXQjakB+apLnH*E5qP z);n0w*grFt_uvF2gR@JGUkFAq7zq6m;?hu%J?VHs?h8+D;qS0;VdVfVidwofWw7<3QTTr5AXb4l@uqwmh>o(7kV@)Hh3$!5;H%$eb{z~*&* z;l4f=+e(=r&j-(iR7*BYNU^k>r*ZMfKhaMbR|MDBRTq9;B4l#>qov9Dy%pzgC+D@7 zUw_}YbM2msliL=`cun4Qnae9#SGoF&#YOSP-t3;^m9wT?3KczK`Mq%YndRqS>=rDp z6J(Q2nc#>*T!?qntJYGV<6XS?%-8P|?EiRau8^xaqPd0NHgi53SHSdVu`AX*nC%!4 zDtT>cV(8lICRZLjvNgFKzD|St=a)NC+#RY(?eh5mGnkV;jg_5 yR^+?9um9Q`QSN`AL+XyXQ_br9Bg}Kc8QB=ryJ9|XR99;S6>FZZelF{r5}E+8xZw`~ diff --git a/sites/all/modules/adminimal_admin_menu/images/shortcut.png b/sites/all/modules/adminimal_admin_menu/images/shortcut.png index 844baea76e8ef0e223dece1c7e3c83e0883dbcbd..1f6969abe83b492e9dc29082bb4e20ea911f2a10 100644 GIT binary patch delta 675 zcmV;U0$lyZ3%do7B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rd0vZ+*HT}!3!2kdPNJ&INR9M69m^)}xQ4of|>?R-*G~gPdLcm@mAlM|n zuuud8E7)n{qmL0Srr+sAyGX>&N237+MNC|>u@lmSSSSc;p?`w0(L97?{VhB3h099Zw@C0}bd;)d@ zhk!F-lcQ#~v<|y_H}DmB1DrOqWioR2BJd124D^}V&(0950dr<{oCY$pI&jk6YrqUJ z&{3&WhJnXs)_;}CG74M(Ce7?hP8Dmw*#dACxSNST0{#Fa?mm%I$Q@v$0F;2|nG!#n z*?!z-8b)Flc5ADfk5NqX66hE@qOB25<`4mwy2PE&;a^lgt7uW;R3%x%)KG zV`c-1Nsa*D+xWH>daYdIO+fzjyl>NAOcGONJ3J#q+gO=N!l9LvR_fs3rWk8wn8U}fi7AzZCsS=07?_nZLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ2+zz*$uBR~ z1grP;werj>E=kNwPW5!LRRWrzmzkMjWoYJVU}$b)WN2Y(W@zYYWMOP*U}@@VVQye< zZ0hQ01k>x1pIn-onpXnTn}X15j8iWtDdZLaZFWg5$}CGwaVyHtRRDY0DigO`3~-tU z)tiFbErvMt>H{644~kf%h=vIPQxAvpUo7TmxT=0PNZOP=V=LKWW)TN2<44zUpOqBxumiQLIXc3O9O3bB?&3_pF^SdkEf4bIqao+pJ`@5%CpZ`Dacj3KfE?lim;#+de zUSH;Ml1VDy+W)ZBYVJJVUv66@F7nQjF*zvxgT;O!<2%RwQA@gA`TlhahF!eha{j{c zCkxXh>;h+%U*IhNaC2=)ab-mEg5%tV&(3AYZRq$>*W#iw`J~FrGscqKE}j={+EkCV z>+YUVT@i9Hoh44{b8!LR`GS}YIVn-kTw>VY_v-#@65F-@KzgIh74{ghg<(h1Uv0{H zF0n^+~`HZ8}B@dojoHX*<|gjlb0GbZ{~*NRZGhqihdla_CT|yy{v4btibm} zeJ*u;&Tbc`2UBw?_e{@p&b@&ZrA?i-@j?)L%QUM~dJ2c`D|M?Ut!T21Xq=sO zMukiMfk58L8GSmfOOrG7AFl{g{lT+(GX|YE1-_0gh z8%3*^HK7-C1=FrDS+3yk`MqiLB373-uUK8yWH1`OIrB*;IP3KN1$uAJY`ZNNdPub+ z@}1M4zYnbC9o;40@8L52HMg|w?cq1k)5$loLR@-w;4{Z9sikp#* XLGz(>|DidS;G)&j)z4*}Q$iB}j8Z2s diff --git a/sites/all/modules/adminimal_admin_menu/images/square.png b/sites/all/modules/adminimal_admin_menu/images/square.png index 3c764fc85d06c81aa2ff5fae4ae10c2ddccec8af..f210d7780275cf105458d7f8e3dfe44906ddda4a 100644 GIT binary patch delta 143 zcmX@YzM64@NE+@WVRS}SF qQMq>3RDy@C`QQgbl@0H8V}H(PcUNha;0Bt(z~SlY=d#Wzp$Pz3b}h;P literal 964 zcmaJ=yKmD#9JbU7p{kYGpdHZ3WdI33&Z(XFR8u8((iqiMl}1X&I`$>8TKio4TDu+D z_%j$-5lkR46b1$sCL|<4Vqro^6c$#_X_7J!EZg_c_kF+j!=3HTrG=FRj^mc>rqyEW z754d8i~r;E>M~oFX}wE#NuOqJg1M?sdKlQDJHRdM`X`5P@jA!N@j<&wyUrH!NGQ4m zM$E&Qu{myiBadBgA5+l7gCH{aA1}{%5cme)Q61TdO*{;mrwQIY-EMoQ`=0Le8~4C^ zj+j7*sSEP(AWBhg@FQKs_QkctgAs)88~lY+U1tZFB*8!xOM)ju2sBNEYpSNfyFihl zBFXI41h|G&4Jl4{S#z>N~EEBVmNRojBbzLts6h&YNAw7wx zn+s98I#IB2>Lo!;0}_Ek(e05VYVgd{ix9$iDjTKaG_iz9xf@GRl#7riK*#w%Gz_Qc zl(z7tzyB0Y+b1!WS~w*~iN^}pUoA|<$V{+HNzx|dV3Nh1A)zE4k{Fn~8o1pFBA;aG zoe|z~kR7GejXZ2y2G114An=h@(<*8STCh@4A*?I93L6a*YN`%RrPh!qT#I-|A&%&T z>tAx~Gr2`8gfX*h;UqZ5ej_0v7=?_2*}l|f>W#VnY+uZoT!}d&6@~q)(330HJ;ip~ zw(Kx%d>pZEPgq-j_c*7|qbD`g!(r{sz~CH^2PaEEm(s+4XJfNp0`J9}JNxhX4Qo diff --git a/sites/all/modules/adminimal_admin_menu/js/adminimal_admin_menu.js b/sites/all/modules/adminimal_admin_menu/js/adminimal_admin_menu.js index bad746ab..b476803b 100644 --- a/sites/all/modules/adminimal_admin_menu/js/adminimal_admin_menu.js +++ b/sites/all/modules/adminimal_admin_menu/js/adminimal_admin_menu.js @@ -1,58 +1,63 @@ -(function($) { +(function ($) { -Drupal.admin = Drupal.admin || {}; -Drupal.admin.behaviors = Drupal.admin.behaviors || {}; + Drupal.admin = Drupal.admin || {}; + Drupal.admin.behaviors = Drupal.admin.behaviors || {}; -/** - * @ingroup admin_behaviors - * @{ - */ + /** + * @ingroup admin_behaviors + * @{ + */ -/** - * Apply active trail highlighting based on current path. - * - * @todo Not limited to toolbar; move into core? - */ -Drupal.admin.behaviors.toolbarActiveTrail = function (context, settings, $adminMenu) { - if (settings.admin_menu.toolbar && settings.admin_menu.toolbar.activeTrail) { - $adminMenu.find('> div > ul > li > a[href="' + settings.admin_menu.toolbar.activeTrail + '"]').addClass('active-trail'); - } -}; + /** + * Apply active trail highlighting based on current path. + * + * @todo Not limited to toolbar; move into core? + */ + Drupal.admin.behaviors.toolbarActiveTrail = function (context, settings, $adminMenu) { + if (settings.admin_menu.toolbar && settings.admin_menu.toolbar.activeTrail) { + $adminMenu.find('> div > ul > li > a[href="' + settings.admin_menu.toolbar.activeTrail + '"]').addClass('active-trail'); + } + }; -Drupal.admin.behaviors.shorcutcollapsed = function (context, settings, $adminMenu) { + Drupal.admin.behaviors.shorcutcollapsed = function (context, settings, $adminMenu) { - // Create the dropdown base - $("
  • "+Drupal.t('Shortcuts')+"
  • ").prependTo("body.menu-render-collapsed #toolbar div.toolbar-shortcuts ul"); + // Create the dropdown base + $('
  • ' + Drupal.t('Shortcuts') + '
  • ').prependTo("body.menu-render-collapsed #toolbar div.toolbar-shortcuts ul"); -}; + }; -Drupal.admin.behaviors.shorcutselect = function (context, settings, $adminMenu) { + Drupal.admin.behaviors.shorcutselect = function (context, settings, $adminMenu) { - // Create the dropdown base - $("').appendTo("body.menu-render-dropdown #toolbar div.toolbar-shortcuts"); - // Create default option "Select" - $("