| @@ -23,7 +23,6 @@ | ||
| 23 | 23 | namespace OCA\User_LDAP\Controller; | 
| 24 | 24 | |
| 25 | 25 | use OC\HintException; | 
| 26 | -use OC_Util; | |
| 27 | 26 | use OCP\AppFramework\Controller; | 
| 28 | 27 | use OCP\AppFramework\Http\RedirectResponse; | 
| 29 | 28 | use OCP\AppFramework\Http\TemplateResponse; | 
| @@ -41,44 +41,44 @@ | ||
| 41 | 41 | $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); | 
| 42 | 42 | |
| 43 | 43 |  		switch ($parameter->getType()) { | 
| 44 | - case DefinitionParameter::VALUE_PASSWORD: ?> | |
| 45 | -			<?php if ($is_optional) { $classes[] = 'optional'; } ?> | |
| 46 | - <input type="password" | |
| 44 | + case DefinitionParameter::VALUE_PASSWORD: ?> | |
| 45 | +    			<?php if ($is_optional) { $classes[] = 'optional'; } ?> | |
| 46 | + <input type="password" | |
| 47 | 47 |  				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> | 
| 48 | - data-parameter="<?php p($parameter->getName()); ?>" | |
| 48 | + data-parameter="<?php p($parameter->getName()); ?>" | |
| 49 | 49 | value="<?php p($value); ?>" | 
| 50 | 50 | placeholder="<?php p($placeholder); ?>" | 
| 51 | 51 | /> | 
| 52 | 52 | <?php | 
| 53 | - break; | |
| 54 | - case DefinitionParameter::VALUE_BOOLEAN: ?> | |
| 55 | -			<?php $checkboxId = uniqid("checkbox_"); ?> | |
| 53 | + break; | |
| 54 | + case DefinitionParameter::VALUE_BOOLEAN: ?> | |
| 55 | +    			<?php $checkboxId = uniqid("checkbox_"); ?> | |
| 56 | 56 | <div> | 
| 57 | 57 | <label> | 
| 58 | 58 | <input type="checkbox" | 
| 59 | 59 | id="<?php p($checkboxId); ?>" | 
| 60 | 60 |  				<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?> | 
| 61 | - data-parameter="<?php p($parameter->getName()); ?>" | |
| 61 | + data-parameter="<?php p($parameter->getName()); ?>" | |
| 62 | 62 | <?php if ($value === true): ?> checked="checked"<?php endif; ?> | 
| 63 | - /> | |
| 63 | + /> | |
| 64 | 64 | <?php p($placeholder); ?> | 
| 65 | 65 | </label> | 
| 66 | 66 | </div> | 
| 67 | 67 | <?php | 
| 68 | - break; | |
| 69 | - case DefinitionParameter::VALUE_HIDDEN: ?> | |
| 70 | - <input type="hidden" | |
| 68 | + break; | |
| 69 | + case DefinitionParameter::VALUE_HIDDEN: ?> | |
| 70 | + <input type="hidden" | |
| 71 | 71 |  				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> | 
| 72 | - data-parameter="<?php p($parameter->getName()); ?>" | |
| 72 | + data-parameter="<?php p($parameter->getName()); ?>" | |
| 73 | 73 | value="<?php p($value); ?>" | 
| 74 | 74 | /> | 
| 75 | 75 | <?php | 
| 76 | - break; | |
| 77 | - default: ?> | |
| 78 | -			<?php if ($is_optional) { $classes[] = 'optional'; } ?> | |
| 79 | - <input type="text" | |
| 76 | + break; | |
| 77 | + default: ?> | |
| 78 | +    			<?php if ($is_optional) { $classes[] = 'optional'; } ?> | |
| 79 | + <input type="text" | |
| 80 | 80 |  				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> | 
| 81 | - data-parameter="<?php p($parameter->getName()); ?>" | |
| 81 | + data-parameter="<?php p($parameter->getName()); ?>" | |
| 82 | 82 | value="<?php p($value); ?>" | 
| 83 | 83 | placeholder="<?php p($placeholder); ?>" | 
| 84 | 84 | /> | 
| @@ -62,18 +62,18 @@ | ||
| 62 | 62 | $placeholder = substr($placeholder, 1); | 
| 63 | 63 | } | 
| 64 | 64 |  			switch ($placeholder[0]) { | 
| 65 | - case '!': | |
| 66 | - $type = DefinitionParameter::VALUE_BOOLEAN; | |
| 67 | - $placeholder = substr($placeholder, 1); | |
| 68 | - break; | |
| 69 | - case '*': | |
| 70 | - $type = DefinitionParameter::VALUE_PASSWORD; | |
| 71 | - $placeholder = substr($placeholder, 1); | |
| 72 | - break; | |
| 73 | - case '#': | |
| 74 | - $type = DefinitionParameter::VALUE_HIDDEN; | |
| 75 | - $placeholder = substr($placeholder, 1); | |
| 76 | - break; | |
| 65 | + case '!': | |
| 66 | + $type = DefinitionParameter::VALUE_BOOLEAN; | |
| 67 | + $placeholder = substr($placeholder, 1); | |
| 68 | + break; | |
| 69 | + case '*': | |
| 70 | + $type = DefinitionParameter::VALUE_PASSWORD; | |
| 71 | + $placeholder = substr($placeholder, 1); | |
| 72 | + break; | |
| 73 | + case '#': | |
| 74 | + $type = DefinitionParameter::VALUE_HIDDEN; | |
| 75 | + $placeholder = substr($placeholder, 1); | |
| 76 | + break; | |
| 77 | 77 | } | 
| 78 | 78 | $this->addParameter((new DefinitionParameter($name, $placeholder)) | 
| 79 | 79 | ->setType($type) | 
| @@ -140,16 +140,16 @@ discard block | ||
| 140 | 140 |  	protected function convertLevelString($level) { | 
| 141 | 141 | $level = strtolower($level); | 
| 142 | 142 |  		switch ($level) { | 
| 143 | - case 'debug': | |
| 144 | - return 0; | |
| 145 | - case 'info': | |
| 146 | - return 1; | |
| 147 | - case 'warning': | |
| 148 | - case 'warn': | |
| 149 | - return 2; | |
| 150 | - case 'error': | |
| 151 | - case 'err': | |
| 152 | - return 3; | |
| 143 | + case 'debug': | |
| 144 | + return 0; | |
| 145 | + case 'info': | |
| 146 | + return 1; | |
| 147 | + case 'warning': | |
| 148 | + case 'warn': | |
| 149 | + return 2; | |
| 150 | + case 'error': | |
| 151 | + case 'err': | |
| 152 | + return 3; | |
| 153 | 153 | } | 
| 154 | 154 |  		throw new \InvalidArgumentException('Invalid log level string'); | 
| 155 | 155 | } | 
| @@ -161,14 +161,14 @@ discard block | ||
| 161 | 161 | */ | 
| 162 | 162 |  	protected function convertLevelNumber($levelNum) { | 
| 163 | 163 |  		switch ($levelNum) { | 
| 164 | - case 0: | |
| 165 | - return 'Debug'; | |
| 166 | - case 1: | |
| 167 | - return 'Info'; | |
| 168 | - case 2: | |
| 169 | - return 'Warning'; | |
| 170 | - case 3: | |
| 171 | - return 'Error'; | |
| 164 | + case 0: | |
| 165 | + return 'Debug'; | |
| 166 | + case 1: | |
| 167 | + return 'Info'; | |
| 168 | + case 2: | |
| 169 | + return 'Warning'; | |
| 170 | + case 3: | |
| 171 | + return 'Error'; | |
| 172 | 172 | } | 
| 173 | 173 |  		throw new \InvalidArgumentException('Invalid log level number'); | 
| 174 | 174 | } | 
| @@ -42,7 +42,6 @@ discard block | ||
| 42 | 42 | namespace OC; | 
| 43 | 43 | |
| 44 | 44 | use Doctrine\DBAL\Exception\TableExistsException; | 
| 45 | -use OC\App\AppManager; | |
| 46 | 45 | use OC\App\AppStore\Bundles\Bundle; | 
| 47 | 46 | use OC\App\AppStore\Fetcher\AppFetcher; | 
| 48 | 47 | use OC\App\CodeChecker\CodeChecker; | 
| @@ -52,7 +51,6 @@ discard block | ||
| 52 | 51 | use OC_App; | 
| 53 | 52 | use OC_DB; | 
| 54 | 53 | use OC_Helper; | 
| 55 | -use OCP\App\IAppManager; | |
| 56 | 54 | use OCP\Http\Client\IClientService; | 
| 57 | 55 | use OCP\IConfig; | 
| 58 | 56 | use OCP\ILogger; | 
| @@ -24,8 +24,6 @@ | ||
| 24 | 24 | namespace OCA\User_LDAP\Notification; | 
| 25 | 25 | |
| 26 | 26 | |
| 27 | -use OCP\IUser; | |
| 28 | -use OCP\IUserManager; | |
| 29 | 27 | use OCP\L10N\IFactory; | 
| 30 | 28 | use OCP\Notification\INotification; | 
| 31 | 29 | use OCP\Notification\INotifier; | 
| @@ -52,8 +52,6 @@ discard block | ||
| 52 | 52 | use OC\Command\AsyncBus; | 
| 53 | 53 | use OC\Contacts\ContactsMenu\ActionFactory; | 
| 54 | 54 | use OC\Diagnostics\EventLogger; | 
| 55 | -use OC\Diagnostics\NullEventLogger; | |
| 56 | -use OC\Diagnostics\NullQueryLogger; | |
| 57 | 55 | use OC\Diagnostics\QueryLogger; | 
| 58 | 56 | use OC\Federation\CloudIdManager; | 
| 59 | 57 | use OC\Files\Config\UserMountCache; | 
| @@ -98,7 +96,6 @@ discard block | ||
| 98 | 96 | use OC\Tagging\TagMapper; | 
| 99 | 97 | use OC\Template\SCSSCacher; | 
| 100 | 98 | use OCA\Theming\ThemingDefaults; | 
| 101 | - | |
| 102 | 99 | use OCP\App\IAppManager; | 
| 103 | 100 | use OCP\Defaults; | 
| 104 | 101 | use OCA\Theming\Util; | 
| @@ -33,7 +33,6 @@ | ||
| 33 | 33 | use OCA\DAV\Connector\Sabre\Exception\InvalidPath; | 
| 34 | 34 | use OCA\DAV\Connector\Sabre\Exception\FileLocked; | 
| 35 | 35 | use OC\Files\FileInfo; | 
| 36 | -use OC\Files\Mount\MoveableMount; | |
| 37 | 36 | use OCP\Files\ForbiddenException; | 
| 38 | 37 | use OCP\Files\StorageInvalidException; | 
| 39 | 38 | use OCP\Files\StorageNotAvailableException; | 
| @@ -27,7 +27,6 @@ discard block | ||
| 27 | 27 | |
| 28 | 28 | namespace OCA\Theming\Controller; | 
| 29 | 29 | |
| 30 | -use OC\Files\AppData\Factory; | |
| 31 | 30 | use OC\Template\SCSSCacher; | 
| 32 | 31 | use OCA\Theming\ThemingDefaults; | 
| 33 | 32 | use OCP\AppFramework\Controller; | 
| @@ -43,11 +42,9 @@ discard block | ||
| 43 | 42 | use OCP\Files\NotPermittedException; | 
| 44 | 43 | use OCP\IConfig; | 
| 45 | 44 | use OCP\IL10N; | 
| 46 | -use OCP\ILogger; | |
| 47 | 45 | use OCP\IRequest; | 
| 48 | 46 | use OCA\Theming\Util; | 
| 49 | 47 | use OCP\ITempManager; | 
| 50 | -use OCP\IURLGenerator; | |
| 51 | 48 | |
| 52 | 49 | /** | 
| 53 | 50 | * Class ThemingController |