Completed
Pull Request — master (#6586)
by Christoph
19:02
created
ocs/v2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,4 +20,4 @@
 block discarded – undo
20 20
  *
21 21
  */
22 22
 
23
-require_once __DIR__ . '/v1.php';
23
+require_once __DIR__.'/v1.php';
Please login to merge, or discard this patch.
ocs-provider/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
  *
20 20
  */
21 21
 
22
-require_once __DIR__ . '/../lib/base.php';
22
+require_once __DIR__.'/../lib/base.php';
23 23
 
24 24
 header('Content-Type: application/json');
25 25
 
Please login to merge, or discard this patch.
status.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 try {
31 31
 
32
-	require_once __DIR__ . '/lib/base.php';
32
+	require_once __DIR__.'/lib/base.php';
33 33
 
34 34
 	$systemConfig = \OC::$server->getSystemConfig();
35 35
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
39 39
 	# for description and defaults
40 40
 	$defaults = new \OCP\Defaults();
41
-	$values=array(
41
+	$values = array(
42 42
 		'installed'=>$installed,
43 43
 		'maintenance' => $maintenance,
44 44
 		'needsDbUpgrade' => \OCP\Util::needUpgrade(),
Please login to merge, or discard this patch.
core/templates/lostpassword/resetpassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 		</p>
35 35
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
36 36
 		<p class="text-center">
37
-			<img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif'));?>"/>
37
+			<img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif')); ?>"/>
38 38
 		</p>
39 39
 	</fieldset>
40 40
 </form>
Please login to merge, or discard this patch.
core/templates/login.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 <form method="post" name="login">
13 13
 	<fieldset>
14 14
 	<?php if (!empty($_['redirect_url'])) {
15
-		print_unescaped('<input type="hidden" name="redirect_url" value="' . \OCP\Util::sanitizeHTML($_['redirect_url']) . '">');
15
+		print_unescaped('<input type="hidden" name="redirect_url" value="'.\OCP\Util::sanitizeHTML($_['redirect_url']).'">');
16 16
 	} ?>
17 17
 		<?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
18 18
 			<div class="warning">
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 				<small><?php p($l->t('Please contact your administrator.')); ?></small>
21 21
 			</div>
22 22
 		<?php endif; ?>
23
-		<?php foreach($_['messages'] as $message): ?>
23
+		<?php foreach ($_['messages'] as $message): ?>
24 24
 			<div class="warning">
25 25
 				<?php p($message); ?><br>
26 26
 			</div>
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 		<?php endif; ?>
34 34
 		<div id="message" class="hidden">
35 35
 			<img class="float-spinner" alt=""
36
-				src="<?php p(image_path('core', 'loading-dark.gif'));?>">
36
+				src="<?php p(image_path('core', 'loading-dark.gif')); ?>">
37 37
 			<span id="messageText"></span>
38 38
 			<!-- the following div ensures that the spinner is always inside the #message div -->
39 39
 			<div style="clear: both;"></div>
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	<fieldset>
89 89
 		<legend><?php p($l->t('Alternative Logins')) ?></legend>
90 90
 		<ul>
91
-			<?php foreach($_['alt_login'] as $login): ?>
91
+			<?php foreach ($_['alt_login'] as $login): ?>
92 92
 				<li><a class="button" href="<?php print_unescaped($login['href']); ?>" ><?php p($login['name']); ?></a></li>
93 93
 			<?php endforeach; ?>
94 94
 		</ul>
Please login to merge, or discard this patch.
core/templates/update.admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 		<p id="update-progress-message-error" class="hidden"></p>
50 50
 		<ul id="update-progress-message-warnings" class="hidden"></ul>
51 51
 		<p id="update-progress-message"></p>
52
-		<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a>
52
+		<a class="update-show-detailed"><?php p($l->t('Detailed logs')); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a>
53 53
 		<div id="update-progress-detailed" class="hidden"></div>
54 54
 	</div>
55 55
 </div>
Please login to merge, or discard this patch.
core/routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,6 +101,6 @@
 block discarded – undo
101 101
 });
102 102
 
103 103
 // used for heartbeat
104
-$this->create('heartbeat', '/heartbeat')->action(function(){
104
+$this->create('heartbeat', '/heartbeat')->action(function() {
105 105
 	// do nothing
106 106
 });
Please login to merge, or discard this patch.
core/search/ajax/search.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,16 +44,16 @@
 block discarded – undo
44 44
 	$inApps = array();
45 45
 }
46 46
 if (isset($_GET['page'])) {
47
-	$page = (int)$_GET['page'];
47
+	$page = (int) $_GET['page'];
48 48
 } else {
49 49
 	$page = 1;
50 50
 }
51 51
 if (isset($_GET['size'])) {
52
-	$size = (int)$_GET['size'];
52
+	$size = (int) $_GET['size'];
53 53
 } else {
54 54
 	$size = 30;
55 55
 }
56
-if($query) {
56
+if ($query) {
57 57
 	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
58 58
 	OC_JSON::encodedPrint($result);
59 59
 }
Please login to merge, or discard this patch.
core/Controller/SetupController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
 			$post['dbpass'] = $post['dbpassword'];
61 61
 		}
62 62
 
63
-		if(isset($post['install']) AND $post['install']=='true') {
63
+		if (isset($post['install']) AND $post['install'] == 'true') {
64 64
 			// We have to launch the installation process :
65 65
 			$e = $this->setupHelper->install($post);
66 66
 			$errors = array('errors' => $e);
67 67
 
68
-			if(count($e) > 0) {
68
+			if (count($e) > 0) {
69 69
 				$options = array_merge($opts, $post, $errors);
70 70
 				$this->display($options);
71 71
 			} else {
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	}
98 98
 
99 99
 	public function finishSetup() {
100
-		if( file_exists( $this->autoConfigFile )) {
100
+		if (file_exists($this->autoConfigFile)) {
101 101
 			unlink($this->autoConfigFile);
102 102
 		}
103 103
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
 	}
106 106
 
107 107
 	public function loadAutoConfig($post) {
108
-		if( file_exists($this->autoConfigFile)) {
108
+		if (file_exists($this->autoConfigFile)) {
109 109
 			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO);
110 110
 			$AUTOCONFIG = array();
111 111
 			include $this->autoConfigFile;
112
-			$post = array_merge ($post, $AUTOCONFIG);
112
+			$post = array_merge($post, $AUTOCONFIG);
113 113
 		}
114 114
 
115 115
 		$dbIsSet = isset($post['dbtype']);
Please login to merge, or discard this patch.