Passed
Push — master ( 075a0b...093b25 )
by Roeland
13:22 queued 13s
created
core/Command/User/Enable.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,36 +30,36 @@
 block discarded – undo
30 30
 use Symfony\Component\Console\Input\InputArgument;
31 31
 
32 32
 class Enable extends Command {
33
-	/** @var IUserManager */
34
-	protected $userManager;
33
+    /** @var IUserManager */
34
+    protected $userManager;
35 35
 
36
-	/**
37
-	 * @param IUserManager $userManager
38
-	 */
39
-	public function __construct(IUserManager $userManager) {
40
-		$this->userManager = $userManager;
41
-		parent::__construct();
42
-	}
36
+    /**
37
+     * @param IUserManager $userManager
38
+     */
39
+    public function __construct(IUserManager $userManager) {
40
+        $this->userManager = $userManager;
41
+        parent::__construct();
42
+    }
43 43
 
44
-	protected function configure() {
45
-		$this
46
-			->setName('user:enable')
47
-			->setDescription('enables the specified user')
48
-			->addArgument(
49
-				'uid',
50
-				InputArgument::REQUIRED,
51
-				'the username'
52
-			);
53
-	}
44
+    protected function configure() {
45
+        $this
46
+            ->setName('user:enable')
47
+            ->setDescription('enables the specified user')
48
+            ->addArgument(
49
+                'uid',
50
+                InputArgument::REQUIRED,
51
+                'the username'
52
+            );
53
+    }
54 54
 
55
-	protected function execute(InputInterface $input, OutputInterface $output) {
56
-		$user = $this->userManager->get($input->getArgument('uid'));
57
-		if (is_null($user)) {
58
-			$output->writeln('<error>User does not exist</error>');
59
-			return;
60
-		}
55
+    protected function execute(InputInterface $input, OutputInterface $output) {
56
+        $user = $this->userManager->get($input->getArgument('uid'));
57
+        if (is_null($user)) {
58
+            $output->writeln('<error>User does not exist</error>');
59
+            return;
60
+        }
61 61
 
62
-		$user->setEnabled(true);
63
-		$output->writeln('<info>The specified user is enabled</info>');
64
-	}
62
+        $user->setEnabled(true);
63
+        $output->writeln('<info>The specified user is enabled</info>');
64
+    }
65 65
 }
Please login to merge, or discard this patch.
core/Command/User/Disable.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,36 +30,36 @@
 block discarded – undo
30 30
 use Symfony\Component\Console\Input\InputArgument;
31 31
 
32 32
 class Disable extends Command {
33
-	/** @var IUserManager */
34
-	protected $userManager;
33
+    /** @var IUserManager */
34
+    protected $userManager;
35 35
 
36
-	/**
37
-	 * @param IUserManager $userManager
38
-	 */
39
-	public function __construct(IUserManager $userManager) {
40
-		$this->userManager = $userManager;
41
-		parent::__construct();
42
-	}
36
+    /**
37
+     * @param IUserManager $userManager
38
+     */
39
+    public function __construct(IUserManager $userManager) {
40
+        $this->userManager = $userManager;
41
+        parent::__construct();
42
+    }
43 43
 
44
-	protected function configure() {
45
-		$this
46
-			->setName('user:disable')
47
-			->setDescription('disables the specified user')
48
-			->addArgument(
49
-				'uid',
50
-				InputArgument::REQUIRED,
51
-				'the username'
52
-			);
53
-	}
44
+    protected function configure() {
45
+        $this
46
+            ->setName('user:disable')
47
+            ->setDescription('disables the specified user')
48
+            ->addArgument(
49
+                'uid',
50
+                InputArgument::REQUIRED,
51
+                'the username'
52
+            );
53
+    }
54 54
 
55
-	protected function execute(InputInterface $input, OutputInterface $output) {
56
-		$user = $this->userManager->get($input->getArgument('uid'));
57
-		if (is_null($user)) {
58
-			$output->writeln('<error>User does not exist</error>');
59
-			return;
60
-		}
55
+    protected function execute(InputInterface $input, OutputInterface $output) {
56
+        $user = $this->userManager->get($input->getArgument('uid'));
57
+        if (is_null($user)) {
58
+            $output->writeln('<error>User does not exist</error>');
59
+            return;
60
+        }
61 61
 
62
-		$user->setEnabled(false);
63
-		$output->writeln('<info>The specified user is disabled</info>');
64
-	}
62
+        $user->setEnabled(false);
63
+        $output->writeln('<info>The specified user is disabled</info>');
64
+    }
65 65
 }
Please login to merge, or discard this patch.
core/Command/User/Add.php 1 patch
Indentation   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -36,125 +36,125 @@
 block discarded – undo
36 36
 use Symfony\Component\Console\Question\Question;
37 37
 
38 38
 class Add extends Command {
39
-	/** @var \OCP\IUserManager */
40
-	protected $userManager;
41
-
42
-	/** @var \OCP\IGroupManager */
43
-	protected $groupManager;
44
-
45
-	/**
46
-	 * @param IUserManager $userManager
47
-	 * @param IGroupManager $groupManager
48
-	 */
49
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
50
-		parent::__construct();
51
-		$this->userManager = $userManager;
52
-		$this->groupManager = $groupManager;
53
-	}
54
-
55
-	protected function configure() {
56
-		$this
57
-			->setName('user:add')
58
-			->setDescription('adds a user')
59
-			->addArgument(
60
-				'uid',
61
-				InputArgument::REQUIRED,
62
-				'User ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
63
-			)
64
-			->addOption(
65
-				'password-from-env',
66
-				null,
67
-				InputOption::VALUE_NONE,
68
-				'read password from environment variable OC_PASS'
69
-			)
70
-			->addOption(
71
-				'display-name',
72
-				null,
73
-				InputOption::VALUE_OPTIONAL,
74
-				'User name used in the web UI (can contain any characters)'
75
-			)
76
-			->addOption(
77
-				'group',
78
-				'g',
79
-				InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
80
-				'groups the user should be added to (The group will be created if it does not exist)'
81
-			);
82
-	}
83
-
84
-	protected function execute(InputInterface $input, OutputInterface $output) {
85
-		$uid = $input->getArgument('uid');
86
-		if ($this->userManager->userExists($uid)) {
87
-			$output->writeln('<error>The user "' . $uid . '" already exists.</error>');
88
-			return 1;
89
-		}
90
-
91
-		if ($input->getOption('password-from-env')) {
92
-			$password = getenv('OC_PASS');
93
-			if (!$password) {
94
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
95
-				return 1;
96
-			}
97
-		} elseif ($input->isInteractive()) {
98
-			/** @var QuestionHelper $helper */
99
-			$helper = $this->getHelper('question');
100
-
101
-			$question = new Question('Enter password: ');
102
-			$question->setHidden(true);
103
-			$password = $helper->ask($input, $output, $question);
104
-
105
-			$question = new Question('Confirm password: ');
106
-			$question->setHidden(true);
107
-			$confirm = $helper->ask($input, $output,$question);
108
-
109
-			if ($password !== $confirm) {
110
-				$output->writeln("<error>Passwords did not match!</error>");
111
-				return 1;
112
-			}
113
-		} else {
114
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a password!</error>");
115
-			return 1;
116
-		}
117
-
118
-		try {
119
-			$user = $this->userManager->createUser(
120
-				$input->getArgument('uid'),
121
-				$password
122
-			);
123
-		} catch (\Exception $e) {
124
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
125
-			return 1;
126
-		}
127
-
128
-
129
-		if ($user instanceof IUser) {
130
-			$output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
131
-		} else {
132
-			$output->writeln('<error>An error occurred while creating the user</error>');
133
-			return 1;
134
-		}
135
-
136
-		if ($input->getOption('display-name')) {
137
-			$user->setDisplayName($input->getOption('display-name'));
138
-			$output->writeln('Display name set to "' . $user->getDisplayName() . '"');
139
-		}
140
-
141
-		$groups = $input->getOption('group');
142
-
143
-		if (!empty($groups)) {
144
-			// Make sure we init the Filesystem for the user, in case we need to
145
-			// init some group shares.
146
-			Filesystem::init($user->getUID(), '');
147
-		}
148
-
149
-		foreach ($groups as $groupName) {
150
-			$group = $this->groupManager->get($groupName);
151
-			if (!$group) {
152
-				$this->groupManager->createGroup($groupName);
153
-				$group = $this->groupManager->get($groupName);
154
-				$output->writeln('Created group "' . $group->getGID() . '"');
155
-			}
156
-			$group->addUser($user);
157
-			$output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
158
-		}
159
-	}
39
+    /** @var \OCP\IUserManager */
40
+    protected $userManager;
41
+
42
+    /** @var \OCP\IGroupManager */
43
+    protected $groupManager;
44
+
45
+    /**
46
+     * @param IUserManager $userManager
47
+     * @param IGroupManager $groupManager
48
+     */
49
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
50
+        parent::__construct();
51
+        $this->userManager = $userManager;
52
+        $this->groupManager = $groupManager;
53
+    }
54
+
55
+    protected function configure() {
56
+        $this
57
+            ->setName('user:add')
58
+            ->setDescription('adds a user')
59
+            ->addArgument(
60
+                'uid',
61
+                InputArgument::REQUIRED,
62
+                'User ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
63
+            )
64
+            ->addOption(
65
+                'password-from-env',
66
+                null,
67
+                InputOption::VALUE_NONE,
68
+                'read password from environment variable OC_PASS'
69
+            )
70
+            ->addOption(
71
+                'display-name',
72
+                null,
73
+                InputOption::VALUE_OPTIONAL,
74
+                'User name used in the web UI (can contain any characters)'
75
+            )
76
+            ->addOption(
77
+                'group',
78
+                'g',
79
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
80
+                'groups the user should be added to (The group will be created if it does not exist)'
81
+            );
82
+    }
83
+
84
+    protected function execute(InputInterface $input, OutputInterface $output) {
85
+        $uid = $input->getArgument('uid');
86
+        if ($this->userManager->userExists($uid)) {
87
+            $output->writeln('<error>The user "' . $uid . '" already exists.</error>');
88
+            return 1;
89
+        }
90
+
91
+        if ($input->getOption('password-from-env')) {
92
+            $password = getenv('OC_PASS');
93
+            if (!$password) {
94
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
95
+                return 1;
96
+            }
97
+        } elseif ($input->isInteractive()) {
98
+            /** @var QuestionHelper $helper */
99
+            $helper = $this->getHelper('question');
100
+
101
+            $question = new Question('Enter password: ');
102
+            $question->setHidden(true);
103
+            $password = $helper->ask($input, $output, $question);
104
+
105
+            $question = new Question('Confirm password: ');
106
+            $question->setHidden(true);
107
+            $confirm = $helper->ask($input, $output,$question);
108
+
109
+            if ($password !== $confirm) {
110
+                $output->writeln("<error>Passwords did not match!</error>");
111
+                return 1;
112
+            }
113
+        } else {
114
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a password!</error>");
115
+            return 1;
116
+        }
117
+
118
+        try {
119
+            $user = $this->userManager->createUser(
120
+                $input->getArgument('uid'),
121
+                $password
122
+            );
123
+        } catch (\Exception $e) {
124
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
125
+            return 1;
126
+        }
127
+
128
+
129
+        if ($user instanceof IUser) {
130
+            $output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
131
+        } else {
132
+            $output->writeln('<error>An error occurred while creating the user</error>');
133
+            return 1;
134
+        }
135
+
136
+        if ($input->getOption('display-name')) {
137
+            $user->setDisplayName($input->getOption('display-name'));
138
+            $output->writeln('Display name set to "' . $user->getDisplayName() . '"');
139
+        }
140
+
141
+        $groups = $input->getOption('group');
142
+
143
+        if (!empty($groups)) {
144
+            // Make sure we init the Filesystem for the user, in case we need to
145
+            // init some group shares.
146
+            Filesystem::init($user->getUID(), '');
147
+        }
148
+
149
+        foreach ($groups as $groupName) {
150
+            $group = $this->groupManager->get($groupName);
151
+            if (!$group) {
152
+                $this->groupManager->createGroup($groupName);
153
+                $group = $this->groupManager->get($groupName);
154
+                $output->writeln('Created group "' . $group->getGID() . '"');
155
+            }
156
+            $group->addUser($user);
157
+            $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
158
+        }
159
+    }
160 160
 }
Please login to merge, or discard this patch.
core/Command/User/Report.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -32,56 +32,56 @@
 block discarded – undo
32 32
 use Symfony\Component\Console\Output\OutputInterface;
33 33
 
34 34
 class Report extends Command {
35
-	/** @var IUserManager */
36
-	protected $userManager;
35
+    /** @var IUserManager */
36
+    protected $userManager;
37 37
 
38
-	/**
39
-	 * @param IUserManager $userManager
40
-	 */
41
-	public function __construct(IUserManager $userManager) {
42
-		$this->userManager = $userManager;
43
-		parent::__construct();
44
-	}
38
+    /**
39
+     * @param IUserManager $userManager
40
+     */
41
+    public function __construct(IUserManager $userManager) {
42
+        $this->userManager = $userManager;
43
+        parent::__construct();
44
+    }
45 45
 
46
-	protected function configure() {
47
-		$this
48
-			->setName('user:report')
49
-			->setDescription('shows how many users have access');
50
-	}
46
+    protected function configure() {
47
+        $this
48
+            ->setName('user:report')
49
+            ->setDescription('shows how many users have access');
50
+    }
51 51
 
52
-	protected function execute(InputInterface $input, OutputInterface $output) {
53
-		$table = new Table($output);
54
-		$table->setHeaders(array('User Report', ''));
55
-		$userCountArray = $this->countUsers();
56
-		if(!empty($userCountArray)) {
57
-			$total = 0;
58
-			$rows = array();
59
-			foreach($userCountArray as $classname => $users) {
60
-				$total += $users;
61
-				$rows[] = array($classname, $users);
62
-			}
52
+    protected function execute(InputInterface $input, OutputInterface $output) {
53
+        $table = new Table($output);
54
+        $table->setHeaders(array('User Report', ''));
55
+        $userCountArray = $this->countUsers();
56
+        if(!empty($userCountArray)) {
57
+            $total = 0;
58
+            $rows = array();
59
+            foreach($userCountArray as $classname => $users) {
60
+                $total += $users;
61
+                $rows[] = array($classname, $users);
62
+            }
63 63
 
64
-			$rows[] = array(' ');
65
-			$rows[] = array('total users', $total);
66
-		} else {
67
-			$rows[] = array('No backend enabled that supports user counting', '');
68
-		}
64
+            $rows[] = array(' ');
65
+            $rows[] = array('total users', $total);
66
+        } else {
67
+            $rows[] = array('No backend enabled that supports user counting', '');
68
+        }
69 69
 
70
-		$userDirectoryCount = $this->countUserDirectories();
71
-		$rows[] = array(' ');
72
-		$rows[] = array('user directories', $userDirectoryCount);
70
+        $userDirectoryCount = $this->countUserDirectories();
71
+        $rows[] = array(' ');
72
+        $rows[] = array('user directories', $userDirectoryCount);
73 73
 
74
-		$table->setRows($rows);
75
-		$table->render();
76
-	}
74
+        $table->setRows($rows);
75
+        $table->render();
76
+    }
77 77
 
78
-	private function countUsers() {
79
-		return $this->userManager->countUsers();
80
-	}
78
+    private function countUsers() {
79
+        return $this->userManager->countUsers();
80
+    }
81 81
 
82
-	private function countUserDirectories() {
83
-		$dataview = new \OC\Files\View('/');
84
-		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
85
-		return count($userDirectories);
86
-	}
82
+    private function countUserDirectories() {
83
+        $dataview = new \OC\Files\View('/');
84
+        $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
85
+        return count($userDirectories);
86
+    }
87 87
 }
Please login to merge, or discard this patch.
core/Command/User/Delete.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -32,40 +32,40 @@
 block discarded – undo
32 32
 use Symfony\Component\Console\Input\InputArgument;
33 33
 
34 34
 class Delete extends Command {
35
-	/** @var IUserManager */
36
-	protected $userManager;
35
+    /** @var IUserManager */
36
+    protected $userManager;
37 37
 
38
-	/**
39
-	 * @param IUserManager $userManager
40
-	 */
41
-	public function __construct(IUserManager $userManager) {
42
-		$this->userManager = $userManager;
43
-		parent::__construct();
44
-	}
38
+    /**
39
+     * @param IUserManager $userManager
40
+     */
41
+    public function __construct(IUserManager $userManager) {
42
+        $this->userManager = $userManager;
43
+        parent::__construct();
44
+    }
45 45
 
46
-	protected function configure() {
47
-		$this
48
-			->setName('user:delete')
49
-			->setDescription('deletes the specified user')
50
-			->addArgument(
51
-				'uid',
52
-				InputArgument::REQUIRED,
53
-				'the username'
54
-			);
55
-	}
46
+    protected function configure() {
47
+        $this
48
+            ->setName('user:delete')
49
+            ->setDescription('deletes the specified user')
50
+            ->addArgument(
51
+                'uid',
52
+                InputArgument::REQUIRED,
53
+                'the username'
54
+            );
55
+    }
56 56
 
57
-	protected function execute(InputInterface $input, OutputInterface $output) {
58
-		$user = $this->userManager->get($input->getArgument('uid'));
59
-		if (is_null($user)) {
60
-			$output->writeln('<error>User does not exist</error>');
61
-			return;
62
-		}
57
+    protected function execute(InputInterface $input, OutputInterface $output) {
58
+        $user = $this->userManager->get($input->getArgument('uid'));
59
+        if (is_null($user)) {
60
+            $output->writeln('<error>User does not exist</error>');
61
+            return;
62
+        }
63 63
 
64
-		if ($user->delete()) {
65
-			$output->writeln('<info>The specified user was deleted</info>');
66
-			return;
67
-		}
64
+        if ($user->delete()) {
65
+            $output->writeln('<info>The specified user was deleted</info>');
66
+            return;
67
+        }
68 68
 
69
-		$output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
70
-	}
69
+        $output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
70
+    }
71 71
 }
Please login to merge, or discard this patch.
core/Command/Background/WebCron.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 class WebCron extends Base {
29 29
 
30
-	protected function getMode() {
31
-		return 'webcron';
32
-	}
30
+    protected function getMode() {
31
+        return 'webcron';
32
+    }
33 33
 }
Please login to merge, or discard this patch.
core/Command/Background/Base.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -39,39 +39,39 @@
 block discarded – undo
39 39
 abstract class Base extends Command {
40 40
 
41 41
 
42
-	abstract protected function getMode();
42
+    abstract protected function getMode();
43 43
 
44
-	/**
45
-	* @var \OCP\IConfig
46
-	*/
47
-	protected $config;
44
+    /**
45
+     * @var \OCP\IConfig
46
+     */
47
+    protected $config;
48 48
 
49
-	/**
50
-	* @param \OCP\IConfig $config
51
-	*/
52
-	public function __construct(IConfig $config) {
53
-		$this->config = $config;
54
-		parent::__construct();
55
-	}
49
+    /**
50
+     * @param \OCP\IConfig $config
51
+     */
52
+    public function __construct(IConfig $config) {
53
+        $this->config = $config;
54
+        parent::__construct();
55
+    }
56 56
 
57
-	protected function configure() {
58
-		$mode = $this->getMode();
59
-		$this
60
-			->setName("background:$mode")
61
-			->setDescription("Use $mode to run background jobs");
62
-	}
57
+    protected function configure() {
58
+        $mode = $this->getMode();
59
+        $this
60
+            ->setName("background:$mode")
61
+            ->setDescription("Use $mode to run background jobs");
62
+    }
63 63
 
64
-	/**
65
-	* Executing this command will set the background job mode for owncloud.
66
-	* The mode to set is specified by the concrete sub class by implementing the
67
-	* getMode() function.
68
-	*
69
-	* @param InputInterface $input
70
-	* @param OutputInterface $output
71
-	*/
72
-	protected function execute(InputInterface $input, OutputInterface $output) {
73
-		$mode = $this->getMode();
74
-		$this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
75
-		$output->writeln("Set mode for background jobs to '$mode'");
76
-	}
64
+    /**
65
+     * Executing this command will set the background job mode for owncloud.
66
+     * The mode to set is specified by the concrete sub class by implementing the
67
+     * getMode() function.
68
+     *
69
+     * @param InputInterface $input
70
+     * @param OutputInterface $output
71
+     */
72
+    protected function execute(InputInterface $input, OutputInterface $output) {
73
+        $mode = $this->getMode();
74
+        $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
75
+        $output->writeln("Set mode for background jobs to '$mode'");
76
+    }
77 77
 }
Please login to merge, or discard this patch.
core/Command/Background/Cron.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 class Cron extends Base {
29 29
 
30
-	protected function getMode() {
31
-		return 'cron';
32
-	}
30
+    protected function getMode() {
31
+        return 'cron';
32
+    }
33 33
 }
Please login to merge, or discard this patch.
core/Command/Background/Ajax.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 class Ajax extends Base {
29 29
 
30
-	protected function getMode() {
31
-		return 'ajax';
32
-	}
30
+    protected function getMode() {
31
+        return 'ajax';
32
+    }
33 33
 }
Please login to merge, or discard this patch.