Merge branch '4.0-dev' into remove-ftp-layer

joomla · Feb 26, 2019 · 0715766 · 0715766
2 parents 1381168 + db4b3e1
commit 0715766
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 83 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -82,7 +82,7 @@ pipeline:
         - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
 
   analysis3x:
-      image: rips/rips-cli
+      image: rips/rips-cli:1.2.1
       secrets:  [rips_username, rips_password]
       when:
         branch: staging
@@ -91,10 +91,10 @@ pipeline:
         - export RIPS_USERNAME=$RIPS_USERNAME
         - export RIPS_PASSWORD=$RIPS_PASSWORD
         - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-        - rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+        - rips-cli rips:scan:start -a 1 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
 
   analysis4x:
-    image: rips/rips-cli
+    image: rips/rips-cli:1.2.1
     secrets:  [rips_username, rips_password]
     when:
       branch: 4.0-dev
@@ -103,7 +103,7 @@ pipeline:
       - export RIPS_USERNAME=$RIPS_USERNAME
       - export RIPS_PASSWORD=$RIPS_PASSWORD
       - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-      - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+      - rips-cli rips:scan:start -a 3 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
 
 branches:
   exclude: [ l10n_* ]

diff --git a/administrator/components/com_contact/View/Contacts/HtmlView.php b/administrator/components/com_contact/View/Contacts/HtmlView.php
@@ -219,7 +219,7 @@ protected function addToolbar()
 
 		if ($user->authorise('core.admin', 'com_contact') || $user->authorise('core.options', 'com_contact'))
 		{
-			$toolbar->preferences('com_menus');
+			$toolbar->preferences('com_contact');
 		}
 
 		$toolbar->help('JHELP_COMPONENTS_CONTACTS_CONTACTS');

diff --git a/...istrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/...istrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
@@ -1,19 +1,19 @@
 <template>
-    <media-modal v-if="$store.state.showCreateFolderModal" :size="'sm'" @close="close()">
+    <media-modal v-if="$store.state.showCreateFolderModal" :size="'md'" @close="close()">
         <h3 slot="header" class="modal-title">{{ translate('COM_MEDIA_CREATE_NEW_FOLDER') }}</h3>
         <div slot="body">
             <form class="form" @submit.prevent="save" novalidate>
                 <div class="form-group">
-                    <label for="folder">{{ translate('COM_MEDIA_FOLDER') }}</label>
-                    <input id="folder" class="form-control" placeholder="Folder"
+                    <label for="folder">{{ translate('COM_MEDIA_FOLDER_NAME') }}</label>
+                    <input id="folder" class="form-control"
                            v-focus="true" v-model.trim="folder" @input="folder = $event.target.value"
                            required autocomplete="off">
                 </div>
             </form>
         </div>
         <div slot="footer">
             <button class="btn btn-link" @click="close()">{{ translate('JCANCEL') }}</button>
-            <button class="btn btn-success" @click="save()" :disabled="!isValid()">{{ translate('JAPPLY') }}
+            <button class="btn btn-success" @click="save()" :disabled="!isValid()">{{ translate('JACTION_CREATE') }}
             </button>
         </div>
     </media-modal>

diff --git a/administrator/components/com_media/resources/scripts/components/modals/modal.vue b/administrator/components/com_media/resources/scripts/components/modals/modal.vue
@@ -2,7 +2,7 @@
     <div class="media-modal-backdrop" @click="close()">
         <div class="modal" @click.stop style="display: flex">
             <slot name="backdrop-close"></slot>
-            <div class="modal-dialog" :class="modalClass" role="document">
+            <div class="modal-dialog" :class="modalClass" role="alertdialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <slot name="header"></slot>

diff --git a/administrator/components/com_media/resources/styles/components/_media-infobar.scss b/administrator/components/com_media/resources/styles/components/_media-infobar.scss
@@ -33,15 +33,9 @@
     padding-left: ($col-gutter-width / 2);
   }
   dt {
-    flex: 0 0 $info-dt-width;
-    max-width: $info-dt-width;
     font-weight: normal;
     color: rgba(0, 0, 0, .54);
   }
-  dd {
-    flex: 0 0 $info-dd-width;
-    max-width: $info-dd-width;
-  }
 }
 
 .infobar-close {

diff --git a/administrator/components/com_media/tmpl/media/default_texts.php b/administrator/components/com_media/tmpl/media/default_texts.php
@@ -28,6 +28,7 @@
 Text::script('COM_MEDIA_ERROR_NOT_AUTHORIZED', true);
 Text::script('COM_MEDIA_ERROR_NOT_FOUND', true);
 Text::script('COM_MEDIA_FOLDER', true);
+Text::script('COM_MEDIA_FOLDER_NAME', true);
 Text::script('COM_MEDIA_INCREASE_GRID', true);
 Text::script('COM_MEDIA_MEDIA_CREATED_AT', true);
 Text::script('COM_MEDIA_MEDIA_DIMENSION', true);
@@ -51,6 +52,7 @@
 Text::script('COM_MEDIA_UPDLOAD_SUCCESS', true);
 Text::script('JCANCEL', true);
 Text::script('JAPPLY', true);
+Text::script('JACTION_CREATE', true);
 Text::script('JLIB_FORM_FIELD_REQUIRED_VALUE', true);
 Text::script('COM_MEDIA_FILE_EXISTS_AND_OVERRIDE', true);
 Text::script('COM_MEDIA_SHARE', true);

diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
@@ -48,6 +48,7 @@ COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
 COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
 COM_MEDIA_FILE_EXISTS_AND_OVERRIDE="%s already exists. Do you want to replace it?"
 COM_MEDIA_FOLDER="Folder"
+COM_MEDIA_FOLDER_NAME="Folder Name"
 COM_MEDIA_FOLDERS="Media Folders"
 COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br>Changing the 'Path to files folder' from the default of 'images' may break your links.<br>The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
 COM_MEDIA_MEDIA_CREATED_AT="Created at"

diff --git a/composer.json b/composer.json
@@ -69,11 +69,11 @@
         "joomla/string": "~2.0@dev",
         "joomla/uri": "~2.0@dev",
         "joomla/utilities": "~2.0@dev",
+        "algo26-matthias/idna-convert": "~1.1",
         "defuse/php-encryption": "~2.1",
         "doctrine/inflector": "1.2.0",
         "fig/link-util": "~1.0",
         "google/recaptcha": "~1.1",
-        "mso/idna-convert": "~1.1",
         "paragonie/sodium_compat": "~1.4",
         "phpmailer/phpmailer": "~6.0",
         "psr/link": "~1.0",

diff --git a/layouts/joomla/form/field/accesslevel.php b/layouts/joomla/form/field/accesslevel.php
@@ -55,5 +55,6 @@
 $attr .= $required ? ' required' : '';
 $attr .= $autofocus ? ' autofocus' : '';
 $attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
+$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
 
 echo HTMLHelper::_('access.level', $name, $value, $attr, $options, $id);
diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php
@@ -110,6 +110,7 @@
             id="<?php echo $id; ?>"
             name="<?php echo $name; ?>"
 			value="<?php echo htmlspecialchars(($value !== '0000-00-00 00:00:00') ? $value : '', ENT_COMPAT, 'UTF-8'); ?>"
+			<?php echo !empty($description) ? ' aria-describedby="' . $name . '-desc"' : ''; ?>
 			<?php echo $attributes; ?>
 			<?php echo !empty($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : ''; ?>
 			data-alt-value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" autocomplete="off">

diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php
@@ -52,6 +52,7 @@
 $attr .= !empty($readonly) ? ' readonly' : '';
 $attr .= !empty($disabled) ? ' disabled' : '';
 $attr .= !empty($required) ? ' required' : '';
+$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
 
 // Initialize JavaScript field attributes.
 $attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';

diff --git a/layouts/joomla/form/field/email.php b/layouts/joomla/form/field/email.php
@@ -53,6 +53,7 @@
 $attributes = array(
 	$spellcheck ? '' : 'spellcheck="false"',
 	!empty($size) ? 'size="' . $size . '"' : '',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	$onchange ? 'onchange="' . $onchange . '"' : '',

diff --git a/layouts/joomla/form/field/list.php b/layouts/joomla/form/field/list.php
@@ -55,6 +55,7 @@
 $attr .= $required ? ' required' : '';
 $attr .= $autofocus ? ' autofocus' : '';
 $attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
+$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
 
 // To avoid user's confusion, readonly="readonly" should imply disabled="disabled".
 if ($readonly || $disabled)

diff --git a/layouts/joomla/form/field/number.php b/layouts/joomla/form/field/number.php
@@ -49,6 +49,7 @@
 
 $attributes = array(
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',

diff --git a/layouts/joomla/form/field/range.php b/layouts/joomla/form/field/range.php
@@ -45,8 +45,10 @@
  */
 
 // Initialize some field attributes.
+
 $attributes = array(
 	$class ? 'class="form-control ' . $class . '"' : 'class="form-control"',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	!empty($onchange) ? 'onchange="' . $onchange . '"' : '',

diff --git a/layouts/joomla/form/field/tel.php b/layouts/joomla/form/field/tel.php
@@ -45,18 +45,19 @@
  * @var   integer  $maxLength       The maximum length that the field shall accept.
  */
 
-$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
-$autocomplete = $autocomplete === ' autocomplete="on"' ? '' : $autocomplete;
+$autocomplete = !$autocomplete ? 'autocomplete="off"' : 'autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete === 'autocomplete="on"' ? '' : $autocomplete;
 
 $attributes = array(
 	!empty($size) ? 'size="' . $size . '"' : '',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$autocomplete,
-	$autofocus ? ' autofocus' : '',
+	$autofocus ? 'autofocus' : '',
 	$spellcheck ? '' : 'spellcheck="false"',
-	$onchange ? ' onchange="' . $onchange . '"' : '',
+	$onchange ? 'onchange="' . $onchange . '"' : '',
 	!empty($maxLength) ? $maxLength : '',
 	$required ? 'required' : '',
 );

diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php
@@ -59,7 +59,7 @@
 $attributes = array(
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
 	!empty($size) ? 'size="' . $size . '"' : '',
-	!empty($description) ? 'title="' . $description . '"' : '',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	$list,

diff --git a/layouts/joomla/form/field/textarea.php b/layouts/joomla/form/field/textarea.php
@@ -52,6 +52,7 @@
 	$columns ?: '',
 	$rows ?: '',
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
+	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',

diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php
@@ -51,6 +51,7 @@
 
 $attributes = array(
 	!empty($size) ? ' size="' . $size . '"' : '',
+	!empty($description) ? ' aria-describedby="' . $name . '-desc"' : '',
 	$disabled ? ' disabled' : '',
 	$readonly ? ' readonly' : '',
 	strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',

diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
@@ -36,7 +36,7 @@
 	<?php if (empty($options['hiddenLabel'])) : ?>
 		<div class="control-label"><?php echo $label; ?></div>
 	<?php endif; ?>
-	<div class="controls"<?php if (!empty($description)) : ?> aria-describedby="<?php echo $id; ?>"<?php endif; ?>>
+	<div class="controls">
 		<?php echo $input; ?>
 	</div>
 	<?php if (!empty($description)) : ?>

diff --git a/templates/system/html/modules.php b/templates/system/html/modules.php
@@ -67,66 +67,6 @@ function modChrome_table($module, &$params, &$attribs)
 	<?php
 }
 
-/*
- * Module chrome that wraps the tabled module output in a <td> tag of another table
- */
-function modChrome_horz($module, &$params, &$attribs)
-{ ?>
-	<table cellspacing="1" cellpadding="0" width="100%">
-		<tr>
-			<td>
-				<?php modChrome_table($module, $params, $attribs); ?>
-			</td>
-		</tr>
-	</table>
-	<?php
-}
-
-/*
- * xhtml (divs and font header tags)
- * With the new advanced parameter it does the same as the html5 chrome
- */
-function modChrome_xhtml($module, &$params, &$attribs)
-{
-	$moduleTag      = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
-	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
-	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
-	$moduleClass    = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
-
-	// Temporarily store header class in variable
-	$headerClass    = $params->get('header_class');
-	$headerClass    = $headerClass ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
-
-	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
-			<?php if ((bool) $module->showtitle) : ?>
-				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
-			<?php endif; ?>
-			<?php echo $module->content; ?>
-		</<?php echo $moduleTag; ?>>
-	<?php endif;
-}
-
-/*
- * Module chrome that allows for rounded corners by wrapping in nested div tags
- */
-function modChrome_rounded($module, &$params, &$attribs)
-{ ?>
-		<div class="module <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
-			<div>
-				<div>
-					<div>
-						<?php if ((bool) $module->showtitle) : ?>
-							<h3><?php echo $module->title; ?></h3>
-						<?php endif; ?>
-					<?php echo $module->content; ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	<?php
-}
-
 /*
  * Module chrome that add preview information to the module
  */