[4.0] GSoC 2018 Enhance Users Project

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-16.sql

@@ -0,0 +1,5 @@
+--
+-- Add access column for access levels #__users
+--
+
+ALTER TABLE `#__users` ADD COLUMN `access` int(10) unsigned NOT NULL DEFAULT 0;

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-16.sql

@@ -0,0 +1 @@
+ALTER TABLE "#__users" ADD COLUMN "access" bigint NOT NULL DEFAULT 0;

administrator/components/com_users/Helper/UsersHelper.php

@@ -340,6 +340,7 @@ public static function getContexts()
 
 		$contexts = array(
 			'com_users.user' => Text::_('COM_USERS'),
+			'com_users.contact' => Text::_('COM_USERS_FIELDS_CONTEXT_CONTACT'),
 		);
 
 		return $contexts;

administrator/components/com_users/Model/UserModel.php

@@ -690,6 +690,16 @@ public function batch($commands, $pks, $contexts)
 			$done = true;
 		}
 
+		if (!empty($commands['assetgroup_id']))
+		{
+			if (!$this->batchAccess($commands['assetgroup_id'], $pks, $contexts))
+			{
+				return false;
+			}
+
+			$done = true;
+		}
+
 		if (!$done)
 		{
 			$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));

administrator/components/com_users/Model/UsersModel.php

@@ -54,6 +54,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 				'range',
 				'lastvisitrange',
 				'state',
+				'access', 'a.access', 'access_level',
 			);
 		}
 
@@ -101,6 +102,9 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
 
 		$this->setState('filter.excluded', $excluded);
 
+		$access = $app->input->getInt('access');
+		$this->setState('filter.access', $access);
+
 		// Load the parameters.
 		$params = ComponentHelper::getParams('com_users');
 		$this->setState('params', $params);
@@ -130,6 +134,7 @@ protected function getStoreId($id = '')
 		$id .= ':' . $this->getState('filter.state');
 		$id .= ':' . $this->getState('filter.group_id');
 		$id .= ':' . $this->getState('filter.range');
+		$id .= ':' . $this->getState('filter.access');
 
 		return parent::getStoreId($id);
 	}
@@ -300,6 +305,10 @@ protected function getListQuery()
 			}
 		}
 
+		// Join over the asset groups.
+		$query->select($db->quoteName('ag.title') . ' AS access_level')
+			->leftJoin('#__viewlevels AS ag ON ag.id = a.access');
+
 		// Filter the items over the group id if set.
 		$groupId = $this->getState('filter.group_id');
 		$groups  = $this->getState('filter.groups');
@@ -325,7 +334,8 @@ protected function getListQuery()
 							'a.resetCount',
 							'a.otpKey',
 							'a.otep',
-							'a.requireReset'
+							'a.requireReset',
+							'a.access'
 						)
 					)
 				);

administrator/components/com_users/View/Users/HtmlView.php

@@ -202,6 +202,7 @@ protected function getSortFields()
 			'a.username'      => Text::_('JGLOBAL_USERNAME'),
 			'a.block'         => Text::_('COM_USERS_HEADING_ENABLED'),
 			'a.activation'    => Text::_('COM_USERS_HEADING_ACTIVATED'),
+			'access_level'    => Text::_('JGRID_HEADING_ACCESS'),
 			'a.email'         => Text::_('JGLOBAL_EMAIL'),
 			'a.lastvisitDate' => Text::_('COM_USERS_HEADING_LAST_VISIT_DATE'),
 			'a.registerDate'  => Text::_('COM_USERS_HEADING_REGISTRATION_DATE'),

administrator/components/com_users/config.xml

@@ -184,6 +184,112 @@
 		/>
 	</fieldset>
 
+	<fieldset
+		name="Contact_Form"
+		label="COM_USERS_CONFIG_FIELD_CONTACT_FORM"
+		description="COM_USERS_CONFIG_FIELD_INDIVIDUAL_CONTACT_DESC"
+		>
+		<field
+			name="captcha"
+			type="plugins"
+			label="COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL"
+			folder="captcha"
+			filter="cmd"
+			useglobal="true"
+			>
+			<option value="0">JOPTION_DO_NOT_USE</option>
+		</field>
+
+		<field
+			name="show_email_form"
+			type="radio"
+			label="COM_USERS_FIELD_EMAIL_SHOW_FORM_LABEL"
+			class="switcher"
+			default="1"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_email_copy"
+			type="radio"
+			label="COM_USERS_FIELD_EMAIL_EMAIL_COPY_LABEL"
+			default="0"
+			class="switcher"
+			showon="show_email_form:1"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="banned_email"
+			type="textarea"
+			label="COM_USERS_CONFIG_FIELD_BANNED_EMAIL_LABEL"
+			description="COM_USERS_CONFIG_FIELD_BANNED_EMAIL_DESC"
+			default=""
+			rows="3"
+			cols="30"
+			showon="show_email_form:1"
+		/>
+
+		<field
+			name="banned_subject"
+			type="textarea"
+			label="COM_USERS_CONFIG_FIELD_BANNED_SUBJECT_LABEL"
+			description="COM_USERS_CONFIG_FIELD_BANNED_SUBJECT_DESC"
+			default=""
+			rows="3"
+			cols="30"
+			showon="show_email_form:1"
+		/>
+
+		<field
+			name="banned_text"
+			type="textarea"
+			label="COM_USERS_CONFIG_FIELD_BANNED_TEXT_LABEL"
+			description="COM_USERS_CONFIG_FIELD_BANNED_TEXT_DESC"
+			default=""
+			rows="3"
+			cols="30"
+			showon="show_email_form:1"
+		/>
+
+		<field
+			name="validate_session"
+			type="radio"
+			label="COM_USERS_FIELD_CONFIG_SESSION_CHECK_LABEL"
+			class="switcher"
+			default="1"
+			showon="show_email_form:1"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			name="custom_reply"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_CUSTOM_REPLY_LABEL"
+			class="switcher"
+			default="0"
+			showon="show_email_form:1"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			name="redirect"
+			type="text"
+			label="COM_USERS_FIELD_CONFIG_REDIRECT_LABEL"
+			default=""
+			size="30"
+			showon="show_email_form:1"
+		/>
+	</fieldset>
+
 	<fieldset
 		name="user_notes_history"
 		label="COM_USERS_CONFIG_FIELD_NOTES_HISTORY" >
@@ -213,7 +319,7 @@
  	<fieldset
 		name="massmail"
 		label="COM_USERS_MASS_MAIL"
-		description="COM_USERS_MASS_MAIL_DESC">
+		description="COM_USERS_MASS_MAIL_DESC" >
 
 		<field
  			name="mailSubjectPrefix"
@@ -263,7 +369,7 @@
 	<fieldset name="integration"
 		label="JGLOBAL_INTEGRATION_LABEL"
 		description="COM_USERS_CONFIG_INTEGRATION_SETTINGS_DESC"
-	>
+		>
 
 		<field
 			name="custom_fields_enable"

administrator/components/com_users/forms/user.xml

@@ -139,6 +139,13 @@
 			readonly="true"
 		/>
 
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			size="1"
+		/>
+
 	</fieldset>
 	<field name="groups" type="hidden" />
 	<field name="twofactor" type="hidden" />
@@ -203,5 +210,82 @@
 
 		</fieldset>
 
+		<fieldset name="email" label="COM_USERS_FIELDSET_CONTACT_LABEL">
+
+			<field
+				name="show_email_form"
+				type="list"
+				label="COM_USERS_FIELD_EMAIL_SHOW_FORM_LABEL"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_email_copy"
+				type="list"
+				label="COM_USERS_FIELD_EMAIL_EMAIL_COPY_LABEL"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="banned_email"
+				type="textarea"
+				label="COM_USERS_FIELD_EMAIL_BANNED_EMAIL_LABEL"
+				description="COM_USERS_FIELD_EMAIL_BANNED_EMAIL_DESC"
+				rows="3"
+				cols="30"
+			/>
+
+			<field
+				name="banned_subject"
+				type="textarea"
+				label="COM_USERS_FIELD_EMAIL_BANNED_SUBJECT_LABEL"
+				description="COM_USERS_FIELD_EMAIL_BANNED_SUBJECT_DESC"
+				rows="3"
+				cols="30"
+			/>
+
+			<field
+				name="banned_text"
+				type="textarea"
+				label="COM_USERS_FIELD_EMAIL_BANNED_TEXT_LABEL"
+				description="COM_USERS_FIELD_EMAIL_BANNED_TEXT_DESC"
+				rows="3"
+				cols="30"
+			/>
+
+			<field
+				name="validate_session"
+				type="list"
+				label="COM_USERS_FIELD_CONFIG_SESSION_CHECK_LABEL"
+				useglobal="true"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="custom_reply"
+				type="list"
+				label="COM_USERS_CONFIG_FIELD_CUSTOM_REPLY_LABEL"
+				useglobal="true"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="redirect"
+				type="text"
+				label="COM_USERS_FIELD_CONFIG_REDIRECT_LABEL"
+				size="30"
+			/>
+		</fieldset>
+
 	</fields>
 </form>

administrator/components/com_users/tmpl/users/default.php

@@ -60,6 +60,9 @@
 								<th scope="col" style="width:12%" class="nowrap text-center">
 									<?php echo Text::_('COM_USERS_HEADING_GROUPS'); ?>
 								</th>
+								<th scope="col" style="width:10%" class="nowrap d-none d-md-table-cell text-center">
+									<?php echo Text::_('JGRID_HEADING_ACCESS'); ?>
+								</th>
 								<th scope="col" style="width:12%" class="nowrap d-none d-lg-table-cell text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_EMAIL', 'a.email', $listDirn, $listOrder); ?>
 								</th>
@@ -148,6 +151,9 @@
 										<?php echo nl2br($item->group_names); ?>
 									<?php endif; ?>
 								</td>
+								<td class="small d-none d-md-table-cell text-center">
+									<?php echo $this->escape($item->access_level); ?>
+								</td>
 								<td class="d-none d-lg-table-cell break-word text-center">
 									<?php echo PunycodeHelper::emailToUTF8($this->escape($item->email)); ?>
 								</td>

administrator/components/com_users/tmpl/users/default_batch_body.php

@@ -39,6 +39,9 @@
                     <?php echo HTMLHelper::_('select.options', HTMLHelper::_('user.groups')); ?>
                 </select>
 			</div>
+			<div class="form-group col-md-6">
+				<?php echo HTMLHelper::_('batch.access'); ?>
+			</div>
 		</div>
         <div class="form-group">
             <label><?php echo Text::_('COM_USERS_REQUIRE_PASSWORD_RESET'); ?></label>