nextcloud / server

apps/user_ldap/templates/settings.php

Braces +13 added lines, -1 removed lines

@@ -97,7 +97,19 @@
 				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups\'s display name.'));?>" /></p>
 				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p>
 				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option><option value="gidNumber"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'gidNumber')) p(' selected'); ?>>gidNumber</option></select></p>				<p><label for="ldap_dynamic_group_member_url"><?php p($l->t('Dynamic Group Member URL'));?></label><input type="text" id="ldap_dynamic_group_member_url" name="ldap_dynamic_group_member_url" title="<?php p($l->t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)'));?>" data-default="<?php p($_['ldap_dynamic_group_member_url_default']); ?>" /></p>
+				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) {
+    p(' selected');
+}
+?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) {
+    p(' selected');
+}
+?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) {
+    p(' selected');
+}
+?>>member (AD)</option><option value="gidNumber"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'gidNumber')) {
+    p(' selected');
+}
+?>>gidNumber</option></select></p>				<p><label for="ldap_dynamic_group_member_url"><?php p($l->t('Dynamic Group Member URL'));?></label><input type="text" id="ldap_dynamic_group_member_url" name="ldap_dynamic_group_member_url" title="<?php p($l->t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)'));?>" data-default="<?php p($_['ldap_dynamic_group_member_url_default']); ?>" /></p>
 				<p><label for="ldap_nested_groups"><?php p($l->t('Nested Groups'));?></label><input type="checkbox" id="ldap_nested_groups" name="ldap_nested_groups" value="1" data-default="<?php p($_['ldap_nested_groups_default']); ?>"  title="<?php p($l->t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)'));?>" /></p>
 				<p><label for="ldap_paging_size"><?php p($l->t('Paging chunksize'));?></label><input type="number" id="ldap_paging_size" name="ldap_paging_size" title="<?php p($l->t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)'));?>" data-default="<?php p($_['ldap_paging_size_default']); ?>" /></p>
 				<p><label for="ldap_turn_on_pwd_change"><?php p($l->t('Enable LDAP password changes per user'));?></label><span class="inlinetable"><span class="tablerow left"><input type="checkbox" id="ldap_turn_on_pwd_change" name="ldap_turn_on_pwd_change" value="1" data-default="<?php p($_['ldap_turn_on_pwd_change_default']); ?>" title="<?php p($l->t('Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server.'));?>" /><span class="tablecell"><?php p($l->t('(New password is sent as plain text to LDAP)'));?></span></span>

Indentation +44 added lines, -44 removed lines

@@ -5,46 +5,46 @@ 
 vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect');
 
 script('user_ldap', [
-	'wizard/controller',
-	'wizard/configModel',
-	'wizard/view',
-	'wizard/wizardObject',
-	'wizard/wizardTabGeneric',
-	'wizard/wizardTabElementary',
-	'wizard/wizardTabAbstractFilter',
-	'wizard/wizardTabUserFilter',
-	'wizard/wizardTabLoginFilter',
-	'wizard/wizardTabGroupFilter',
-	'wizard/wizardTabAdvanced',
-	'wizard/wizardTabExpert',
-	'wizard/wizardDetectorQueue',
-	'wizard/wizardDetectorGeneric',
-	'wizard/wizardDetectorPort',
-	'wizard/wizardDetectorBaseDN',
-	'wizard/wizardDetectorFeatureAbstract',
-	'wizard/wizardDetectorUserObjectClasses',
-	'wizard/wizardDetectorGroupObjectClasses',
-	'wizard/wizardDetectorGroupsForUsers',
-	'wizard/wizardDetectorGroupsForGroups',
-	'wizard/wizardDetectorSimpleRequestAbstract',
-	'wizard/wizardDetectorFilterUser',
-	'wizard/wizardDetectorFilterLogin',
-	'wizard/wizardDetectorFilterGroup',
-	'wizard/wizardDetectorUserCount',
-	'wizard/wizardDetectorGroupCount',
-	'wizard/wizardDetectorEmailAttribute',
-	'wizard/wizardDetectorUserDisplayNameAttribute',
-	'wizard/wizardDetectorUserGroupAssociation',
-	'wizard/wizardDetectorAvailableAttributes',
-	'wizard/wizardDetectorTestAbstract',
-	'wizard/wizardDetectorTestLoginName',
-	'wizard/wizardDetectorTestBaseDN',
-	'wizard/wizardDetectorTestConfiguration',
-	'wizard/wizardDetectorClearUserMappings',
-	'wizard/wizardDetectorClearGroupMappings',
-	'wizard/wizardFilterOnType',
-	'wizard/wizardFilterOnTypeFactory',
-	'wizard/wizard'
+    'wizard/controller',
+    'wizard/configModel',
+    'wizard/view',
+    'wizard/wizardObject',
+    'wizard/wizardTabGeneric',
+    'wizard/wizardTabElementary',
+    'wizard/wizardTabAbstractFilter',
+    'wizard/wizardTabUserFilter',
+    'wizard/wizardTabLoginFilter',
+    'wizard/wizardTabGroupFilter',
+    'wizard/wizardTabAdvanced',
+    'wizard/wizardTabExpert',
+    'wizard/wizardDetectorQueue',
+    'wizard/wizardDetectorGeneric',
+    'wizard/wizardDetectorPort',
+    'wizard/wizardDetectorBaseDN',
+    'wizard/wizardDetectorFeatureAbstract',
+    'wizard/wizardDetectorUserObjectClasses',
+    'wizard/wizardDetectorGroupObjectClasses',
+    'wizard/wizardDetectorGroupsForUsers',
+    'wizard/wizardDetectorGroupsForGroups',
+    'wizard/wizardDetectorSimpleRequestAbstract',
+    'wizard/wizardDetectorFilterUser',
+    'wizard/wizardDetectorFilterLogin',
+    'wizard/wizardDetectorFilterGroup',
+    'wizard/wizardDetectorUserCount',
+    'wizard/wizardDetectorGroupCount',
+    'wizard/wizardDetectorEmailAttribute',
+    'wizard/wizardDetectorUserDisplayNameAttribute',
+    'wizard/wizardDetectorUserGroupAssociation',
+    'wizard/wizardDetectorAvailableAttributes',
+    'wizard/wizardDetectorTestAbstract',
+    'wizard/wizardDetectorTestLoginName',
+    'wizard/wizardDetectorTestBaseDN',
+    'wizard/wizardDetectorTestConfiguration',
+    'wizard/wizardDetectorClearUserMappings',
+    'wizard/wizardDetectorClearGroupMappings',
+    'wizard/wizardFilterOnType',
+    'wizard/wizardFilterOnTypeFactory',
+    'wizard/wizard'
 ]);
 
 style('user_ldap', 'settings');
@@ -67,10 +67,10 @@ 
 		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
 	</ul>
 	<?php
-	if(!function_exists('ldap_connect')) {
-		print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
-	}
-	?>
+    if(!function_exists('ldap_connect')) {
+        print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
+    }
+    ?>
 	<?php require_once __DIR__ . '/part.wizard-server.php'; ?>
 	<?php require_once __DIR__ . '/part.wizard-userfilter.php'; ?>
 	<?php require_once __DIR__ . '/part.wizard-loginfilter.php'; ?>

Spacing +46 added lines, -46 removed lines

@@ -59,70 +59,70 @@
 
 	<div id="ldapSettings">
 	<ul>
-		<li id="#ldapWizard1"><a href="#ldapWizard1"><?php p($l->t('Server'));?></a></li>
-		<li id="#ldapWizard2"><a href="#ldapWizard2"><?php p($l->t('Users'));?></a></li>
-		<li id="#ldapWizard3"><a href="#ldapWizard3"><?php p($l->t('Login Attributes'));?></a></li>
-		<li id="#ldapWizard4"><a href="#ldapWizard4"><?php p($l->t('Groups'));?></a></li>
-		<li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li>
-		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
+		<li id="#ldapWizard1"><a href="#ldapWizard1"><?php p($l->t('Server')); ?></a></li>
+		<li id="#ldapWizard2"><a href="#ldapWizard2"><?php p($l->t('Users')); ?></a></li>
+		<li id="#ldapWizard3"><a href="#ldapWizard3"><?php p($l->t('Login Attributes')); ?></a></li>
+		<li id="#ldapWizard4"><a href="#ldapWizard4"><?php p($l->t('Groups')); ?></a></li>
+		<li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert')); ?></a></li>
+		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced')); ?></a></li>
 	</ul>
 	<?php
-	if(!function_exists('ldap_connect')) {
+	if (!function_exists('ldap_connect')) {
 		print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
 	}
 	?>
-	<?php require_once __DIR__ . '/part.wizard-server.php'; ?>
-	<?php require_once __DIR__ . '/part.wizard-userfilter.php'; ?>
-	<?php require_once __DIR__ . '/part.wizard-loginfilter.php'; ?>
-	<?php require_once __DIR__ . '/part.wizard-groupfilter.php'; ?>
+	<?php require_once __DIR__.'/part.wizard-server.php'; ?>
+	<?php require_once __DIR__.'/part.wizard-userfilter.php'; ?>
+	<?php require_once __DIR__.'/part.wizard-loginfilter.php'; ?>
+	<?php require_once __DIR__.'/part.wizard-groupfilter.php'; ?>
 	<fieldset id="ldapSettings-1">
 		<div id="ldapAdvancedAccordion">
-			<h3><?php p($l->t('Connection Settings'));?></h3>
+			<h3><?php p($l->t('Connection Settings')); ?></h3>
 			<div>
-				<p><label for="ldap_configuration_active"><?php p($l->t('Configuration Active'));?></label><input type="checkbox" id="ldap_configuration_active" name="ldap_configuration_active" value="1" data-default="<?php p($_['ldap_configuration_active_default']); ?>"  title="<?php p($l->t('When unchecked, this configuration will be skipped.'));?>" /></p>
-				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
-				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
-				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
-				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', [$theme->getName()] ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
-				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
+				<p><label for="ldap_configuration_active"><?php p($l->t('Configuration Active')); ?></label><input type="checkbox" id="ldap_configuration_active" name="ldap_configuration_active" value="1" data-default="<?php p($_['ldap_configuration_active_default']); ?>"  title="<?php p($l->t('When unchecked, this configuration will be skipped.')); ?>" /></p>
+				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host')); ?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.')); ?>"></p>
+				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port')); ?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
+				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server')); ?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.')); ?>" /></p>
+				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.')); ?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', [$theme->getName()])); ?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
+				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live')); ?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.')); ?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
-			<h3><?php p($l->t('Directory Settings'));?></h3>
+			<h3><?php p($l->t('Directory Settings')); ?></h3>
 			<div>
-				<p><label for="ldap_display_name"><?php p($l->t('User Display Name Field'));?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user\'s display name.'));?>" /></p>
-				<p><label for="ldap_user_display_name_2"><?php p($l->t('2nd User Display Name Field'));?></label><input type="text" id="ldap_user_display_name_2" name="ldap_user_display_name_2" data-default="<?php p($_['ldap_user_display_name_2_default']); ?>" title="<?php p($l->t('Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«.'));?>" /></p>
-				<p><label for="ldap_base_users"><?php p($l->t('Base User Tree'));?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php p($l->t('One User Base DN per line'));?>" data-default="<?php p($_['ldap_base_users_default']); ?>" title="<?php p($l->t('Base User Tree'));?>"></textarea></p>
-				<p><label for="ldap_attributes_for_user_search"><?php p($l->t('User Search Attributes'));?></label><textarea id="ldap_attributes_for_user_search" name="ldap_attributes_for_user_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_user_search_default']); ?>" title="<?php p($l->t('User Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups\'s display name.'));?>" /></p>
-				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p>
-				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option><option value="gidNumber"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'gidNumber')) p(' selected'); ?>>gidNumber</option></select></p>				<p><label for="ldap_dynamic_group_member_url"><?php p($l->t('Dynamic Group Member URL'));?></label><input type="text" id="ldap_dynamic_group_member_url" name="ldap_dynamic_group_member_url" title="<?php p($l->t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)'));?>" data-default="<?php p($_['ldap_dynamic_group_member_url_default']); ?>" /></p>
-				<p><label for="ldap_nested_groups"><?php p($l->t('Nested Groups'));?></label><input type="checkbox" id="ldap_nested_groups" name="ldap_nested_groups" value="1" data-default="<?php p($_['ldap_nested_groups_default']); ?>"  title="<?php p($l->t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)'));?>" /></p>
-				<p><label for="ldap_paging_size"><?php p($l->t('Paging chunksize'));?></label><input type="number" id="ldap_paging_size" name="ldap_paging_size" title="<?php p($l->t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)'));?>" data-default="<?php p($_['ldap_paging_size_default']); ?>" /></p>
-				<p><label for="ldap_turn_on_pwd_change"><?php p($l->t('Enable LDAP password changes per user'));?></label><span class="inlinetable"><span class="tablerow left"><input type="checkbox" id="ldap_turn_on_pwd_change" name="ldap_turn_on_pwd_change" value="1" data-default="<?php p($_['ldap_turn_on_pwd_change_default']); ?>" title="<?php p($l->t('Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server.'));?>" /><span class="tablecell"><?php p($l->t('(New password is sent as plain text to LDAP)'));?></span></span>
+				<p><label for="ldap_display_name"><?php p($l->t('User Display Name Field')); ?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user\'s display name.')); ?>" /></p>
+				<p><label for="ldap_user_display_name_2"><?php p($l->t('2nd User Display Name Field')); ?></label><input type="text" id="ldap_user_display_name_2" name="ldap_user_display_name_2" data-default="<?php p($_['ldap_user_display_name_2_default']); ?>" title="<?php p($l->t('Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«.')); ?>" /></p>
+				<p><label for="ldap_base_users"><?php p($l->t('Base User Tree')); ?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php p($l->t('One User Base DN per line')); ?>" data-default="<?php p($_['ldap_base_users_default']); ?>" title="<?php p($l->t('Base User Tree')); ?>"></textarea></p>
+				<p><label for="ldap_attributes_for_user_search"><?php p($l->t('User Search Attributes')); ?></label><textarea id="ldap_attributes_for_user_search" name="ldap_attributes_for_user_search" placeholder="<?php p($l->t('Optional; one attribute per line')); ?>" data-default="<?php p($_['ldap_attributes_for_user_search_default']); ?>" title="<?php p($l->t('User Search Attributes')); ?>"></textarea></p>
+				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field')); ?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups\'s display name.')); ?>" /></p>
+				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree')); ?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line')); ?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree')); ?>"></textarea></p>
+				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes')); ?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line')); ?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes')); ?>"></textarea></p>
+				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association')); ?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option><option value="gidNumber"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'gidNumber')) p(' selected'); ?>>gidNumber</option></select></p>				<p><label for="ldap_dynamic_group_member_url"><?php p($l->t('Dynamic Group Member URL')); ?></label><input type="text" id="ldap_dynamic_group_member_url" name="ldap_dynamic_group_member_url" title="<?php p($l->t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)')); ?>" data-default="<?php p($_['ldap_dynamic_group_member_url_default']); ?>" /></p>
+				<p><label for="ldap_nested_groups"><?php p($l->t('Nested Groups')); ?></label><input type="checkbox" id="ldap_nested_groups" name="ldap_nested_groups" value="1" data-default="<?php p($_['ldap_nested_groups_default']); ?>"  title="<?php p($l->t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)')); ?>" /></p>
+				<p><label for="ldap_paging_size"><?php p($l->t('Paging chunksize')); ?></label><input type="number" id="ldap_paging_size" name="ldap_paging_size" title="<?php p($l->t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)')); ?>" data-default="<?php p($_['ldap_paging_size_default']); ?>" /></p>
+				<p><label for="ldap_turn_on_pwd_change"><?php p($l->t('Enable LDAP password changes per user')); ?></label><span class="inlinetable"><span class="tablerow left"><input type="checkbox" id="ldap_turn_on_pwd_change" name="ldap_turn_on_pwd_change" value="1" data-default="<?php p($_['ldap_turn_on_pwd_change_default']); ?>" title="<?php p($l->t('Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server.')); ?>" /><span class="tablecell"><?php p($l->t('(New password is sent as plain text to LDAP)')); ?></span></span>
 			</span><br/></p>
-				<p><label for="ldap_default_ppolicy_dn"><?php p($l->t('Default password policy DN'));?></label><input type="text" id="ldap_default_ppolicy_dn" name="ldap_default_ppolicy_dn" title="<?php p($l->t('The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling.'));?>" data-default="<?php p($_['ldap_default_ppolicy_dn_default']); ?>" /></p>
+				<p><label for="ldap_default_ppolicy_dn"><?php p($l->t('Default password policy DN')); ?></label><input type="text" id="ldap_default_ppolicy_dn" name="ldap_default_ppolicy_dn" title="<?php p($l->t('The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling.')); ?>" data-default="<?php p($_['ldap_default_ppolicy_dn_default']); ?>" /></p>
 			</div>
-			<h3><?php p($l->t('Special Attributes'));?></h3>
+			<h3><?php p($l->t('Special Attributes')); ?></h3>
 			<div>
-				<p><label for="ldap_quota_attr"><?php p($l->t('Quota Field'));?></label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" data-default="<?php p($_['ldap_quota_attr_default']); ?>" title="<?php p($l->t('Leave empty for user\'s default quota. Otherwise, specify an LDAP/AD attribute.'));?>" /></p>
-				<p><label for="ldap_quota_def"><?php p($l->t('Quota Default'));?></label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php p($_['ldap_quota_def_default']); ?>" title="<?php p($l->t('Override default quota for LDAP users who do not have a quota set in the Quota Field.'));?>" /></p>
-				<p><label for="ldap_email_attr"><?php p($l->t('Email Field'));?></label><input type="text" id="ldap_email_attr" name="ldap_email_attr" data-default="<?php p($_['ldap_email_attr_default']); ?>" title="<?php p($l->t('Set the user\'s email from their LDAP attribute. Leave it empty for default behaviour.'));?>" /></p>
-				<p><label for="home_folder_naming_rule"><?php p($l->t('User Home Folder Naming Rule'));?></label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" title="<?php p($l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.'));?>" data-default="<?php p($_['home_folder_naming_rule_default']); ?>" /></p>
+				<p><label for="ldap_quota_attr"><?php p($l->t('Quota Field')); ?></label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" data-default="<?php p($_['ldap_quota_attr_default']); ?>" title="<?php p($l->t('Leave empty for user\'s default quota. Otherwise, specify an LDAP/AD attribute.')); ?>" /></p>
+				<p><label for="ldap_quota_def"><?php p($l->t('Quota Default')); ?></label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php p($_['ldap_quota_def_default']); ?>" title="<?php p($l->t('Override default quota for LDAP users who do not have a quota set in the Quota Field.')); ?>" /></p>
+				<p><label for="ldap_email_attr"><?php p($l->t('Email Field')); ?></label><input type="text" id="ldap_email_attr" name="ldap_email_attr" data-default="<?php p($_['ldap_email_attr_default']); ?>" title="<?php p($l->t('Set the user\'s email from their LDAP attribute. Leave it empty for default behaviour.')); ?>" /></p>
+				<p><label for="home_folder_naming_rule"><?php p($l->t('User Home Folder Naming Rule')); ?></label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" title="<?php p($l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.')); ?>" data-default="<?php p($_['home_folder_naming_rule_default']); ?>" /></p>
 			</div>
 		</div>
 		<?php print_unescaped($_['settingControls']); ?>
 	</fieldset>
 	<fieldset id="ldapSettings-2">
-		<p><strong><?php p($l->t('Internal Username'));?></strong></p>
-		<p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users.'));?></p>
-		<p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
-		<p><strong><?php p($l->t('Override UUID detection'));?></strong></p>
-		<p class="ldapIndent"><?php p($l->t('By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p>
-		<p class="ldapIndent"><label for="ldap_expert_uuid_user_attr"><?php p($l->t('UUID Attribute for Users:'));?></label><input type="text" id="ldap_expert_uuid_user_attr" name="ldap_expert_uuid_user_attr" data-default="<?php p($_['ldap_expert_uuid_user_attr_default']); ?>" /></p>
-		<p class="ldapIndent"><label for="ldap_expert_uuid_group_attr"><?php p($l->t('UUID Attribute for Groups:'));?></label><input type="text" id="ldap_expert_uuid_group_attr" name="ldap_expert_uuid_group_attr" data-default="<?php p($_['ldap_expert_uuid_group_attr_default']); ?>" /></p>
-		<p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
-		<p class="ldapIndent"><?php p($l->t('Usernames are used to store and assign metadata. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.'));?></p>
-		<p class="ldapIndent"><button type="button" id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button type="button" id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
+		<p><strong><?php p($l->t('Internal Username')); ?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users.')); ?></p>
+		<p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:')); ?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
+		<p><strong><?php p($l->t('Override UUID detection')); ?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups.')); ?></p>
+		<p class="ldapIndent"><label for="ldap_expert_uuid_user_attr"><?php p($l->t('UUID Attribute for Users:')); ?></label><input type="text" id="ldap_expert_uuid_user_attr" name="ldap_expert_uuid_user_attr" data-default="<?php p($_['ldap_expert_uuid_user_attr_default']); ?>" /></p>
+		<p class="ldapIndent"><label for="ldap_expert_uuid_group_attr"><?php p($l->t('UUID Attribute for Groups:')); ?></label><input type="text" id="ldap_expert_uuid_group_attr" name="ldap_expert_uuid_group_attr" data-default="<?php p($_['ldap_expert_uuid_group_attr_default']); ?>" /></p>
+		<p><strong><?php p($l->t('Username-LDAP User Mapping')); ?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('Usernames are used to store and assign metadata. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.')); ?></p>
+		<p class="ldapIndent"><button type="button" id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping')); ?></button><br/><button type="button" id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping')); ?></button></p>
 		<?php print_unescaped($_['settingControls']); ?>
 	</fieldset>
 	</div>

apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 		$offset = $arguments['offset'];
 		$stopAt = $arguments['stopAt'];
 
-		$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
+		$this->logger->info('Building calendar index ('.$offset.'/'.$stopAt.')');
 
 		$offset = $this->buildIndex($offset, $stopAt);
 
@@ -80,7 +80,7 @@ 
 				'offset' => $offset,
 				'stopAt' => $stopAt
 			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+			$this->logger->info('New building calendar index job scheduled with offset '.$offset);
 		}
 	}
 
@@ -100,7 +100,7 @@ 
 			->orderBy('id', 'ASC');
 
 		$stmt = $query->execute();
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			$offset = $row['id'];
 
 			$calendarData = $row['calendardata'];

Indentation +86 added lines, -86 removed lines

@@ -31,90 +31,90 @@
 
 class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $db,
-								CalDavBackend $calDavBackend,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function run($arguments) {
-		$offset = $arguments['offset'];
-		$stopAt = $arguments['stopAt'];
-
-		$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
-
-		$offset = $this->buildIndex($offset, $stopAt);
-
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
-		}
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex($offset, $stopAt) {
-		$startTime = $this->timeFactory->getTime();
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'calendarid', 'uri', 'calendardata'])
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC');
-
-		$stmt = $query->execute();
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$offset = $row['id'];
-
-			$calendarData = $row['calendardata'];
-			if (is_resource($calendarData)) {
-				$calendarData = stream_get_contents($calendarData);
-			}
-
-			$this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
-
-			if (($this->timeFactory->getTime() - $startTime) > 15) {
-				return $offset;
-			}
-		}
-
-		return $stopAt;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $db,
+                                CalDavBackend $calDavBackend,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function run($arguments) {
+        $offset = $arguments['offset'];
+        $stopAt = $arguments['stopAt'];
+
+        $this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
+
+        $offset = $this->buildIndex($offset, $stopAt);
+
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex($offset, $stopAt) {
+        $startTime = $this->timeFactory->getTime();
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'calendarid', 'uri', 'calendardata'])
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC');
+
+        $stmt = $query->execute();
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $offset = $row['id'];
+
+            $calendarData = $row['calendardata'];
+            if (is_resource($calendarData)) {
+                $calendarData = stream_get_contents($calendarData);
+            }
+
+            $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
+
+            if (($this->timeFactory->getTime() - $startTime) > 15) {
+                return $offset;
+            }
+        }
+
+        return $stopAt;
+    }
 }

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

Indentation +45 added lines, -45 removed lines

@@ -30,57 +30,57 @@
 
 class BuildCalendarSearchIndex implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IDBConnection $db
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db,
-								IJobList $jobList,
-								IConfig $config) {
-		$this->db = $db;
-		$this->jobList = $jobList;
-		$this->config = $config;
-	}
+    /**
+     * @param IDBConnection $db
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db,
+                                IJobList $jobList,
+                                IConfig $config) {
+        $this->db = $db;
+        $this->jobList = $jobList;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Registering building of calendar search index as background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Registering building of calendar search index as background job';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('dav', 'buildCalendarSearchIndex') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('dav', 'buildCalendarSearchIndex') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
 
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->createFunction('MAX(id)'))
-			->from('calendarobjects');
-		$maxId = (int)$query->execute()->fetchColumn();
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->createFunction('MAX(id)'))
+            ->from('calendarobjects');
+        $maxId = (int)$query->execute()->fetchColumn();
 
-		$output->info('Add background job');
-		$this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [
-			'offset' => 0,
-			'stopAt' => $maxId
-		]);
+        $output->info('Add background job');
+        $this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [
+            'offset' => 0,
+            'stopAt' => $maxId
+        ]);
 
-		// if all were done, no need to redo the repair during next upgrade
-		$this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes');
-	}
+        // if all were done, no need to redo the repair during next upgrade
+        $this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes');
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 		$query = $this->db->getQueryBuilder();
 		$query->select($query->createFunction('MAX(id)'))
 			->from('calendarobjects');
-		$maxId = (int)$query->execute()->fetchColumn();
+		$maxId = (int) $query->execute()->fetchColumn();
 
 		$output->info('Add background job');
 		$this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [

apps/sharebymail/templates/settings-admin.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 	<p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p>
 
 	<p>
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) p('checked'); ?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
-		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> />
+		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if ($_['enforcePasswordProtection']) p('checked'); ?> />
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
 	</p>
 

Braces +8 added lines, -2 removed lines

@@ -11,9 +11,15 @@
 	<p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p>
 
 	<p>
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) {
+    p('checked');
+}
+?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
-		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> />
+		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) {
+    p('checked');
+}
+?> />
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
 	</p>
 

apps/dav/lib/Connector/Sabre/TagsPlugin.php

Spacing +3 added lines, -3 removed lines

@@ -220,9 +220,9 @@ 
 		)) {
 			// note: pre-fetching only supported for depth <= 1
 			$folderContent = $node->getChildren();
-			$fileIds[] = (int)$node->getId();
+			$fileIds[] = (int) $node->getId();
 			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
+				$fileIds[] = (int) $info->getId();
 			}
 			$tags = $this->getTagger()->getTagsForObjects($fileIds);
 			if ($tags === false) {
@@ -278,7 +278,7 @@ 
 		});
 
 		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
-			if ((int)$favState === 1 || $favState === 'true') {
+			if ((int) $favState === 1 || $favState === 'true') {
 				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
 			} else {
 				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);

Indentation +217 added lines, -217 removed lines

@@ -51,246 +51,246 @@
 class TagsPlugin extends \Sabre\DAV\ServerPlugin
 {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
-	const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
-	const TAG_FAVORITE = '_$!<Favorite>!$_';
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+    const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
+    const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var \OCP\ITagManager
-	 */
-	private $tagManager;
+    /**
+     * @var \OCP\ITagManager
+     */
+    private $tagManager;
 
-	/**
-	 * @var \OCP\ITags
-	 */
-	private $tagger;
+    /**
+     * @var \OCP\ITags
+     */
+    private $tagger;
 
-	/**
-	 * Array of file id to tags array
-	 * The null value means the cache wasn't initialized.
-	 *
-	 * @var array
-	 */
-	private $cachedTags;
+    /**
+     * Array of file id to tags array
+     * The null value means the cache wasn't initialized.
+     *
+     * @var array
+     */
+    private $cachedTags;
 
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
+    /**
+     * @var \Sabre\DAV\Tree
+     */
+    private $tree;
 
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param \OCP\ITagManager $tagManager tag manager
-	 */
-	public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
-		$this->tree = $tree;
-		$this->tagManager = $tagManager;
-		$this->tagger = null;
-		$this->cachedTags = array();
-	}
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param \OCP\ITagManager $tagManager tag manager
+     */
+    public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
+        $this->tree = $tree;
+        $this->tagManager = $tagManager;
+        $this->tagger = null;
+        $this->cachedTags = array();
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
 
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
-	}
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+        $this->server->on('propPatch', array($this, 'handleUpdateProperties'));
+    }
 
-	/**
-	 * Returns the tagger
-	 *
-	 * @return \OCP\ITags tagger
-	 */
-	private function getTagger() {
-		if (!$this->tagger) {
-			$this->tagger = $this->tagManager->load('files');
-		}
-		return $this->tagger;
-	}
+    /**
+     * Returns the tagger
+     *
+     * @return \OCP\ITags tagger
+     */
+    private function getTagger() {
+        if (!$this->tagger) {
+            $this->tagger = $this->tagManager->load('files');
+        }
+        return $this->tagger;
+    }
 
-	/**
-	 * Returns tags and favorites.
-	 *
-	 * @param integer $fileId file id
-	 * @return array list($tags, $favorite) with $tags as tag array
-	 * and $favorite is a boolean whether the file was favorited
-	 */
-	private function getTagsAndFav($fileId) {
-		$isFav = false;
-		$tags = $this->getTags($fileId);
-		if ($tags) {
-			$favPos = array_search(self::TAG_FAVORITE, $tags);
-			if ($favPos !== false) {
-				$isFav = true;
-				unset($tags[$favPos]);
-			}
-		}
-		return array($tags, $isFav);
-	}
+    /**
+     * Returns tags and favorites.
+     *
+     * @param integer $fileId file id
+     * @return array list($tags, $favorite) with $tags as tag array
+     * and $favorite is a boolean whether the file was favorited
+     */
+    private function getTagsAndFav($fileId) {
+        $isFav = false;
+        $tags = $this->getTags($fileId);
+        if ($tags) {
+            $favPos = array_search(self::TAG_FAVORITE, $tags);
+            if ($favPos !== false) {
+                $isFav = true;
+                unset($tags[$favPos]);
+            }
+        }
+        return array($tags, $isFav);
+    }
 
-	/**
-	 * Returns tags for the given file id
-	 *
-	 * @param integer $fileId file id
-	 * @return array list of tags for that file
-	 */
-	private function getTags($fileId) {
-		if (isset($this->cachedTags[$fileId])) {
-			return $this->cachedTags[$fileId];
-		} else {
-			$tags = $this->getTagger()->getTagsForObjects(array($fileId));
-			if ($tags !== false) {
-				if (empty($tags)) {
-					return array();
-				}
-				return current($tags);
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns tags for the given file id
+     *
+     * @param integer $fileId file id
+     * @return array list of tags for that file
+     */
+    private function getTags($fileId) {
+        if (isset($this->cachedTags[$fileId])) {
+            return $this->cachedTags[$fileId];
+        } else {
+            $tags = $this->getTagger()->getTagsForObjects(array($fileId));
+            if ($tags !== false) {
+                if (empty($tags)) {
+                    return array();
+                }
+                return current($tags);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Updates the tags of the given file id
-	 *
-	 * @param int $fileId
-	 * @param array $tags array of tag strings
-	 */
-	private function updateTags($fileId, $tags) {
-		$tagger = $this->getTagger();
-		$currentTags = $this->getTags($fileId);
+    /**
+     * Updates the tags of the given file id
+     *
+     * @param int $fileId
+     * @param array $tags array of tag strings
+     */
+    private function updateTags($fileId, $tags) {
+        $tagger = $this->getTagger();
+        $currentTags = $this->getTags($fileId);
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->unTag($fileId, $tag);
-		}
-	}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->unTag($fileId, $tag);
+        }
+    }
 
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		// need prefetch ?
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
-			|| !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
-		)) {
-			// note: pre-fetching only supported for depth <= 1
-			$folderContent = $node->getChildren();
-			$fileIds[] = (int)$node->getId();
-			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
-			}
-			$tags = $this->getTagger()->getTagsForObjects($fileIds);
-			if ($tags === false) {
-				// the tags API returns false on error...
-				$tags = array();
-			}
+        // need prefetch ?
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
+            || !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
+        )) {
+            // note: pre-fetching only supported for depth <= 1
+            $folderContent = $node->getChildren();
+            $fileIds[] = (int)$node->getId();
+            foreach ($folderContent as $info) {
+                $fileIds[] = (int)$info->getId();
+            }
+            $tags = $this->getTagger()->getTagsForObjects($fileIds);
+            if ($tags === false) {
+                // the tags API returns false on error...
+                $tags = array();
+            }
 
-			$this->cachedTags = $this->cachedTags + $tags;
-			$emptyFileIds = array_diff($fileIds, array_keys($tags));
-			// also cache the ones that were not found
-			foreach ($emptyFileIds as $fileId) {
-				$this->cachedTags[$fileId] = [];
-			}
-		}
+            $this->cachedTags = $this->cachedTags + $tags;
+            $emptyFileIds = array_diff($fileIds, array_keys($tags));
+            // also cache the ones that were not found
+            foreach ($emptyFileIds as $fileId) {
+                $this->cachedTags[$fileId] = [];
+            }
+        }
 
-		$isFav = null;
+        $isFav = null;
 
-		$propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
-			list($tags, $isFav) = $this->getTagsAndFav($node->getId());
-			return new TagList($tags);
-		});
+        $propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
+            list($tags, $isFav) = $this->getTagsAndFav($node->getId());
+            return new TagList($tags);
+        });
 
-		$propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
-			if (is_null($isFav)) {
-				list(, $isFav) = $this->getTagsAndFav($node->getId());
-			}
-			if ($isFav) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-	}
+        $propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
+            if (is_null($isFav)) {
+                list(, $isFav) = $this->getTagsAndFav($node->getId());
+            }
+            if ($isFav) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+    }
 
-	/**
-	 * Updates tags and favorites properties, if applicable.
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->tree->getNodeForPath($path);
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Updates tags and favorites properties, if applicable.
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->tree->getNodeForPath($path);
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		$propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
-			$this->updateTags($node->getId(), $tagList->getTags());
-			return true;
-		});
+        $propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
+            $this->updateTags($node->getId(), $tagList->getTags());
+            return true;
+        });
 
-		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
-			if ((int)$favState === 1 || $favState === 'true') {
-				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
-			} else {
-				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
-			}
+        $propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
+            if ((int)$favState === 1 || $favState === 'true') {
+                $this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
+            } else {
+                $this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
+            }
 
-			if (is_null($favState)) {
-				// confirm deletion
-				return 204;
-			}
+            if (is_null($favState)) {
+                // confirm deletion
+                return 204;
+            }
 
-			return 200;
-		});
-	}
+            return 200;
+        });
+    }
 }

lib/private/App/AppStore/Bundles/BundleFetcher.php

Spacing +2 added lines, -2 removed lines

@@ -68,8 +68,8 @@
 			$this->getBundles(),
 			$this->getDefaultInstallationBundle()
 		);
-		foreach($bundles as $bundle) {
-			if($bundle->getIdentifier() === $identifier) {
+		foreach ($bundles as $bundle) {
+			if ($bundle->getIdentifier() === $identifier) {
 				return $bundle;
 			}
 		}

Indentation +49 added lines, -49 removed lines

@@ -24,58 +24,58 @@
 use OCP\IL10N;
 
 class BundleFetcher {
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @return Bundle[]
-	 */
-	public function getBundles() {
-		return [
-			new EnterpriseBundle($this->l10n),
-			new GroupwareBundle($this->l10n),
-			new SocialSharingBundle($this->l10n),
-			new EducationBundle($this->l10n),
-		];
-	}
+    /**
+     * @return Bundle[]
+     */
+    public function getBundles() {
+        return [
+            new EnterpriseBundle($this->l10n),
+            new GroupwareBundle($this->l10n),
+            new SocialSharingBundle($this->l10n),
+            new EducationBundle($this->l10n),
+        ];
+    }
 
-	/**
-	 * Bundles that should be installed by default after installation
-	 *
-	 * @return Bundle[]
-	 */
-	public function getDefaultInstallationBundle() {
-		return [
-			new CoreBundle($this->l10n),
-		];
-	}
+    /**
+     * Bundles that should be installed by default after installation
+     *
+     * @return Bundle[]
+     */
+    public function getDefaultInstallationBundle() {
+        return [
+            new CoreBundle($this->l10n),
+        ];
+    }
 
-	/**
-	 * Get the bundle with the specified identifier
-	 *
-	 * @param string $identifier
-	 * @return Bundle
-	 * @throws \BadMethodCallException If the bundle does not exist
-	 */
-	public function getBundleByIdentifier($identifier) {
-		/** @var Bundle[] $bundles */
-		$bundles = array_merge(
-			$this->getBundles(),
-			$this->getDefaultInstallationBundle()
-		);
-		foreach($bundles as $bundle) {
-			if($bundle->getIdentifier() === $identifier) {
-				return $bundle;
-			}
-		}
+    /**
+     * Get the bundle with the specified identifier
+     *
+     * @param string $identifier
+     * @return Bundle
+     * @throws \BadMethodCallException If the bundle does not exist
+     */
+    public function getBundleByIdentifier($identifier) {
+        /** @var Bundle[] $bundles */
+        $bundles = array_merge(
+            $this->getBundles(),
+            $this->getDefaultInstallationBundle()
+        );
+        foreach($bundles as $bundle) {
+            if($bundle->getIdentifier() === $identifier) {
+                return $bundle;
+            }
+        }
 
-		throw new \BadMethodCallException('Bundle with specified identifier does not exist');
-	}
+        throw new \BadMethodCallException('Bundle with specified identifier does not exist');
+    }
 }

lib/private/BackgroundJob/JobList.php

Doc Comments +1 added lines, -1 removed lines

@@ -320,7 +320,7 @@
 
 	/**
 	 * @param IJob $job
-	 * @param $timeTaken
+	 * @param integer $timeTaken
 	 */
 	public function setExecutionTime(IJob $job, $timeTaken) {
 		$query = $this->connection->getQueryBuilder();

Indentation +342 added lines, -342 removed lines

@@ -39,346 +39,346 @@
 
 class JobList implements IJobList {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/**@var IConfig */
-	protected $config;
-
-	/**@var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var int - 12 hours * 3600 seconds*/
-	private $jobTimeOut = 43200;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function add($job, $argument = null) {
-		if (!$this->has($job, $argument)) {
-			if ($job instanceof IJob) {
-				$class = get_class($job);
-			} else {
-				$class = $job;
-			}
-
-			$argument = json_encode($argument);
-			if (strlen($argument) > 4000) {
-				throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
-			}
-
-			$query = $this->connection->getQueryBuilder();
-			$query->insert('jobs')
-				->values([
-					'class' => $query->createNamedParameter($class),
-					'argument' => $query->createNamedParameter($argument),
-					'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
-					'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
-				]);
-			$query->execute();
-		}
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function remove($job, $argument = null) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)));
-		if (!is_null($argument)) {
-			$argument = json_encode($argument);
-			$query->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
-		}
-		$query->execute();
-	}
-
-	/**
-	 * @param int $id
-	 */
-	protected function removeById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 * @return bool
-	 */
-	public function has($job, $argument) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-		$argument = json_encode($argument);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)))
-			->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)))
-			->setMaxResults(1);
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool) $row;
-	}
-
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return IJob[]
-	 * @deprecated 9.0.0 - This method is dangerous since it can cause load and
-	 * memory problems when creating too many instances.
-	 */
-	public function getAll() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs');
-		$result = $query->execute();
-
-		$jobs = [];
-		while ($row = $result->fetch()) {
-			$job = $this->buildJob($row);
-			if ($job) {
-				$jobs[] = $job;
-			}
-		}
-		$result->closeCursor();
-
-		return $jobs;
-	}
-
-	/**
-	 * get the next job in the list
-	 *
-	 * @return IJob|null
-	 * @suppress SqlInjectionChecker
-	 */
-	public function getNext() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - $this->jobTimeOut, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->lte('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)))
-			->orderBy('last_checked', 'ASC')
-			->setMaxResults(1);
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('jobs')
-			->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
-			->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
-			->where($update->expr()->eq('id', $update->createParameter('jobid')))
-			->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
-			->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			$update->setParameter('jobid', $row['id']);
-			$update->setParameter('reserved_at', $row['reserved_at']);
-			$update->setParameter('last_checked', $row['last_checked']);
-			$count = $update->execute();
-
-			if ($count === 0) {
-				// Background job already executed elsewhere, try again.
-				return $this->getNext();
-			}
-			$job = $this->buildJob($row);
-
-			if ($job === null) {
-				// set the last_checked to 12h in the future to not check failing jobs all over again
-				$reset = $this->connection->getQueryBuilder();
-				$reset->update('jobs')
-					->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
-					->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
-					->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
-				$reset->execute();
-
-				// Background job from disabled app, try again.
-				return $this->getNext();
-			}
-
-			return $job;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param int $id
-	 * @return IJob|null
-	 */
-	public function getById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return $this->buildJob($row);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * get the job object from a row in the db
-	 *
-	 * @param array $row
-	 * @return IJob|null
-	 */
-	private function buildJob($row) {
-		try {
-			try {
-				// Try to load the job as a service
-				/** @var IJob $job */
-				$job = \OC::$server->query($row['class']);
-			} catch (QueryException $e) {
-				if (class_exists($row['class'])) {
-					$class = $row['class'];
-					$job = new $class();
-				} else {
-					// job from disabled app or old version of an app, no need to do anything
-					return null;
-				}
-			}
-
-			$job->setId($row['id']);
-			$job->setLastRun($row['last_run']);
-			$job->setArgument(json_decode($row['argument'], true));
-			return $job;
-		} catch (AutoloadNotAllowedException $e) {
-			// job is from a disabled app, ignore
-			return null;
-		}
-	}
-
-	/**
-	 * set the job that was last ran
-	 *
-	 * @param IJob $job
-	 */
-	public function setLastJob(IJob $job) {
-		$this->unlockJob($job);
-		$this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
-	}
-
-	/**
-	 * Remove the reservation for a job
-	 *
-	 * @param IJob $job
-	 * @suppress SqlInjectionChecker
-	 */
-	public function unlockJob(IJob $job) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * get the id of the last ran job
-	 *
-	 * @return int
-	 * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
-	 *    only tells you which job finished last, but since we now allow multiple
-	 *    executors to run in parallel, it's not used to calculate the next job.
-	 */
-	public function getLastJob() {
-		return (int) $this->config->getAppValue('backgroundjob', 'lastjob', 0);
-	}
-
-	/**
-	 * set the lastRun of $job to now
-	 *
-	 * @param IJob $job
-	 */
-	public function setLastRun(IJob $job) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * @param IJob $job
-	 * @param $timeTaken
-	 */
-	public function setExecutionTime(IJob $job, $timeTaken) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * checks if a job is still running (reserved_at time is smaller than 12 hours ago)
-	 *
-	 * Background information:
-	 *
-	 * The 12 hours is the same timeout that is also used to re-schedule an non-terminated
-	 * job (see getNext()). The idea here is to give a job enough time to run very
-	 * long but still be able to recognize that it maybe crashed and re-schedule it
-	 * after the timeout. It's more likely to be crashed at that time than it ran
-	 * that long.
-	 *
-	 * In theory it could lead to an nearly endless loop (as in - at most 12 hours).
-	 * The cron command will not start new jobs when maintenance mode is active and
-	 * this method is only executed in maintenance mode (see where it is called in
-	 * the upgrader class. So this means in the worst case we wait 12 hours when a
-	 * job has crashed. On the other hand: then the instance should be fixed anyways.
-	 *
-	 * @return bool
-	 */
-	public function isAnyJobRunning(): bool {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->gt('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - $this->jobTimeOut, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(1);
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return true;
-		}
-		return false;
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /**@var IConfig */
+    protected $config;
+
+    /**@var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var int - 12 hours * 3600 seconds*/
+    private $jobTimeOut = 43200;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function add($job, $argument = null) {
+        if (!$this->has($job, $argument)) {
+            if ($job instanceof IJob) {
+                $class = get_class($job);
+            } else {
+                $class = $job;
+            }
+
+            $argument = json_encode($argument);
+            if (strlen($argument) > 4000) {
+                throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
+            }
+
+            $query = $this->connection->getQueryBuilder();
+            $query->insert('jobs')
+                ->values([
+                    'class' => $query->createNamedParameter($class),
+                    'argument' => $query->createNamedParameter($argument),
+                    'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
+                    'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
+                ]);
+            $query->execute();
+        }
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function remove($job, $argument = null) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)));
+        if (!is_null($argument)) {
+            $argument = json_encode($argument);
+            $query->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
+        }
+        $query->execute();
+    }
+
+    /**
+     * @param int $id
+     */
+    protected function removeById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * check if a job is in the list
+     *
+     * @param IJob|string $job
+     * @param mixed $argument
+     * @return bool
+     */
+    public function has($job, $argument) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+        $argument = json_encode($argument);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)))
+            ->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)))
+            ->setMaxResults(1);
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        return (bool) $row;
+    }
+
+    /**
+     * get all jobs in the list
+     *
+     * @return IJob[]
+     * @deprecated 9.0.0 - This method is dangerous since it can cause load and
+     * memory problems when creating too many instances.
+     */
+    public function getAll() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs');
+        $result = $query->execute();
+
+        $jobs = [];
+        while ($row = $result->fetch()) {
+            $job = $this->buildJob($row);
+            if ($job) {
+                $jobs[] = $job;
+            }
+        }
+        $result->closeCursor();
+
+        return $jobs;
+    }
+
+    /**
+     * get the next job in the list
+     *
+     * @return IJob|null
+     * @suppress SqlInjectionChecker
+     */
+    public function getNext() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - $this->jobTimeOut, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->lte('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)))
+            ->orderBy('last_checked', 'ASC')
+            ->setMaxResults(1);
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('jobs')
+            ->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
+            ->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
+            ->where($update->expr()->eq('id', $update->createParameter('jobid')))
+            ->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
+            ->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            $update->setParameter('jobid', $row['id']);
+            $update->setParameter('reserved_at', $row['reserved_at']);
+            $update->setParameter('last_checked', $row['last_checked']);
+            $count = $update->execute();
+
+            if ($count === 0) {
+                // Background job already executed elsewhere, try again.
+                return $this->getNext();
+            }
+            $job = $this->buildJob($row);
+
+            if ($job === null) {
+                // set the last_checked to 12h in the future to not check failing jobs all over again
+                $reset = $this->connection->getQueryBuilder();
+                $reset->update('jobs')
+                    ->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
+                    ->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
+                    ->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
+                $reset->execute();
+
+                // Background job from disabled app, try again.
+                return $this->getNext();
+            }
+
+            return $job;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param int $id
+     * @return IJob|null
+     */
+    public function getById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return $this->buildJob($row);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * get the job object from a row in the db
+     *
+     * @param array $row
+     * @return IJob|null
+     */
+    private function buildJob($row) {
+        try {
+            try {
+                // Try to load the job as a service
+                /** @var IJob $job */
+                $job = \OC::$server->query($row['class']);
+            } catch (QueryException $e) {
+                if (class_exists($row['class'])) {
+                    $class = $row['class'];
+                    $job = new $class();
+                } else {
+                    // job from disabled app or old version of an app, no need to do anything
+                    return null;
+                }
+            }
+
+            $job->setId($row['id']);
+            $job->setLastRun($row['last_run']);
+            $job->setArgument(json_decode($row['argument'], true));
+            return $job;
+        } catch (AutoloadNotAllowedException $e) {
+            // job is from a disabled app, ignore
+            return null;
+        }
+    }
+
+    /**
+     * set the job that was last ran
+     *
+     * @param IJob $job
+     */
+    public function setLastJob(IJob $job) {
+        $this->unlockJob($job);
+        $this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
+    }
+
+    /**
+     * Remove the reservation for a job
+     *
+     * @param IJob $job
+     * @suppress SqlInjectionChecker
+     */
+    public function unlockJob(IJob $job) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * get the id of the last ran job
+     *
+     * @return int
+     * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
+     *    only tells you which job finished last, but since we now allow multiple
+     *    executors to run in parallel, it's not used to calculate the next job.
+     */
+    public function getLastJob() {
+        return (int) $this->config->getAppValue('backgroundjob', 'lastjob', 0);
+    }
+
+    /**
+     * set the lastRun of $job to now
+     *
+     * @param IJob $job
+     */
+    public function setLastRun(IJob $job) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * @param IJob $job
+     * @param $timeTaken
+     */
+    public function setExecutionTime(IJob $job, $timeTaken) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * checks if a job is still running (reserved_at time is smaller than 12 hours ago)
+     *
+     * Background information:
+     *
+     * The 12 hours is the same timeout that is also used to re-schedule an non-terminated
+     * job (see getNext()). The idea here is to give a job enough time to run very
+     * long but still be able to recognize that it maybe crashed and re-schedule it
+     * after the timeout. It's more likely to be crashed at that time than it ran
+     * that long.
+     *
+     * In theory it could lead to an nearly endless loop (as in - at most 12 hours).
+     * The cron command will not start new jobs when maintenance mode is active and
+     * this method is only executed in maintenance mode (see where it is called in
+     * the upgrader class. So this means in the worst case we wait 12 hours when a
+     * job has crashed. On the other hand: then the instance should be fixed anyways.
+     *
+     * @return bool
+     */
+    public function isAnyJobRunning(): bool {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->gt('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - $this->jobTimeOut, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(1);
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return true;
+        }
+        return false;
+    }
 }

lib/private/BackgroundJob/Job.php

Spacing +3 added lines, -3 removed lines

@@ -55,17 +55,17 @@
 
 		try {
 			$jobStartTime = time();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = time() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Exception $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}

Indentation +56 added lines, -56 removed lines

@@ -28,72 +28,72 @@
 use OCP\ILogger;
 
 abstract class Job implements IJob {
-	/**
-	 * @var int $id
-	 */
-	protected $id;
+    /**
+     * @var int $id
+     */
+    protected $id;
 
-	/**
-	 * @var int $lastRun
-	 */
-	protected $lastRun;
+    /**
+     * @var int $lastRun
+     */
+    protected $lastRun;
 
-	/**
-	 * @var mixed $argument
-	 */
-	protected $argument;
+    /**
+     * @var mixed $argument
+     */
+    protected $argument;
 
-	/**
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$jobList->setLastRun($this);
-		if ($logger === null) {
-			$logger = \OC::$server->getLogger();
-		}
+    /**
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $jobList->setLastRun($this);
+        if ($logger === null) {
+            $logger = \OC::$server->getLogger();
+        }
 
-		try {
-			$jobStartTime = time();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
-			$this->run($this->argument);
-			$timeTaken = time() - $jobStartTime;
+        try {
+            $jobStartTime = time();
+            $logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+            $this->run($this->argument);
+            $timeTaken = time() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
-			$jobList->setExecutionTime($this, $timeTaken);
-		} catch (\Exception $e) {
-			if ($logger) {
-				$logger->logException($e, [
-					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
-				]);
-			}
-		}
-	}
+            $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+            $jobList->setExecutionTime($this, $timeTaken);
+        } catch (\Exception $e) {
+            if ($logger) {
+                $logger->logException($e, [
+                    'app' => 'core',
+                    'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+                ]);
+            }
+        }
+    }
 
-	abstract protected function run($argument);
+    abstract protected function run($argument);
 
-	public function setId($id) {
-		$this->id = $id;
-	}
+    public function setId($id) {
+        $this->id = $id;
+    }
 
-	public function setLastRun($lastRun) {
-		$this->lastRun = $lastRun;
-	}
+    public function setLastRun($lastRun) {
+        $this->lastRun = $lastRun;
+    }
 
-	public function setArgument($argument) {
-		$this->argument = $argument;
-	}
+    public function setArgument($argument) {
+        $this->argument = $argument;
+    }
 
-	public function getId() {
-		return $this->id;
-	}
+    public function getId() {
+        return $this->id;
+    }
 
-	public function getLastRun() {
-		return $this->lastRun;
-	}
+    public function getLastRun() {
+        return $this->lastRun;
+    }
 
-	public function getArgument() {
-		return $this->argument;
-	}
+    public function getArgument() {
+        return $this->argument;
+    }
 }

lib/public/BackgroundJob/IJobList.php

Indentation +86 added lines, -86 removed lines

@@ -32,100 +32,100 @@
  * @since 7.0.0
  */
 interface IJobList {
-	/**
-	 * Add a job to the list
-	 *
-	 * @param \OCP\BackgroundJob\IJob|string $job
-	 * @param mixed $argument The argument to be passed to $job->run() when the job is exectured
-	 * @since 7.0.0
-	 */
-	public function add($job, $argument = null);
+    /**
+     * Add a job to the list
+     *
+     * @param \OCP\BackgroundJob\IJob|string $job
+     * @param mixed $argument The argument to be passed to $job->run() when the job is exectured
+     * @since 7.0.0
+     */
+    public function add($job, $argument = null);
 
-	/**
-	 * Remove a job from the list
-	 *
-	 * @param \OCP\BackgroundJob\IJob|string $job
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function remove($job, $argument = null);
+    /**
+     * Remove a job from the list
+     *
+     * @param \OCP\BackgroundJob\IJob|string $job
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function remove($job, $argument = null);
 
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param \OCP\BackgroundJob\IJob|string $job
-	 * @param mixed $argument
-	 * @return bool
-	 * @since 7.0.0
-	 */
-	public function has($job, $argument);
+    /**
+     * check if a job is in the list
+     *
+     * @param \OCP\BackgroundJob\IJob|string $job
+     * @param mixed $argument
+     * @return bool
+     * @since 7.0.0
+     */
+    public function has($job, $argument);
 
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return \OCP\BackgroundJob\IJob[]
-	 * @since 7.0.0
-	 * @deprecated 9.0.0 - This method is dangerous since it can cause load and
-	 * memory problems when creating too many instances.
-	 */
-	public function getAll();
+    /**
+     * get all jobs in the list
+     *
+     * @return \OCP\BackgroundJob\IJob[]
+     * @since 7.0.0
+     * @deprecated 9.0.0 - This method is dangerous since it can cause load and
+     * memory problems when creating too many instances.
+     */
+    public function getAll();
 
-	/**
-	 * get the next job in the list
-	 *
-	 * @return \OCP\BackgroundJob\IJob|null
-	 * @since 7.0.0
-	 */
-	public function getNext();
+    /**
+     * get the next job in the list
+     *
+     * @return \OCP\BackgroundJob\IJob|null
+     * @since 7.0.0
+     */
+    public function getNext();
 
-	/**
-	 * @param int $id
-	 * @return \OCP\BackgroundJob\IJob|null
-	 * @since 7.0.0
-	 */
-	public function getById($id);
+    /**
+     * @param int $id
+     * @return \OCP\BackgroundJob\IJob|null
+     * @since 7.0.0
+     */
+    public function getById($id);
 
-	/**
-	 * set the job that was last ran to the current time
-	 *
-	 * @param \OCP\BackgroundJob\IJob $job
-	 * @since 7.0.0
-	 */
-	public function setLastJob(IJob $job);
+    /**
+     * set the job that was last ran to the current time
+     *
+     * @param \OCP\BackgroundJob\IJob $job
+     * @since 7.0.0
+     */
+    public function setLastJob(IJob $job);
 
-	/**
-	 * Remove the reservation for a job
-	 *
-	 * @param IJob $job
-	 * @since 9.1.0
-	 */
-	public function unlockJob(IJob $job);
+    /**
+     * Remove the reservation for a job
+     *
+     * @param IJob $job
+     * @since 9.1.0
+     */
+    public function unlockJob(IJob $job);
 
-	/**
-	 * get the id of the last ran job
-	 *
-	 * @return int
-	 * @since 7.0.0
-	 * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
-	 *    only tells you which job finished last, but since we now allow multiple
-	 *    executors to run in parallel, it's not used to calculate the next job.
-	 */
-	public function getLastJob();
+    /**
+     * get the id of the last ran job
+     *
+     * @return int
+     * @since 7.0.0
+     * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
+     *    only tells you which job finished last, but since we now allow multiple
+     *    executors to run in parallel, it's not used to calculate the next job.
+     */
+    public function getLastJob();
 
-	/**
-	 * set the lastRun of $job to now
-	 *
-	 * @param IJob $job
-	 * @since 7.0.0
-	 */
-	public function setLastRun(IJob $job);
+    /**
+     * set the lastRun of $job to now
+     *
+     * @param IJob $job
+     * @since 7.0.0
+     */
+    public function setLastRun(IJob $job);
 
-	/**
-	 * set the run duration of $job
-	 *
-	 * @param IJob $job
-	 * @param $timeTaken
-	 * @since 12.0.0
-	 */
-	public function setExecutionTime(IJob $job, $timeTaken);
+    /**
+     * set the run duration of $job
+     *
+     * @param IJob $job
+     * @param $timeTaken
+     * @since 12.0.0
+     */
+    public function setExecutionTime(IJob $job, $timeTaken);
 }