@@ -2,17 +2,17 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | <div class="section">  | 
                                                        
| 4 | 4 |  		<h2><?php p($l->t('File handling')); ?></h2> | 
                                                        
| 5 | - <label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>  | 
                                                        |
| 5 | +		<label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label> | 
                                                        |
| 6 | 6 | <span id="maxUploadSizeSettingsMsg" class="msg"></span>  | 
                                                        
| 7 | 7 | <br />  | 
                                                        
| 8 | -		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> /> | 
                                                        |
| 9 | - <?php if($_['displayMaxPossibleUploadSize']):?>  | 
                                                        |
| 8 | +		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> /> | 
                                                        |
| 9 | + <?php if ($_['displayMaxPossibleUploadSize']):?>  | 
                                                        |
| 10 | 10 |  			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) | 
                                                        
| 11 | - <?php endif;?>  | 
                                                        |
| 11 | + <?php endif; ?>  | 
                                                        |
| 12 | 12 | <input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />  | 
                                                        
| 13 | - <?php if($_['uploadChangable']): ?>  | 
                                                        |
| 13 | + <?php if ($_['uploadChangable']): ?>  | 
                                                        |
| 14 | 14 | <input type="submit" id="submitMaxUpload"  | 
                                                        
| 15 | - value="<?php p($l->t( 'Save' )); ?>"/>  | 
                                                        |
| 15 | +				   value="<?php p($l->t('Save')); ?>"/> | 
                                                        |
| 16 | 16 |  			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> | 
                                                        
| 17 | 17 | <?php else: ?>  | 
                                                        
| 18 | 18 |  			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> | 
                                                        
@@ -138,7 +138,7 @@ discard block  | 
                                                    ||
| 138 | 138 | }  | 
                                                        
| 139 | 139 |  		foreach ($favorites['folders'] as $favorite) { | 
                                                        
| 140 | 140 |  			$limitations[] = $query->expr()->like('file', $query->createNamedParameter( | 
                                                        
| 141 | - $this->db->escapeLikeParameter($favorite . '/') . '%'  | 
                                                        |
| 141 | + $this->db->escapeLikeParameter($favorite.'/').'%'  | 
                                                        |
| 142 | 142 | ));  | 
                                                        
| 143 | 143 | }  | 
                                                        
| 144 | 144 | |
@@ -148,9 +148,9 @@ discard block  | 
                                                    ||
| 148 | 148 | |
| 149 | 149 |  		$function = $query->createFunction(' | 
                                                        
| 150 | 150 | CASE  | 
                                                        
| 151 | -				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1 | 
                                                        |
| 152 | -				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . ' | 
                                                        |
| 153 | -					AND (' . implode(' OR ', $limitations) . ') | 
                                                        |
| 151 | +				WHEN ' . $query->getColumnName('app').' <> '.$query->createNamedParameter('files').' THEN 1 | 
                                                        |
| 152 | +				WHEN ' . $query->getColumnName('app').' = '.$query->createNamedParameter('files').' | 
                                                        |
| 153 | +					AND (' . implode(' OR ', $limitations).') | 
                                                        |
| 154 | 154 | THEN 1  | 
                                                        
| 155 | 155 | END = 1'  | 
                                                        
| 156 | 156 | );  | 
                                                        
@@ -64,7 +64,7 @@  | 
                                                    ||
| 64 | 64 |  			if (!empty($nodes)) { | 
                                                        
| 65 | 65 | /** @var \OCP\Files\Node $node */  | 
                                                        
| 66 | 66 | $node = array_shift($nodes);  | 
                                                        
| 67 | - $path = substr($node->getPath(), strlen($user . '/files/'));  | 
                                                        |
| 67 | + $path = substr($node->getPath(), strlen($user.'/files/'));  | 
                                                        |
| 68 | 68 | |
| 69 | 69 | $items[] = $path;  | 
                                                        
| 70 | 70 |  				if ($node instanceof Folder) { | 
                                                        
@@ -51,7 +51,7 @@  | 
                                                    ||
| 51 | 51 | */  | 
                                                        
| 52 | 52 |  	public function run($argument) { | 
                                                        
| 53 | 53 | $lockingProvider = \OC::$server->getLockingProvider();  | 
                                                        
| 54 | -		if($lockingProvider instanceof DBLockingProvider) { | 
                                                        |
| 54 | +		if ($lockingProvider instanceof DBLockingProvider) { | 
                                                        |
| 55 | 55 | $lockingProvider->cleanExpiredLocks();  | 
                                                        
| 56 | 56 | }  | 
                                                        
| 57 | 57 | }  | 
                                                        
@@ -80,12 +80,12 @@  | 
                                                    ||
| 80 | 80 | $deletedEntries = 0;  | 
                                                        
| 81 | 81 | |
| 82 | 82 | $query = $this->connection->getQueryBuilder();  | 
                                                        
| 83 | -		$query->select('t1.' . $idCol) | 
                                                        |
| 83 | +		$query->select('t1.'.$idCol) | 
                                                        |
| 84 | 84 | ->from($table, 't1')  | 
                                                        
| 85 | 85 |  			->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) | 
                                                        
| 86 | 86 |  			->andWhere($query->expr()->isNull('t2.fileid')) | 
                                                        
| 87 | -			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) | 
                                                        |
| 88 | -			->groupBy('t1.' . $idCol) | 
                                                        |
| 87 | +			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) | 
                                                        |
| 88 | +			->groupBy('t1.'.$idCol) | 
                                                        |
| 89 | 89 | ->setMaxResults(self::CHUNK_SIZE);  | 
                                                        
| 90 | 90 | |
| 91 | 91 | $deleteQuery = $this->connection->getQueryBuilder();  | 
                                                        
@@ -71,7 +71,7 @@ discard block  | 
                                                    ||
| 71 | 71 | 'user_ldap', 'isDeleted', '1');  | 
                                                        
| 72 | 72 | |
| 73 | 73 | $userObjects = array();  | 
                                                        
| 74 | -		foreach($deletedUsers as $user) { | 
                                                        |
| 74 | +		foreach ($deletedUsers as $user) { | 
                                                        |
| 75 | 75 | $userObjects[] = new OfflineUser($user, $this->config, $this->db, $this->mapping);  | 
                                                        
| 76 | 76 | }  | 
                                                        
| 77 | 77 | $this->deletedUsers = $userObjects;  | 
                                                        
@@ -84,7 +84,7 @@ discard block  | 
                                                    ||
| 84 | 84 | * @return \OCA\User_LDAP\User\OfflineUser[]  | 
                                                        
| 85 | 85 | */  | 
                                                        
| 86 | 86 |  	public function getUsers() { | 
                                                        
| 87 | -		if(is_array($this->deletedUsers)) { | 
                                                        |
| 87 | +		if (is_array($this->deletedUsers)) { | 
                                                        |
| 88 | 88 | return $this->deletedUsers;  | 
                                                        
| 89 | 89 | }  | 
                                                        
| 90 | 90 | return $this->fetchDeletedUsers();  | 
                                                        
@@ -95,10 +95,10 @@ discard block  | 
                                                    ||
| 95 | 95 | * @return bool  | 
                                                        
| 96 | 96 | */  | 
                                                        
| 97 | 97 |  	public function hasUsers() { | 
                                                        
| 98 | -		if($this->deletedUsers === false) { | 
                                                        |
| 98 | +		if ($this->deletedUsers === false) { | 
                                                        |
| 99 | 99 | $this->fetchDeletedUsers();  | 
                                                        
| 100 | 100 | }  | 
                                                        
| 101 | -		if(is_array($this->deletedUsers) && count($this->deletedUsers) > 0) { | 
                                                        |
| 101 | +		if (is_array($this->deletedUsers) && count($this->deletedUsers) > 0) { | 
                                                        |
| 102 | 102 | return true;  | 
                                                        
| 103 | 103 | }  | 
                                                        
| 104 | 104 | return false;  | 
                                                        
@@ -52,7 +52,7 @@ discard block  | 
                                                    ||
| 52 | 52 | * @param array|string $values  | 
                                                        
| 53 | 53 | */  | 
                                                        
| 54 | 54 |  	public function addOptions($key, $values) { | 
                                                        
| 55 | -		if(!is_array($values)) { | 
                                                        |
| 55 | +		if (!is_array($values)) { | 
                                                        |
| 56 | 56 | $values = array($values);  | 
                                                        
| 57 | 57 | }  | 
                                                        
| 58 | 58 | $this->options[$key] = $values;  | 
                                                        
@@ -71,7 +71,7 @@ discard block  | 
                                                    ||
| 71 | 71 |  	public function getResultArray() { | 
                                                        
| 72 | 72 | $result = array();  | 
                                                        
| 73 | 73 | $result['changes'] = $this->changes;  | 
                                                        
| 74 | -		if(count($this->options) > 0) { | 
                                                        |
| 74 | +		if (count($this->options) > 0) { | 
                                                        |
| 75 | 75 | $result['options'] = $this->options;  | 
                                                        
| 76 | 76 | }  | 
                                                        
| 77 | 77 | return $result;  | 
                                                        
@@ -38,14 +38,14 @@  | 
                                                    ||
| 38 | 38 | |
| 39 | 39 |  	public function run($argument) { | 
                                                        
| 40 | 40 | $isUser = $this->proxy instanceof User_Proxy;  | 
                                                        
| 41 | -		foreach($argument['records'] as $record) { | 
                                                        |
| 41 | +		foreach ($argument['records'] as $record) { | 
                                                        |
| 42 | 42 | $access = $this->proxy->getLDAPAccess($record['name']);  | 
                                                        
| 43 | 43 | $uuid = $access->getUUID($record['dn'], $isUser);  | 
                                                        
| 44 | -			if($uuid === false) { | 
                                                        |
| 44 | +			if ($uuid === false) { | 
                                                        |
| 45 | 45 | // record not found, no prob, continue with the next  | 
                                                        
| 46 | 46 | continue;  | 
                                                        
| 47 | 47 | }  | 
                                                        
| 48 | -			if($uuid !== $record['uuid']) { | 
                                                        |
| 48 | +			if ($uuid !== $record['uuid']) { | 
                                                        |
| 49 | 49 | $this->mapper->setUUIDbyDN($uuid, $record['dn']);  | 
                                                        
| 50 | 50 | }  | 
                                                        
| 51 | 51 | }  | 
                                                        
@@ -86,7 +86,7 @@ discard block  | 
                                                    ||
| 86 | 86 |  			$this->isAllowed($input->getOption('force')); | 
                                                        
| 87 | 87 | $this->confirmUserIsMapped($uid);  | 
                                                        
| 88 | 88 | $exists = $this->backend->userExistsOnLDAP($uid);  | 
                                                        
| 89 | -			if($exists === true) { | 
                                                        |
| 89 | +			if ($exists === true) { | 
                                                        |
| 90 | 90 |  				$output->writeln('The user is still available on LDAP.'); | 
                                                        
| 91 | 91 | return;  | 
                                                        
| 92 | 92 | }  | 
                                                        
@@ -94,9 +94,9 @@ discard block  | 
                                                    ||
| 94 | 94 | $this->dui->markUser($uid);  | 
                                                        
| 95 | 95 |  			$output->writeln('The user does not exists on LDAP anymore.'); | 
                                                        
| 96 | 96 |  			$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "' | 
                                                        
| 97 | - . $uid . '"');  | 
                                                        |
| 97 | + . $uid.'"');  | 
                                                        |
| 98 | 98 |  		} catch (\Exception $e) { | 
                                                        
| 99 | -			$output->writeln('<error>' . $e->getMessage(). '</error>'); | 
                                                        |
| 99 | +			$output->writeln('<error>'.$e->getMessage().'</error>'); | 
                                                        |
| 100 | 100 | }  | 
                                                        
| 101 | 101 | }  | 
                                                        
| 102 | 102 | |
@@ -121,7 +121,7 @@ discard block  | 
                                                    ||
| 121 | 121 | * @return true  | 
                                                        
| 122 | 122 | */  | 
                                                        
| 123 | 123 |  	protected function isAllowed($force) { | 
                                                        
| 124 | -		if($this->helper->haveDisabledConfigurations() && !$force) { | 
                                                        |
| 124 | +		if ($this->helper->haveDisabledConfigurations() && !$force) { | 
                                                        |
| 125 | 125 |  			throw new \Exception('Cannot check user existence, because ' | 
                                                        
| 126 | 126 | . 'disabled LDAP configurations are present.');  | 
                                                        
| 127 | 127 | }  |