Merge remote-tracking branch 'origin/develop'

* origin/develop: (341 commits) Bump version for 2.4.0-pl release Update welcome screen url Update lexicons from crowdin Escape site_name it login and logout tpl Preselect core namespace if it is available in namespace combo box Fix double nocompress option in advanced install Fix namespace and policy filter in namespace access grid Pass signature via setup options Add strip_tags to site_name in manager header Fix #12549: Site name in header not accounting for quotes Bump version for 2.4.0-rc1 release Only register escape to hide the toolbar as ctrl+alt+/ conflicts with typing special characters Remove line break in setting.inc.php Fix potential E_RECOVERABLE (and other) errors if provider doesn't return file option Add missing return statement to make sure error is passed back to the user Have not value 'new' for target attribute Update create.class.php Keep deprecated country 'value' field available for BC Upgrade script for 2.4.0 User Profile country name to ISO code conversion Minor code reformatting, return ISO 3166-1 alpha-2 country codes in uppercase ...
modxcms · Aug 18, 2015 · 3ebd6b5 · 3ebd6b5
2 parents 1b473d0 + 0a5e15d
commit 3ebd6b5
Show file tree

Hide file tree

Showing 1,096 changed files with 25,970 additions and 16,392 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,26 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+tab_width = 4
+
+[**.js]
+tab_width = 4
+
+[**.coffee]
+tab_width = 4
+
+[**.cson]
+tab_width = 4
+
+[**.json]
+tab_width = 4
+
+[**rc]
+tab_width = 4
+
+[**php]
+tab_width = 4
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,19 @@
+language: php
+script: "phpunit -c ./phpunit.xml"
+
+# Set php versions
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+#  - hhvm # currently failing - lets get current PHP versions working first
+#  - nightly # currently failing - lets get current PHP versions working first
+
+# database credentials
+mysql:
+  database: revo_test
+  username: root
+  encoding: utf8
+
+before_script: 'cd _build/test && ./generateConfigs.sh'
diff --git a/README.md b/README.md
@@ -1,4 +1,7 @@
 # MODX Revolution
+
+[![Build Status](https://travis-ci.org/modxcms/revolution.svg?branch=develop)](https://travis-ci.org/modxcms/revolution)
+
 ## Content Management System and Application Framework
 
 MODX lets you power anything from multi-language, multi-domain corporate sites to personal blogs to mobile APIs. Delivering true creative freedom and removing all restrictions, it lets you control the markup and design without having to code. You can also tailor its modular and extensible core to accommodate virtually any custom requirement or amount of traffic. MODX is the free open source software that meets your needs today—and tomorrow.

diff --git a/_build/build.sample.properties b/_build/build.sample.properties
@@ -11,7 +11,7 @@ git.command = git
 #project.name.fs = modx
 
 # Override to set the version and release strings
-#modx.core.version = 2.3.6
+#modx.core.version = 2.4.0
 #modx.core.release = pl
 
 # these properties require a local Git clone in order to produce distributions
@@ -25,7 +25,7 @@ git.command = git
 #build.nominify = true
 
 # Override to pull source from a specific ref in the git repository
-#build.src.tree = v2.3.6-pl
+#build.src.tree = v2.4.0-pl
 
 # Override to turn off the additional of timestamps to the distribution packages (used for nightlies)
 #build.timestamp = false
diff --git a/_build/build.xml b/_build/build.xml
@@ -19,7 +19,7 @@
     <property name="project.manager.dir" value="${project.root.dir}/manager" />
 
     <!-- Set the project version -->
-    <property name="modx.core.version" value="2.3.6" />
+    <property name="modx.core.version" value="2.4.0" />
     <property name="modx.core.release" value="pl" />
 
     <!-- Set some common build properties -->

diff --git a/_build/data/permissions/transport.policy.tpl.administrator.php b/_build/data/permissions/transport.policy.tpl.administrator.php
@@ -685,6 +685,11 @@
     'description' => 'perm.settings_desc',
     'value' => true,
 ));
+$permissions[] = $xpdo->newObject('modAccessPermission',array(
+    'name' => 'events',
+    'description' => 'perm.events_desc',
+    'value' => true,
+));
 $permissions[] = $xpdo->newObject('modAccessPermission',array(
     'name' => 'source_save',
     'description' => 'perm.source_save_desc',

diff --git a/_build/data/permissions/transport.policy.tpl.namespace.php b/_build/data/permissions/transport.policy.tpl.namespace.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * The default Permission scheme for the Namespace Policy.
+ *
+ * @package modx
+ */
+$permissions = array();
+$permissions[] = $xpdo->newObject('modAccessPermission',array(
+    'name' => 'list',
+    'description' => 'perm.list_desc',
+    'value' => true,
+));
+$permissions[] = $xpdo->newObject('modAccessPermission',array(
+    'name' => 'load',
+    'description' => 'perm.load_desc',
+    'value' => true,
+));
+$permissions[] = $xpdo->newObject('modAccessPermission',array(
+    'name' => 'view',
+    'description' => 'perm.view_desc',
+    'value' => true,
+));
+
+return $permissions;
diff --git a/_build/data/transport.core.accesspolicies.php b/_build/data/transport.core.accesspolicies.php
@@ -128,4 +128,15 @@
   'lexicon' => 'permissions',
 ), '', true, true);
 
+$policies['12']= $xpdo->newObject('modAccessPolicy');
+$policies['12']->fromArray(array (
+    'id' => 12,
+    'name' => 'Hidden Namespace',
+    'description' => 'Hidden Namespace policy, will not show Namespace in lists.',
+    'parent' => 0,
+    'class' => '',
+    'data' => '{"load":false,"list":false,"view":true}',
+    'lexicon' => 'permissions',
+), '', true, true);
+
 return $policies;
diff --git a/_build/data/transport.core.accesspolicytemplategroups.php b/_build/data/transport.core.accesspolicytemplategroups.php
@@ -45,4 +45,12 @@
     'description' => 'All Media Source-based policy templates.',
 ));
 
+/* Namespace group templates */
+$templateGroups['6']= $xpdo->newObject('modAccessPolicyTemplateGroup');
+$templateGroups['6']->fromArray(array(
+    'id' => 6,
+    'name' => 'Namespace',
+    'description' => 'All Namespace based policy templates.',
+));
+
 return $templateGroups;
diff --git a/_build/data/transport.core.accesspolicytemplates.php b/_build/data/transport.core.accesspolicytemplates.php
@@ -83,4 +83,17 @@
     $templates['6']->addMany($permissions);
 } else { $xpdo->log(xPDO::LOG_LEVEL_ERROR,'Could not load Context Template Permissions.'); }
 
+/* namespace template/policy */
+$templates['7']= $xpdo->newObject('modAccessPolicyTemplate');
+$templates['7']->fromArray(array(
+    'id' => 7,
+    'name' => 'NamespaceTemplate',
+    'description' => 'Namespace Policy Template with all attributes.',
+    'lexicon' => 'permissions',
+));
+$permissions = include dirname(__FILE__).'/permissions/transport.policy.tpl.namespace.php';
+if (is_array($permissions)) {
+    $templates['7']->addMany($permissions);
+} else { $xpdo->log(xPDO::LOG_LEVEL_ERROR,'Could not load Namespace Template Permissions.'); }
+
 return $templates;
diff --git a/_build/data/transport.core.menus.php b/_build/data/transport.core.menus.php
@@ -403,6 +403,7 @@
   'description' => 'logout_desc',
   'parent' => 'user',
   'permissions' => 'logout',
+  'action' => 'security/logout',
   'handler' => 'MODx.logout(); return false;',
 ), '', true, true);
 

diff --git a/_build/data/transport.core.system_settings.php b/_build/data/transport.core.system_settings.php
@@ -674,6 +674,15 @@
   'area' => 'furls',
   'editedon' => null,
 ), '', true, true);
+$settings['friendly_alias_realtime']= $xpdo->newObject('modSystemSetting');
+$settings['friendly_alias_realtime']->fromArray(array (
+  'key' => 'friendly_alias_realtime',
+  'value' => '0',
+  'xtype' => 'combo-boolean',
+  'namespace' => 'core',
+  'area' => 'furls',
+  'editedon' => null,
+), '', true, true);
 $settings['friendly_alias_restrict_chars']= $xpdo->newObject('modSystemSetting');
 $settings['friendly_alias_restrict_chars']->fromArray(array (
   'key' => 'friendly_alias_restrict_chars',
@@ -773,6 +782,15 @@
   'area' => 'furls',
   'editedon' => null,
 ), '', true, true);
+$settings['use_frozen_parent_uris']= $xpdo->newObject('modSystemSetting');
+$settings['use_frozen_parent_uris']->fromArray(array (
+  'key' => 'use_frozen_parent_uris',
+  'value' => '0',
+  'xtype' => 'combo-boolean',
+  'namespace' => 'core',
+  'area' => 'furls',
+  'editedon' => null,
+), '', true, true);
 $settings['global_duplicate_uri_check']= $xpdo->newObject('modSystemSetting');
 $settings['global_duplicate_uri_check']->fromArray(array (
   'key' => 'global_duplicate_uri_check',
@@ -1088,6 +1106,24 @@
   'area' => 'manager',
   'editedon' => null,
 ), '', true, true);
+$settings['modx_browser_tree_hide_files']= $xpdo->newObject('modSystemSetting');
+$settings['modx_browser_tree_hide_files']->fromArray(array (
+  'key' => 'modx_browser_tree_hide_files',
+  'value' => false,
+  'xtype' => 'combo-boolean',
+  'namespace' => 'core',
+  'area' => 'manager',
+  'editedon' => null,
+), '', true, true);
+$settings['modx_browser_tree_hide_tooltips']= $xpdo->newObject('modSystemSetting');
+$settings['modx_browser_tree_hide_tooltips']->fromArray(array (
+  'key' => 'modx_browser_tree_hide_tooltips',
+  'value' => true,
+  'xtype' => 'combo-boolean',
+  'namespace' => 'core',
+  'area' => 'manager',
+  'editedon' => null,
+), '', true, true);
 $settings['modx_browser_default_sort']= $xpdo->newObject('modSystemSetting');
 $settings['modx_browser_default_sort']->fromArray(array (
   'key' => 'modx_browser_default_sort',
@@ -1118,7 +1154,7 @@
 $settings['principal_targets']= $xpdo->newObject('modSystemSetting');
 $settings['principal_targets']->fromArray(array (
   'key' => 'principal_targets',
-  'value' => 'modAccessContext,modAccessResourceGroup,modAccessCategory,sources.modAccessMediaSource',
+  'value' => 'modAccessContext,modAccessResourceGroup,modAccessCategory,sources.modAccessMediaSource,modAccessNamespace',
   'xtype' => 'textfield',
   'namespace' => 'core',
   'area' => 'authentication',
@@ -1531,6 +1567,15 @@
   'area' => 'session',
   'editedon' => null,
 ), '', true, true);
+$settings['default_username']= $xpdo->newObject('modSystemSetting');
+$settings['default_username']->fromArray(array (
+  'key' => 'default_username',
+  'value' => '(anonymous)',
+  'xtype' => 'textfield',
+  'namespace' => 'core',
+  'area' => 'session',
+  'editedon' => null,
+), '', true, true);
 $settings['session_cookie_lifetime']= $xpdo->newObject('modSystemSetting');
 $settings['session_cookie_lifetime']->fromArray(array (
   'key' => 'session_cookie_lifetime',
@@ -1900,7 +1945,7 @@
 $settings['welcome_screen_url']= $xpdo->newObject('modSystemSetting');
 $settings['welcome_screen_url']->fromArray(array (
   'key' => 'welcome_screen_url',
-  'value' => '//misc.modx.com/revolution/welcome.23.html',
+  'value' => '//misc.modx.com/revolution/welcome.24.html ',
   'xtype' => 'textfield',
   'namespace' => 'core',
   'area' => 'manager',
@@ -1960,6 +2005,42 @@
   'area' => 'manager',
   'editedon' => null,
 ), '', true, true);
+$settings['mgr_tree_icon_context']= $xpdo->newObject('modSystemSetting');
+$settings['mgr_tree_icon_context']->fromArray(array (
+  'key' => 'mgr_tree_icon_context',
+  'value' => 'tree-context',
+  'xtype' => 'textfield',
+  'namespace' => 'core',
+  'area' => 'manager',
+  'editedon' => null,
+), '', true, true);
+$settings['mgr_source_icon']= $xpdo->newObject('modSystemSetting');
+$settings['mgr_source_icon']->fromArray(array (
+  'key' => 'mgr_source_icon',
+  'value' => 'icon-folder-open-o',
+  'xtype' => 'textfield',
+  'namespace' => 'core',
+  'area' => 'manager',
+  'editedon' => null,
+), '', true, true);
+$settings['main_nav_parent']= $xpdo->newObject('modSystemSetting');
+$settings['main_nav_parent']->fromArray(array (
+  'key' => 'main_nav_parent',
+  'value' => 'topnav',
+  'xtype' => 'textfield',
+  'namespace' => 'core',
+  'area' => 'manager',
+  'editedon' => null,
+), '', true, true);
+$settings['user_nav_parent']= $xpdo->newObject('modSystemSetting');
+$settings['user_nav_parent']->fromArray(array (
+  'key' => 'user_nav_parent',
+  'value' => 'usernav',
+  'xtype' => 'textfield',
+  'namespace' => 'core',
+  'area' => 'manager',
+  'editedon' => null,
+), '', true, true);
 $settings['auto_isfolder']= $xpdo->newObject('modSystemSetting');
 $settings['auto_isfolder']->fromArray(array (
     'key' => 'auto_isfolder',
@@ -1969,4 +2050,13 @@
     'area' => 'site',
     'editedon' => null,
 ), '', true, true);
+$settings['manager_use_fullname']= $xpdo->newObject('modSystemSetting');
+$settings['manager_use_fullname']->fromArray(array (
+    'key' => 'manager_use_fullname',
+    'value' => false,
+    'xtype' => 'combo-boolean',
+    'namespace' => 'core',
+    'area' => 'manager',
+    'editedon' => null,
+), '', true, true);
 return $settings;
diff --git a/_build/resolvers/resolve.policies.php b/_build/resolvers/resolve.policies.php
@@ -16,6 +16,7 @@
     'Element' => 'ElementTemplate',
     'Media Source Admin' => 'MediaSourceTemplate',
     'Media Source User' => 'MediaSourceTemplate',
+    'Hidden Namespace' => 'NamespaceTemplate',
 );
 
 $policies = $transport->xpdo->getCollection('modAccessPolicy');

diff --git a/_build/resolvers/resolve.policytemplates.php b/_build/resolvers/resolve.policytemplates.php
@@ -15,6 +15,7 @@
     'ContextTemplate' => 'Object',
     'ElementTemplate' => 'Element',
     'MediaSourceTemplate' => 'MediaSource',
+    'NamespaceTemplate' => 'Namespace',
 );
 
 $templates = $transport->xpdo->getCollection('modAccessPolicyTemplate');